Merge "Sonar Fixes - CadiAuthFilter.java"

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

diff --git a/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java b/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java
index 823bada..f7a22d6 100644 (file)
--- a/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java
+++ b/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java
@@ -1,7 +1,9 @@
 /*
  * ============LICENSE_START========================================== org.onap.music
- * =================================================================== Copyright (c) 2017 AT&T
- * Intellectual Property ===================================================================
+ * ===================================================================
+ * 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. You may obtain a copy of the License at
  * 
@@ -15,6 +17,7 @@
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.unittests;
 
 import static org.junit.Assert.assertEquals;
@@ -28,16 +31,18 @@ import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
+import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
-import org.onap.music.lockingservice.MusicLockState;
-import org.onap.music.lockingservice.MusicLockingService;
-import org.onap.music.lockingservice.MusicLockState.LockStatus;
-import org.onap.music.main.MusicCore;
+import org.onap.music.lockingservice.cassandra.MusicLockState;
+import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus;
+import org.onap.music.lockingservice.zookeeper.MusicLockingService;
 import org.onap.music.main.MusicUtil;
 import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
+import org.onap.music.service.impl.MusicZKCore;
+
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 
@@ -48,13 +53,15 @@ public class TestMusicCoreIntegration {
     static PreparedQueryObject testObject;
     static String lockId = null;
     static String lockName = "ks1.tb1.pk1";
+    static MusicZKCore musicZkCore ;
 
     @BeforeClass
     public static void init() throws Exception {
         try {
-            MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
+            MusicDataStoreHandle.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
+            musicZkCore = MusicZKCore.getInstance();
             zkServer = new TestingServer(2181, new File("/tmp/zk"));
-            MusicCore.mLockHandle = new MusicLockingService();
+            MusicZKCore.mLockHandle = new MusicLockingService();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -66,33 +73,33 @@ public class TestMusicCoreIntegration {
         System.out.println("After class");
         testObject = new PreparedQueryObject();
         testObject.appendQueryString(CassandraCQL.dropKeyspace);
-        MusicCore.eventualPut(testObject);
-        MusicCore.deleteLock(lockName);
-        MusicCore.mDstoreHandle.close();
-        MusicCore.mLockHandle.getzkLockHandle().close();
-        MusicCore.mLockHandle.close();
+        musicZkCore.eventualPut(testObject);
+        musicZkCore.deleteLock(lockName);
+        MusicDataStoreHandle.mDstoreHandle.close();
+        MusicZKCore.mLockHandle.getzkLockHandle().close();
+        MusicZKCore.mLockHandle.close();
         zkServer.stop();
 
     }
 
     @Test
     public void Test1_SetUp() throws MusicServiceException, MusicQueryException {
-        MusicCore.mLockHandle = new MusicLockingService();
-        boolean result = false;
+        MusicZKCore.mLockHandle = new MusicLockingService();
+        ResultType result = ResultType.FAILURE;
         testObject = new PreparedQueryObject();
         testObject.appendQueryString(CassandraCQL.createKeySpace);
-        MusicCore.eventualPut(testObject);
+        musicZkCore.eventualPut(testObject);
         testObject = new PreparedQueryObject();
         testObject.appendQueryString(CassandraCQL.createTableEmployees);
-        result = MusicCore.nonKeyRelatedPut(testObject, MusicUtil.EVENTUAL);
-        assertTrue(result);
+        result = musicZkCore.nonKeyRelatedPut(testObject, MusicUtil.EVENTUAL);
+        assertEquals(ResultType.SUCCESS, result);
     }
 
     @Test
     public void Test2_atomicPut() throws Exception {
         testObject = new PreparedQueryObject();
         testObject = CassandraCQL.setPreparedInsertQueryObject1();
-        ReturnType returnType = MusicCore.atomicPut("testCassa", "employees", "Mr Test one",
+        ReturnType returnType = musicZkCore.atomicPut("testCassa", "employees", "Mr Test one",
                         testObject, null);
         assertEquals(ResultType.SUCCESS, returnType.getResult());
     }
@@ -101,7 +108,7 @@ public class TestMusicCoreIntegration {
     public void Test3_atomicPutWithDeleteLock() throws Exception {
         testObject = new PreparedQueryObject();
         testObject = CassandraCQL.setPreparedInsertQueryObject2();
-        ReturnType returnType = MusicCore.atomicPutWithDeleteLock("testCassa", "employees",
+        ReturnType returnType = musicZkCore.atomicPutWithDeleteLock("testCassa", "employees",
                         "Mr Test two", testObject, null);
         assertEquals(ResultType.SUCCESS, returnType.getResult());
     }
@@ -110,7 +117,7 @@ public class TestMusicCoreIntegration {
     public void Test4_atomicGetWithDeleteLock() throws Exception {
         testObject = new PreparedQueryObject();
         testObject = CassandraCQL.setPreparedGetQuery();
-        ResultSet resultSet = MusicCore.atomicGetWithDeleteLock("testCassa", "employees",
+        ResultSet resultSet = musicZkCore.atomicGetWithDeleteLock("testCassa", "employees",
                         "Mr Test one", testObject);
         List<Row> rows = resultSet.all();
         assertEquals(1, rows.size());
@@ -121,26 +128,26 @@ public class TestMusicCoreIntegration {
         testObject = new PreparedQueryObject();
         testObject = CassandraCQL.setPreparedGetQuery();
         ResultSet resultSet =
-                        MusicCore.atomicGet("testCassa", "employees", "Mr Test two", testObject);
+                musicZkCore.atomicGet("testCassa", "employees", "Mr Test two", testObject);
         List<Row> rows = resultSet.all();
         assertEquals(1, rows.size());
     }
 
     @Test
     public void Test6_createLockReference() throws Exception {
-        lockId = MusicCore.createLockReference(lockName);
+        lockId = musicZkCore.createLockReference(lockName);
         assertNotNull(lockId);
     }
 
     @Test
     public void Test7_acquireLockwithLease() throws Exception {
-        ReturnType lockLeaseStatus = MusicCore.acquireLockWithLease(lockName, lockId, 1000);
+        ReturnType lockLeaseStatus = musicZkCore.acquireLockWithLease(lockName, lockId, 1000);
         assertEquals(ResultType.SUCCESS, lockLeaseStatus.getResult());
     }
 
     @Test
     public void Test8_acquireLock() throws Exception {
-        ReturnType lockStatus = MusicCore.acquireLock(lockName, lockId);
+        ReturnType lockStatus = musicZkCore.acquireLock(lockName, lockId);
         assertEquals(ResultType.SUCCESS, lockStatus.getResult());
     }
 
@@ -148,29 +155,41 @@ public class TestMusicCoreIntegration {
     public void Test9_release() throws Exception {
         MusicLockState musicLockState = new MusicLockState(LockStatus.LOCKED, "id1");
         MusicLockState musicLockState1 = new MusicLockState(LockStatus.UNLOCKED, "id1");
-        MusicCore.whoseTurnIsIt(lockName);
-        MusicLockState mls = MusicCore.getMusicLockState(lockName);
+        musicZkCore.whoseTurnIsIt(lockName);
+        MusicLockState mls = MusicZKCore.getMusicLockState(lockName);
         boolean voluntaryRelease = true;
-        MusicLockState mls1 = MusicCore.releaseLock(lockId, voluntaryRelease);
+        MusicLockState mls1 = musicZkCore.releaseLock(lockId, voluntaryRelease);
         assertEquals(musicLockState.getLockStatus(), mls.getLockStatus());
         assertEquals(musicLockState1.getLockStatus(), mls1.getLockStatus());
     }
 
     @Test
     public void Test10_create() {
-        MusicCore.pureZkCreate("/nodeName");
+        MusicZKCore.pureZkCreate("/nodeName");
     }
 
     @Test
     public void Test11_write() {
-        MusicCore.pureZkWrite("nodeName", "I'm Test".getBytes());
+        MusicZKCore.pureZkWrite("nodeName", "I'm Test".getBytes());
     }
 
     @Test
     public void Test12_read() {
-        byte[] data = MusicCore.pureZkRead("nodeName");
+        byte[] data = MusicZKCore.pureZkRead("nodeName");
         String data1 = new String(data);
         assertEquals("I'm Test", data1);
     }
+    @Test
+    public void Test13_ParameterizedConstructorCall() throws MusicServiceException, MusicQueryException {
+        MusicZKCore.mLockHandle = new MusicLockingService("localhost");
+        ResultType result = ResultType.FAILURE;
+        testObject = new PreparedQueryObject();
+        testObject.appendQueryString(CassandraCQL.createKeySpace);
+        musicZkCore.eventualPut(testObject);
+        testObject = new PreparedQueryObject();
+        testObject.appendQueryString(CassandraCQL.createTableEmployees);
+        result = musicZkCore.nonKeyRelatedPut(testObject, MusicUtil.EVENTUAL);
+        assertEquals(ResultType.SUCCESS, result);
+    }
 
 }