CADI and a few small updates.

[music.git] / src / test / java / org / onap / music / unittests / MusicUtilTest.java

diff --git a/src/test/java/org/onap/music/unittests/MusicUtilTest.java b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
index 5751c2c..21b943f 100644 (file)
--- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java
+++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
@@ -30,13 +30,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.cassandra.exceptions.PreparedQueryNotFoundException;
 import org.junit.Test;
 import org.onap.music.datastore.PreparedQueryObject;
-import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.main.MusicUtil;
 import com.datastax.driver.core.DataType;
-import javassist.CodeConverter.ArrayAccessReplacementMethodNames;
 
 public class MusicUtilTest {
 
@@ -58,47 +55,9 @@ public class MusicUtilTest {
         assertEquals(MusicUtil.getAafEndpointUrl(),"url");
     }
 
-    @Test
-    public void testGetMyId() {
-        MusicUtil.setMyId(1);
-        assertEquals(MusicUtil.getMyId(),1);
-    }
-
-    @Test
-    public void testGetAllIds() {
-        List<String> ids = new ArrayList<String>();
-        ids.add("1");
-        ids.add("2");
-        ids.add("3");
-        MusicUtil.setAllIds(ids);
-        assertEquals(MusicUtil.getAllIds().get(0),"1");
-    }
-
-//    @Test
-//    public void testGetPublicIp() {
-//        MusicUtil.setPublicIp("10.0.0.1");
-//        assertEquals(MusicUtil.getPublicIp(),"10.0.0.1");
-//    }
-
-    @Test
-    public void testGetAllPublicIps() {
-        List<String> ips = new ArrayList<String>();
-        ips.add("10.0.0.1");
-        ips.add("10.0.0.2");
-        ips.add("10.0.0.3");
-        MusicUtil.setAllPublicIps(ips);
-        assertEquals(MusicUtil.getAllPublicIps().get(1),"10.0.0.2");
-    }
-
     @Test
     public void testGetPropkeys() {
-        assertEquals(MusicUtil.getPropkeys()[2],"music.ip");
-    }
-
-    @Test
-    public void testGetMusicRestIp() {
-        MusicUtil.setMusicRestIp("localhost");
-        assertEquals(MusicUtil.getMusicRestIp(),"localhost");
+        assertEquals(MusicUtil.getPropkeys()[2],"debug");
     }
 
     @Test
@@ -204,6 +163,16 @@ public class MusicUtilTest {
         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(){