diff options
author | Thomas Nelson <nelson24@att.com> | 2019-03-08 21:27:57 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-03-08 21:27:57 +0000 |
commit | 97ea0b21eebad043a17cdc4224f8eb44bc2d8b29 (patch) | |
tree | af9b59587ab513d8d1d05f60e0ed850c5f66ddf8 /src/test | |
parent | e4e227b18dcd4a4dd40bc3e3a8373f3d96c6511d (diff) | |
parent | 3135f7122bc7de7845c4b60e457245c9cc9ff511 (diff) |
Merge "Remove straggling zookeper references"
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/org/onap/music/unittests/MusicUtilTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/test/java/org/onap/music/unittests/MusicUtilTest.java b/src/test/java/org/onap/music/unittests/MusicUtilTest.java index 47f387cf..9835034b 100644 --- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java +++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java @@ -92,7 +92,7 @@ public class MusicUtilTest { @Test public void testGetPropkeys() { - assertEquals(MusicUtil.getPropkeys()[2],"music.ip"); + assertEquals(MusicUtil.getPropkeys()[2],"debug"); } @Test diff --git a/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java b/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java index c2666d22..4594ba2c 100644 --- a/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java +++ b/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java @@ -35,7 +35,6 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.curator.test.TestingServer; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -85,7 +84,6 @@ public class TestRestMusicQAPI { RestMusicLocksAPI lock = new RestMusicLocksAPI(); RestMusicQAPI qData = new RestMusicQAPI(); static PreparedQueryObject testObject; - static TestingServer zkServer; @Mock static HttpServletResponse http; @@ -216,8 +214,6 @@ public class TestRestMusicQAPI { MusicCore.eventualPut(testObject); if (MusicDataStoreHandle.mDstoreHandle!=null) {} //MusicDataStoreHandle.mDstoreHandle.close(); - if (zkServer!=null) - zkServer.stop(); } |