X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fmusic%2Funittests%2FMusicUtilTest.java;h=21b943f021c7b66e8ae13ec7b289b645ff4b8ab0;hb=66aac8e2b8f61f075b285f969c1f8a88fdb313bd;hp=e540d64692cdb2f13924059016e79999e6db1b9d;hpb=168c54c6e774563910a3ed5a7480ea63cd3fe572;p=music.git

diff --git a/src/test/java/org/onap/music/unittests/MusicUtilTest.java b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
index e540d646..21b943f0 100644
--- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java
+++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
@@ -3,6 +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.
@@ -29,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 {
 
@@ -57,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
@@ -124,11 +84,11 @@ public class MusicUtilTest {
         assertEquals(MusicUtil.getVersion(),"1.0.0");
     }
 
-//    @Test
-//    public void testGetMyZkHost() {
-//        MusicUtil.setMyZkHost("10.0.0.2");
-//        assertEquals(MusicUtil.getMyZkHost(),"10.0.0.2");
-//    }
+    /*@Test
+    public void testGetMyZkHost() {
+        MusicUtil.setMyZkHost("10.0.0.2");
+        assertEquals(MusicUtil.getMyZkHost(),"10.0.0.2");
+    }*/
 
     @Test
     public void testGetMyCassaHost() {
@@ -169,7 +129,7 @@ public class MusicUtilTest {
     }
 
     @Test
-    public void testConvertToCQLDataType() {
+    public void testConvertToCQLDataType() throws Exception {
         Map<String,Object> myMap = new HashMap<String,Object>();
         myMap.put("name","tom");
         assertEquals(MusicUtil.convertToCQLDataType(DataType.varchar(),"Happy People"),"'Happy People'");
@@ -179,7 +139,7 @@ public class MusicUtilTest {
     }
 
     @Test
-    public void testConvertToActualDataType() {
+    public void testConvertToActualDataType() throws Exception {
         assertEquals(MusicUtil.convertToActualDataType(DataType.varchar(),"Happy People"),"Happy People");
         assertEquals(MusicUtil.convertToActualDataType(DataType.uuid(),"29dc2afa-c2c0-47ae-afae-e72a645308ab"),UUID.fromString("29dc2afa-c2c0-47ae-afae-e72a645308ab"));
         assertEquals(MusicUtil.convertToActualDataType(DataType.varint(),"1234"),BigInteger.valueOf(Long.parseLong("1234")));
@@ -195,7 +155,7 @@ public class MusicUtilTest {
     }
 
     @Test
-    public void testJsonMaptoSqlString() {
+    public void testJsonMaptoSqlString() throws Exception {
         Map<String,Object> myMap = new HashMap<>();
         myMap.put("name","tom");
         myMap.put("value",5);
@@ -203,15 +163,21 @@ 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 testSetErrorResponse() {
-        Map<String,Object> myMap = new HashMap<>();
-        myMap.put("name","tom");
-        Map<String,HashMap<String,Object>> result = MusicUtil.setErrorResponse(new MusicServiceException("This is the error"));
-        Map<String,Object> testMap = (Map<String,Object>) result.get("result");
-        Map<String,Object> error = (Map<String,Object>) testMap.get("error");
-        assertTrue(error.containsKey("error-description"));
+    public void testIsValidConsistency(){
+        assertTrue(MusicUtil.isValidConsistency("ALL"));
+        assertFalse(MusicUtil.isValidConsistency("TEST"));
     }
 
 }