aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>2018-03-01 14:30:37 -0500
committerThomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>2018-03-01 14:30:37 -0500
commit168c54c6e774563910a3ed5a7480ea63cd3fe572 (patch)
tree3c47245c87133f8260ed55e99b1ab145147c6be8 /src
parentefff2b72360e33b92b8ae32f76b0c8e6082b7842 (diff)
Sonar and CLM fixes and Unit test
Added zookeeper Server Unit Test back and fixed issues were IP 10.0.0.2 was carried over form another unit test. Change-Id: I9222125decb9b075b7351b3a97f225138799de57 Issue-ID: MUSIC-40 Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
Diffstat (limited to 'src')
-rw-r--r--src/test/java/org/onap/music/unittests/MusicLockingServiceTest.java175
-rw-r--r--src/test/java/org/onap/music/unittests/MusicUtilTest.java20
2 files changed, 185 insertions, 10 deletions
diff --git a/src/test/java/org/onap/music/unittests/MusicLockingServiceTest.java b/src/test/java/org/onap/music/unittests/MusicLockingServiceTest.java
new file mode 100644
index 00000000..7d51465f
--- /dev/null
+++ b/src/test/java/org/onap/music/unittests/MusicLockingServiceTest.java
@@ -0,0 +1,175 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.unittests;
+
+import static org.junit.Assert.*;
+import java.io.File;
+import org.apache.curator.test.TestingServer;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.music.exceptions.MusicLockingException;
+import org.onap.music.exceptions.MusicServiceException;
+import org.onap.music.lockingservice.MusicLockState;
+import org.onap.music.lockingservice.MusicLockingService;
+import org.onap.music.lockingservice.ZkStatelessLockService;
+import org.onap.music.lockingservice.MusicLockState.LockStatus;
+
+public class MusicLockingServiceTest {
+
+ static MusicLockingService mLockHandle;
+ static TestingServer zkServer;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ try {
+ zkServer = new TestingServer(2181,new File("/tmp/zk"));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ System.out.println("####" + zkServer.getPort());
+ try {
+ mLockHandle = new MusicLockingService();
+ } catch (MusicServiceException e) {
+ e.printStackTrace();
+ }
+
+
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ zkServer.stop();
+ mLockHandle.close();
+ }
+
+ @Before
+ public void setUp() throws Exception {}
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testMusicLockingService() {
+ assertTrue(mLockHandle != null);
+ }
+
+ @Test
+ public void testGetzkLockHandle() {
+ ZkStatelessLockService lockHandle = mLockHandle.getzkLockHandle();
+ assertTrue(lockHandle != null);
+ }
+
+ @Test
+ public void testMusicLockingServiceString() {
+ // MusicLockingService mLockTest = new MusicLockingService("localhost");
+ // assertTrue(mLockTest != null);
+ // mLockTest.close();
+ }
+
+ @Test
+ public void testCreateLockaIfItDoesNotExist() {
+
+ mLockHandle.createLockaIfItDoesNotExist("/ks1.tb1.pk1");
+ MusicLockState mls = null;
+ try {
+ // mls = mLockHandle.
+ mls = mLockHandle.getLockState("ks1.tb1.pk1");
+ } catch (MusicLockingException e) {
+ e.printStackTrace();
+ }
+ System.out.println("Lock Holder:" + mls.getLockHolder());
+ assertFalse(mls.getLeaseStartTime() > 0);
+ }
+
+ @Test
+ public void testSetLockState() {
+ MusicLockState musicLockState = new MusicLockState(LockStatus.UNLOCKED, "id1");
+ mLockHandle.setLockState("ks1.tb1.pk1",musicLockState);
+ MusicLockState mls = null;
+ try {
+ mls = mLockHandle.getLockState("ks1.tb1.pk1");
+ } catch (MusicLockingException e) {
+ e.printStackTrace();
+ }
+ assertEquals(musicLockState.getLockHolder(), mls.getLockHolder());
+
+ }
+
+// @Test
+// public void testGetLockState() {
+// MusicLockState mls = null;
+// try {
+// mls = mLockHandle.getLockState("ks1.tb1.pk1");
+// } catch (MusicLockingException e) {
+// e.printStackTrace();
+// }
+// assertTrue(mls.getLockHolder().equals("id1"));
+// }
+
+// @Test
+// public void testCreateLockId() {
+//
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testIsMyTurn() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testUnlockAndDeleteId() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testDeleteLock() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testWhoseTurnIsIt() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testProcess() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testClose() {
+// fail("Not yet implemented"); // TODO
+// }
+//
+// @Test
+// public void testLockIdExists() {
+// fail("Not yet implemented"); // TODO
+// }
+
+}
diff --git a/src/test/java/org/onap/music/unittests/MusicUtilTest.java b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
index 35ec3791..e540d646 100644
--- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java
+++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
@@ -73,11 +73,11 @@ public class MusicUtilTest {
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 testGetPublicIp() {
+// MusicUtil.setPublicIp("10.0.0.1");
+// assertEquals(MusicUtil.getPublicIp(),"10.0.0.1");
+// }
@Test
public void testGetAllPublicIps() {
@@ -124,11 +124,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() {