music core implemented as a service

Change-Id: I4075d0efb03bf2a153976354947be1329660c1f1
Issue-ID: MUSIC-148
Signed-off-by: srupane kondreddy <sk5300@research.att.com>

1 files changed, 14 insertions, 15 deletions

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