From: Thomas Nelson <nelson24@att.com>
Date: Fri, 8 Mar 2019 21:31:42 +0000 (+0000)
Subject: Merge "Unit test coverage lines for MusicUtil.java"
X-Git-Tag: 2.5.8~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=695450aa1408f9577e4814f1aae4911dfbae953f;hp=-c;p=music.git

Merge "Unit test coverage lines for MusicUtil.java"
---

695450aa1408f9577e4814f1aae4911dfbae953f
diff --combined src/test/java/org/onap/music/unittests/MusicUtilTest.java
index 9835034b,5751c2c4..04149fc6
--- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java
+++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
@@@ -3,6 -3,7 +3,7 @@@
   * org.onap.music
   * ===================================================================
   *  Copyright (c) 2017 AT&T Intellectual Property
+  *  Modifications Copyright (C) 2019 IBM.
   * ===================================================================
   *  Licensed under the Apache License, Version 2.0 (the "License");
   *  you may not use this file except in compliance with the License.
@@@ -31,7 -32,6 +32,7 @@@ import java.util.Map
  import java.util.UUID;
  import org.apache.cassandra.exceptions.PreparedQueryNotFoundException;
  import org.junit.Test;
 +import org.onap.music.authentication.CachingUtil;
  import org.onap.music.datastore.PreparedQueryObject;
  import org.onap.music.exceptions.MusicServiceException;
  import org.onap.music.main.MusicUtil;
@@@ -92,7 -92,7 +93,7 @@@ public class MusicUtilTest 
  
      @Test
      public void testGetPropkeys() {
 -        assertEquals(MusicUtil.getPropkeys()[2],"music.ip");
 +        assertEquals(MusicUtil.getPropkeys()[2],"debug");
      }
  
      @Test
@@@ -204,15 -204,11 +205,21 @@@
          assertTrue(result.contains("name"));
          assertTrue(result.contains("value"));
      }
 +    
 +    @Test
 +    public void test_generateUUID() {
 +        //this function shouldn't be in cachingUtil
 +        System.out.println("Testing getUUID");
 +        String uuid1 = MusicUtil.generateUUID();
 +        String uuid2 = MusicUtil.generateUUID();
 +        assertFalse(uuid1==uuid2);
 +    }
 +
  
+     @Test
+     public void testIsValidConsistency(){
+         assertTrue(MusicUtil.isValidConsistency("ALL"));
+         assertFalse(MusicUtil.isValidConsistency("TEST"));
+     }
+ 
  }