diff options
Diffstat (limited to 'src/test/java/org/onap/music/unittests')
| -rw-r--r-- | src/test/java/org/onap/music/unittests/CassandraCQLQueries.java (renamed from src/test/java/org/onap/music/unittests/CassandraCQL.java) | 8 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/MusicDataStoreTest.java | 22 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/MusicLockStoreTest.java | 23 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestCassaLockStore.java | 12 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestMusicCore.java | 29 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java | 62 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestRestMusicData.java | 21 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java | 14 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestVotingApp.java | 5 |
9 files changed, 104 insertions, 92 deletions
diff --git a/src/test/java/org/onap/music/unittests/CassandraCQL.java b/src/test/java/org/onap/music/unittests/CassandraCQLQueries.java index a9cbe109..41c518e9 100644 --- a/src/test/java/org/onap/music/unittests/CassandraCQL.java +++ b/src/test/java/org/onap/music/unittests/CassandraCQLQueries.java @@ -45,10 +45,10 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.thrift.transport.TTransportException; import org.cassandraunit.utils.EmbeddedCassandraServerHelper; -import org.onap.music.datastore.CassaDataStore; +import org.onap.music.datastore.MusicDataStore; import org.onap.music.datastore.PreparedQueryObject; -public class CassandraCQL { +public class CassandraCQLQueries { public static final String createKeySpace = "CREATE KEYSPACE IF NOT EXISTS testCassa WITH replication = " @@ -222,7 +222,7 @@ public class CassandraCQL { return allPossibleIps; } - public static CassaDataStore connectToEmbeddedCassandra() { + public static MusicDataStore connectToEmbeddedCassandra() { Iterator<String> it = getAllPossibleLocalIps().iterator(); String address = "localhost"; @@ -249,7 +249,7 @@ public class CassandraCQL { } } - return new CassaDataStore(cluster, session); + return new MusicDataStore(cluster, session); } diff --git a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java index 3f7fd3b7..62275bb3 100644 --- a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java @@ -33,7 +33,7 @@ import org.mockito.Mock; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.datastore.CassaDataStore; +import org.onap.music.datastore.MusicDataStore; import org.onap.music.datastore.PreparedQueryObject; import com.datastax.driver.core.DataType; @@ -44,12 +44,12 @@ import com.datastax.driver.core.TableMetadata; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class MusicDataStoreTest { - static CassaDataStore dataStore; + static MusicDataStore dataStore; static PreparedQueryObject testObject; @BeforeClass public static void init() { - dataStore = CassandraCQL.connectToEmbeddedCassandra(); + dataStore = CassandraCQLQueries.connectToEmbeddedCassandra(); } @@ -57,7 +57,7 @@ public class MusicDataStoreTest { public static void close() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.dropKeyspace); + testObject.appendQueryString(CassandraCQLQueries.dropKeyspace); dataStore.executePut(testObject, "eventual"); dataStore.close(); @@ -67,10 +67,10 @@ public class MusicDataStoreTest { public void Test1_SetUp() throws MusicServiceException, MusicQueryException { boolean result = false; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createKeySpace); + testObject.appendQueryString(CassandraCQLQueries.createKeySpace); result = dataStore.executePut(testObject, "eventual");; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createTableEmployees); + testObject.appendQueryString(CassandraCQLQueries.createTableEmployees); result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -78,21 +78,21 @@ public class MusicDataStoreTest { @Test public void Test2_ExecutePut_eventual_insert() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedInsertQueryObject1(); + testObject = CassandraCQLQueries.setPreparedInsertQueryObject1(); boolean result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); } @Test public void Test3_ExecutePut_critical_insert() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedInsertQueryObject2(); + testObject = CassandraCQLQueries.setPreparedInsertQueryObject2(); boolean result = dataStore.executePut(testObject, "Critical"); assertEquals(true, result); } @Test public void Test4_ExecutePut_eventual_update() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedUpdateQueryObject(); + testObject = CassandraCQLQueries.setPreparedUpdateQueryObject(); boolean result = false; result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -101,7 +101,7 @@ public class MusicDataStoreTest { @Test public void Test5_ExecuteEventualGet() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.selectALL); + testObject.appendQueryString(CassandraCQLQueries.selectALL); boolean result = false; int count = 0; ResultSet output = null; @@ -120,7 +120,7 @@ public class MusicDataStoreTest { @Test public void Test6_ExecuteCriticalGet() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedGetQuery(); + testObject = CassandraCQLQueries.setPreparedGetQuery(); boolean result = false; int count = 0; ResultSet output = null; diff --git a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java index 86774538..45ce9296 100644 --- a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java @@ -32,9 +32,8 @@ import org.junit.runners.MethodSorters; import org.mockito.Mock; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; - -import org.onap.music.datastore.CassaDataStore; -import org.onap.music.datastore.CassaLockStore; +import org.onap.music.lockingservice.cassandra.CassaLockStore; +import org.onap.music.datastore.MusicDataStore; import org.onap.music.datastore.PreparedQueryObject; import com.datastax.driver.core.DataType; @@ -45,13 +44,13 @@ import com.datastax.driver.core.TableMetadata; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class MusicLockStoreTest { - static CassaDataStore dataStore; + static MusicDataStore dataStore; static CassaLockStore lockStore; static PreparedQueryObject testObject; @BeforeClass public static void init() { - dataStore = CassandraCQL.connectToEmbeddedCassandra(); + dataStore = CassandraCQLQueries.connectToEmbeddedCassandra(); lockStore = new CassaLockStore(dataStore); } @@ -59,7 +58,7 @@ public class MusicLockStoreTest { @AfterClass public static void close() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.dropKeyspace); + testObject.appendQueryString(CassandraCQLQueries.dropKeyspace); dataStore.executePut(testObject, "eventual"); dataStore.close(); @@ -69,10 +68,10 @@ public class MusicLockStoreTest { public void Test1_SetUp() throws MusicServiceException, MusicQueryException { boolean result = false; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createKeySpace); + testObject.appendQueryString(CassandraCQLQueries.createKeySpace); result = dataStore.executePut(testObject, "eventual");; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createTableEmployees); + testObject.appendQueryString(CassandraCQLQueries.createTableEmployees); result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -93,14 +92,14 @@ public class MusicLockStoreTest { @Test public void Test3_ExecutePut_critical_insert() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedInsertQueryObject2(); + testObject = CassandraCQLQueries.setPreparedInsertQueryObject2(); boolean result = dataStore.executePut(testObject, "Critical"); assertEquals(true, result); } @Test public void Test4_ExecutePut_eventual_update() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedUpdateQueryObject(); + testObject = CassandraCQLQueries.setPreparedUpdateQueryObject(); boolean result = false; result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -109,7 +108,7 @@ public class MusicLockStoreTest { @Test public void Test5_ExecuteEventualGet() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.selectALL); + testObject.appendQueryString(CassandraCQLQueries.selectALL); boolean result = false; int count = 0; ResultSet output = null; @@ -128,7 +127,7 @@ public class MusicLockStoreTest { @Test public void Test6_ExecuteCriticalGet() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQL.setPreparedGetQuery(); + testObject = CassandraCQLQueries.setPreparedGetQuery(); boolean result = false; int count = 0; ResultSet output = null; diff --git a/src/test/java/org/onap/music/unittests/TestCassaLockStore.java b/src/test/java/org/onap/music/unittests/TestCassaLockStore.java index bf058121..2f3750a2 100644 --- a/src/test/java/org/onap/music/unittests/TestCassaLockStore.java +++ b/src/test/java/org/onap/music/unittests/TestCassaLockStore.java @@ -2,16 +2,18 @@ package org.onap.music.unittests; import java.util.HashMap; import java.util.Map; -import java.util.UUID; -import org.onap.music.datastore.CassaLockStore; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.main.MusicCore; +import org.onap.music.lockingservice.cassandra.CassaLockStore; +import org.onap.music.service.MusicCoreService; +import org.onap.music.service.impl.MusicCassaCore; public class TestCassaLockStore { + static MusicCoreService musicCore = MusicCassaCore.getInstance(); + public static void main(String[] args) { @@ -27,12 +29,12 @@ public class TestCassaLockStore { PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString("CREATE KEYSPACE " + keyspace + " WITH REPLICATION = " + replicationInfo.toString().replaceAll("=", ":")); - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); + musicCore.nonKeyRelatedPut(queryObject, "eventual"); queryObject = new PreparedQueryObject(); queryObject.appendQueryString("CREATE TABLE " + keyspace + "." + table + " (name text PRIMARY KEY, count varint);"); - MusicCore.createTable(keyspace, table, queryObject, "eventual"); + musicCore.createTable(keyspace, table, queryObject, "eventual"); lockStore.createLockQueue(keyspace, table); diff --git a/src/test/java/org/onap/music/unittests/TestMusicCore.java b/src/test/java/org/onap/music/unittests/TestMusicCore.java index 01d2ffb6..6f0a93a0 100644 --- a/src/test/java/org/onap/music/unittests/TestMusicCore.java +++ b/src/test/java/org/onap/music/unittests/TestMusicCore.java @@ -1,10 +1,6 @@ package org.onap.music.unittests; -import static org.junit.Assert.assertEquals; - import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import org.junit.AfterClass; @@ -13,12 +9,14 @@ import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.onap.music.datastore.CassaDataStore; -import org.onap.music.datastore.CassaLockStore; +import org.onap.music.datastore.MusicDataStore; +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.main.MusicCore; +import org.onap.music.lockingservice.cassandra.CassaLockStore; +import org.onap.music.service.MusicCoreService; +import org.onap.music.service.impl.MusicCassaCore; import com.datastax.driver.core.ResultSet; @@ -27,16 +25,17 @@ import com.datastax.driver.core.ResultSet; public class TestMusicCore { static PreparedQueryObject testObject; - static CassaDataStore dataStore; + static MusicDataStore dataStore; String keyspace = "MusicCoreUnitTestKp"; String table = "SampleTable"; + static MusicCoreService musicCore = MusicCassaCore.getInstance(); @BeforeClass public static void init() { System.out.println("TestMusicCore Init"); try { - MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra(); - MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle); + MusicDataStoreHandle.mDstoreHandle = CassandraCQLQueries.connectToEmbeddedCassandra(); + CassaLockStore mLockHandle = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); } catch (Exception e) { e.printStackTrace(); } @@ -46,9 +45,9 @@ public class TestMusicCore { public static void close() throws MusicServiceException, MusicQueryException { System.out.println("After class TestMusicCore"); testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.dropKeyspace); - MusicCore.eventualPut(testObject); - MusicCore.mDstoreHandle.close(); + testObject.appendQueryString(CassandraCQLQueries.dropKeyspace); + musicCore.eventualPut(testObject); + MusicDataStoreHandle.mDstoreHandle.close(); } @Test @@ -61,7 +60,7 @@ public class TestMusicCore { PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString( "CREATE KEYSPACE " + keyspace + " WITH REPLICATION = " + replicationInfo.toString().replaceAll("=", ":")); - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); + musicCore.nonKeyRelatedPut(queryObject, "eventual"); //check with the system table in cassandra @@ -77,7 +76,7 @@ public class TestMusicCore { PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString( "CREATE TABLE " + keyspace + "." + table + " (name text PRIMARY KEY, count varint);"); - MusicCore.createTable(keyspace, table, queryObject, "eventual"); + musicCore.createTable(keyspace, table, queryObject, "eventual"); //check with the system table in cassandra diff --git a/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java b/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java index 9b4fc229..53b6d8bc 100644 --- a/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java +++ b/src/test/java/org/onap/music/unittests/TestMusicCoreIntegration.java @@ -19,26 +19,29 @@ package org.onap.music.unittests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import java.io.File; + import java.util.List; -import org.apache.curator.test.TestingServer; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Ignore; 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.datastore.CassaLockStore; -import org.onap.music.datastore.MusicLockState; -import org.onap.music.datastore.MusicLockState.LockStatus; -import org.onap.music.main.MusicCore; +import org.onap.music.lockingservice.cassandra.CassaLockStore; +import org.onap.music.lockingservice.cassandra.MusicLockState; +import org.onap.music.lockingservice.cassandra.MusicLockState.LockStatus; +import org.onap.music.service.MusicCoreService; +import org.onap.music.service.impl.*; import org.onap.music.main.MusicUtil; import org.onap.music.main.ResultType; import org.onap.music.main.ReturnType; +import org.onap.music.service.impl.MusicCassaCore; + import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; @@ -49,12 +52,13 @@ public class TestMusicCoreIntegration { static PreparedQueryObject testObject; static String lockId = null; static String lockName = "ks1.tb1.pk1"; + static MusicCassaCore musicCore = MusicCassaCore.getInstance(); @BeforeClass public static void init() throws Exception { try { - MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra(); - MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle); + MusicDataStoreHandle.mDstoreHandle = CassandraCQLQueries.connectToEmbeddedCassandra(); + MusicCassaCore.mLockHandle = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); } catch (Exception e) { e.printStackTrace(); } @@ -64,31 +68,31 @@ public class TestMusicCoreIntegration { public static void tearDownAfterClass() throws Exception { System.out.println("After class"); testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.dropKeyspace); - MusicCore.eventualPut(testObject); - MusicCore.deleteLock(lockName); - MusicCore.mDstoreHandle.close(); + testObject.appendQueryString(CassandraCQLQueries.dropKeyspace); + musicCore.eventualPut(testObject); + musicCore.deleteLock(lockName); + MusicDataStoreHandle.mDstoreHandle.close(); } @Test public void Test1_SetUp() throws MusicServiceException, MusicQueryException { - MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra(); - MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle); + MusicDataStoreHandle.mDstoreHandle = CassandraCQLQueries.connectToEmbeddedCassandra(); + MusicCassaCore.mLockHandle = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); ResultType result = ResultType.FAILURE; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createKeySpace); - MusicCore.eventualPut(testObject); + testObject.appendQueryString(CassandraCQLQueries.createKeySpace); + musicCore.eventualPut(testObject); testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQL.createTableEmployees); - result = MusicCore.nonKeyRelatedPut(testObject, MusicUtil.EVENTUAL); + testObject.appendQueryString(CassandraCQLQueries.createTableEmployees); + result = musicCore.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", + testObject = CassandraCQLQueries.setPreparedInsertQueryObject1(); + ReturnType returnType = musicCore.atomicPut("testCassa", "employees", "Mr Test one", testObject, null); assertEquals(ResultType.SUCCESS, returnType.getResult()); } @@ -97,28 +101,28 @@ public class TestMusicCoreIntegration { @Test public void Test5_atomicGet() throws Exception { testObject = new PreparedQueryObject(); - testObject = CassandraCQL.setPreparedGetQuery(); + testObject = CassandraCQLQueries.setPreparedGetQuery(); ResultSet resultSet = - MusicCore.atomicGet("testCassa", "employees", "Mr Test two", testObject); + musicCore.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 = musicCore.createLockReference(lockName); assertNotNull(lockId); } @Test public void Test7_acquireLockwithLease() throws Exception { - ReturnType lockLeaseStatus = MusicCore.acquireLockWithLease(lockName, lockId, 1000); + ReturnType lockLeaseStatus = musicCore.acquireLockWithLease(lockName, lockId, 1000); assertEquals(ResultType.SUCCESS, lockLeaseStatus.getResult()); } @Test public void Test8_acquireLock() throws Exception { - ReturnType lockStatus = MusicCore.acquireLock(lockName, lockId); + ReturnType lockStatus = musicCore.acquireLock(lockName, lockId); assertEquals(ResultType.SUCCESS, lockStatus.getResult()); } @@ -126,9 +130,9 @@ 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); - MusicLockState mls1 = MusicCore.voluntaryReleaseLock(lockName,lockId); + musicCore.whoseTurnIsIt(lockName); + MusicLockState mls = musicCore.getMusicLockState(lockName); + MusicLockState mls1 = musicCore.voluntaryReleaseLock(lockName,lockId); assertEquals(musicLockState.getLockStatus(), mls.getLockStatus()); assertEquals(musicLockState1.getLockStatus(), mls1.getLockStatus()); } diff --git a/src/test/java/org/onap/music/unittests/TestRestMusicData.java b/src/test/java/org/onap/music/unittests/TestRestMusicData.java index f0c52a3b..01ae861b 100644 --- a/src/test/java/org/onap/music/unittests/TestRestMusicData.java +++ b/src/test/java/org/onap/music/unittests/TestRestMusicData.java @@ -21,15 +21,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import java.io.File; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; + 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.AfterClass; import org.junit.BeforeClass; @@ -44,7 +46,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.runners.MockitoJUnitRunner; -import org.onap.music.datastore.CassaLockStore; +import org.onap.music.datastore.MusicDataStoreHandle; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.datastore.jsonobjects.JsonDelete; import org.onap.music.datastore.jsonobjects.JsonInsert; @@ -53,13 +55,16 @@ import org.onap.music.datastore.jsonobjects.JsonOnboard; import org.onap.music.datastore.jsonobjects.JsonSelect; import org.onap.music.datastore.jsonobjects.JsonTable; import org.onap.music.datastore.jsonobjects.JsonUpdate; +import org.onap.music.lockingservice.cassandra.CassaLockStore; import org.onap.music.main.CachingUtil; -import org.onap.music.main.MusicCore; +import org.onap.music.service.impl.*; import org.onap.music.main.MusicUtil; import org.onap.music.main.ResultType; import org.onap.music.rest.RestMusicAdminAPI; import org.onap.music.rest.RestMusicDataAPI; import org.onap.music.rest.RestMusicLocksAPI; +import org.onap.music.service.impl.MusicCassaCore; + import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; @@ -87,7 +92,7 @@ public class TestRestMusicData { CachingUtil cachUtilMock; @InjectMocks - private MusicCore mCore; + private static MusicCassaCore MusicCore =MusicCassaCore.getInstance(); //*/ static String appName = "TestApp"; @@ -109,8 +114,8 @@ public class TestRestMusicData { @BeforeClass public static void init() throws Exception { try { - MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra(); - MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle); + MusicDataStoreHandle.mDstoreHandle = CassandraCQLQueries.connectToEmbeddedCassandra(); + MusicCore.mLockHandle = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); } catch (Exception e) { e.printStackTrace(); } @@ -124,8 +129,8 @@ public class TestRestMusicData { testObject = new PreparedQueryObject(); testObject.appendQueryString("DROP KEYSPACE IF EXISTS admin"); MusicCore.eventualPut(testObject); - if(MusicCore.mDstoreHandle!=null) - MusicCore.mDstoreHandle.close(); + if(MusicDataStoreHandle.mDstoreHandle!=null) + MusicDataStoreHandle.mDstoreHandle.close(); if(zkServer!=null) zkServer.stop(); } diff --git a/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java b/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java index a3d3d709..93591bfd 100644 --- a/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java +++ b/src/test/java/org/onap/music/unittests/TestRestMusicQAPI.java @@ -47,7 +47,8 @@ import org.mindrot.jbcrypt.BCrypt; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.onap.music.datastore.CassaLockStore; +import org.onap.music.lockingservice.cassandra.CassaLockStore; +import org.onap.music.datastore.MusicDataStoreHandle; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.datastore.jsonobjects.JsonDelete; import org.onap.music.datastore.jsonobjects.JsonInsert; @@ -57,12 +58,12 @@ import org.onap.music.datastore.jsonobjects.JsonKeySpace; import org.onap.music.datastore.jsonobjects.JsonSelect; import org.onap.music.datastore.jsonobjects.JsonTable; import org.onap.music.datastore.jsonobjects.JsonUpdate; -import org.onap.music.main.MusicCore; import org.onap.music.main.MusicUtil; //import org.onap.music.main.ResultType; import org.onap.music.rest.RestMusicAdminAPI; import org.onap.music.rest.RestMusicDataAPI; import org.onap.music.rest.RestMusicQAPI; +import org.onap.music.service.impl.MusicCassaCore; import org.onap.music.rest.RestMusicLocksAPI; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; @@ -119,12 +120,13 @@ public class TestRestMusicQAPI { static JsonKeySpace kspObject=null; static RestMusicDataAPI data = new RestMusicDataAPI(); static Response resp; + static MusicCassaCore MusicCore = MusicCassaCore.getInstance(); @BeforeClass public static void init() throws Exception { try { - MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra(); - MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle); + MusicDataStoreHandle.mDstoreHandle = CassandraCQLQueries.connectToEmbeddedCassandra(); + MusicCassaCore.mLockHandle = new CassaLockStore(MusicDataStoreHandle.mDstoreHandle); // System.out.println("before class keysp"); //resp=data.createKeySpace(majorV,minorV,patchV,aid,appName,userId,password,kspObject,keyspaceName); @@ -211,8 +213,8 @@ public class TestRestMusicQAPI { testObject = new PreparedQueryObject(); testObject.appendQueryString("DROP KEYSPACE IF EXISTS admin"); MusicCore.eventualPut(testObject); - if (MusicCore.mDstoreHandle!=null) - MusicCore.mDstoreHandle.close(); + if (MusicDataStoreHandle.mDstoreHandle!=null) + MusicDataStoreHandle.mDstoreHandle.close(); if (zkServer!=null) zkServer.stop(); } diff --git a/src/test/java/org/onap/music/unittests/TestVotingApp.java b/src/test/java/org/onap/music/unittests/TestVotingApp.java index e7a1e252..8ac71802 100644 --- a/src/test/java/org/onap/music/unittests/TestVotingApp.java +++ b/src/test/java/org/onap/music/unittests/TestVotingApp.java @@ -2,12 +2,12 @@ package org.onap.music.unittests; import java.util.HashMap; import java.util.Map; - + import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.exceptions.MusicLockingException; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.main.MusicCore; +import org.onap.music.service.impl.MusicCassaCore; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; @@ -19,6 +19,7 @@ public class TestVotingApp { String keyspaceName; String tableName; + static MusicCassaCore MusicCore = MusicCassaCore.getInstance(); public TestVotingApp() throws MusicServiceException { keyspaceName = "VotingAppForMusic"+System.currentTimeMillis(); |