diff options
| author |   Mohammad Salehe <salehe@cs.toronto.edu> | 2019-02-08 11:58:35 -0500 |
|---|---|---|
| committer | Mohammad Salehe <salehe@cs.toronto.edu> | 2019-02-24 22:23:39 -0500 |
| commit | ee0e4cef1eaba1691f2a69c94f9707a9dbcfcd63 (patch) | |
| tree | 0ea14a449dd3e1c7cb9269dfba65bd650c8af23c /src/test/java | |
| parent | f6b5b60d066fa47ef520c58305aa6f28827f106b (diff) | |
Make MusicCore non-staticdev-cassandra-only
Make MusicCore and other dependencies (MusicDataStoreHandle) non-static
For compatibility, MusicCore still has a singleton instance that is statically instantiated and can be used as needed by legacy users.
These changes should be made in calling sites (legacy users using singleton):
MusicDataStoreHandle.getDSHandle() -> MusicCore.getInstanceDSHandle()
Change-Id: I02b67f316dc21a1498157bc68cc32bf76d3ec01e
Issue-ID: MUSIC-148
Signed-off-by: Mohammad Salehe <salehe@cs.toronto.edu>
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/org/onap/music/unittests/MusicDataStoreTest.java | 1 | ||||
| -rw-r--r-- | src/test/java/org/onap/music/unittests/TestCassaLockStore.java | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java index b739fa25..ef4e8f76 100644 --- a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java @@ -59,7 +59,6 @@ public class MusicDataStoreTest { testObject.appendQueryString(CassandraCQL.dropKeyspace); dataStore.executePut(testObject, "eventual"); dataStore.close(); - } @Test diff --git a/src/test/java/org/onap/music/unittests/TestCassaLockStore.java b/src/test/java/org/onap/music/unittests/TestCassaLockStore.java index 4320609f..ff048b33 100644 --- a/src/test/java/org/onap/music/unittests/TestCassaLockStore.java +++ b/src/test/java/org/onap/music/unittests/TestCassaLockStore.java @@ -4,11 +4,16 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; +import org.onap.music.datastore.CassandraClusterBuilder; +import org.onap.music.datastore.MusicDataStore; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; import org.onap.music.lockingservice.cassandra.CassaLockStore; import org.onap.music.main.MusicCore; +import org.onap.music.main.MusicUtil; public class TestCassaLockStore { @@ -17,7 +22,9 @@ public class TestCassaLockStore { try { - CassaLockStore lockStore = new CassaLockStore(); + Cluster cluster = CassandraClusterBuilder.connectSmart(MusicUtil.getMyCassaHost()); + Session session = cluster.connect(); + CassaLockStore lockStore = new CassaLockStore(new MusicDataStore(cluster, session)); String keyspace = "ks_testLockStore"; String table = "table_testLockStore"; |