diff options
Diffstat (limited to 'src/test/java/org/onap/music/unittests/MusicLockStoreTest.java')
| -rw-r--r-- | src/test/java/org/onap/music/unittests/MusicLockStoreTest.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java index 45ce9296..86774538 100644 --- a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java @@ -32,8 +32,9 @@ 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.lockingservice.cassandra.CassaLockStore; -import org.onap.music.datastore.MusicDataStore; + +import org.onap.music.datastore.CassaDataStore; +import org.onap.music.datastore.CassaLockStore; import org.onap.music.datastore.PreparedQueryObject; import com.datastax.driver.core.DataType; @@ -44,13 +45,13 @@ import com.datastax.driver.core.TableMetadata; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class MusicLockStoreTest { - static MusicDataStore dataStore; + static CassaDataStore dataStore; static CassaLockStore lockStore; static PreparedQueryObject testObject; @BeforeClass public static void init() { - dataStore = CassandraCQLQueries.connectToEmbeddedCassandra(); + dataStore = CassandraCQL.connectToEmbeddedCassandra(); lockStore = new CassaLockStore(dataStore); } @@ -58,7 +59,7 @@ public class MusicLockStoreTest { @AfterClass public static void close() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQLQueries.dropKeyspace); + testObject.appendQueryString(CassandraCQL.dropKeyspace); dataStore.executePut(testObject, "eventual"); dataStore.close(); @@ -68,10 +69,10 @@ public class MusicLockStoreTest { public void Test1_SetUp() throws MusicServiceException, MusicQueryException { boolean result = false; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQLQueries.createKeySpace); + testObject.appendQueryString(CassandraCQL.createKeySpace); result = dataStore.executePut(testObject, "eventual");; testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQLQueries.createTableEmployees); + testObject.appendQueryString(CassandraCQL.createTableEmployees); result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -92,14 +93,14 @@ public class MusicLockStoreTest { @Test public void Test3_ExecutePut_critical_insert() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQLQueries.setPreparedInsertQueryObject2(); + testObject = CassandraCQL.setPreparedInsertQueryObject2(); boolean result = dataStore.executePut(testObject, "Critical"); assertEquals(true, result); } @Test public void Test4_ExecutePut_eventual_update() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQLQueries.setPreparedUpdateQueryObject(); + testObject = CassandraCQL.setPreparedUpdateQueryObject(); boolean result = false; result = dataStore.executePut(testObject, "eventual"); assertEquals(true, result); @@ -108,7 +109,7 @@ public class MusicLockStoreTest { @Test public void Test5_ExecuteEventualGet() throws MusicServiceException, MusicQueryException { testObject = new PreparedQueryObject(); - testObject.appendQueryString(CassandraCQLQueries.selectALL); + testObject.appendQueryString(CassandraCQL.selectALL); boolean result = false; int count = 0; ResultSet output = null; @@ -127,7 +128,7 @@ public class MusicLockStoreTest { @Test public void Test6_ExecuteCriticalGet() throws MusicServiceException, MusicQueryException { - testObject = CassandraCQLQueries.setPreparedGetQuery(); + testObject = CassandraCQL.setPreparedGetQuery(); boolean result = false; int count = 0; ResultSet output = null; |