1 files changed, 16 insertions, 5 deletions
diff --git a/src/test/java/org/onap/music/unittests/TestMusicCore.java b/src/test/java/org/onap/music/unittests/TestMusicCore.java
index 3a28f963..01d2ffb6 100644
--- a/src/test/java/org/onap/music/unittests/TestMusicCore.java
+++ b/src/test/java/org/onap/music/unittests/TestMusicCore.java
@@ -10,9 +10,11 @@ import java.util.Map;
 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.CassaDataStore;
+import org.onap.music.datastore.CassaLockStore;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
@@ -21,23 +23,32 @@ import org.onap.music.main.MusicCore;
 import com.datastax.driver.core.ResultSet;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 public class TestMusicCore {
 	
+	static PreparedQueryObject testObject;
     static CassaDataStore dataStore;
     String keyspace = "MusicCoreUnitTestKp";
     String table = "SampleTable";
 
     @BeforeClass
     public static void init() {
-        dataStore = CassandraCQL.connectToEmbeddedCassandra();       
-        MusicCore.mDstoreHandle = dataStore;
-
-
+    	System.out.println("TestMusicCore Init");
+        try {
+            MusicCore.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
+            MusicCore.mLockHandle = new CassaLockStore(MusicCore.mDstoreHandle);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     
     @AfterClass
     public static void close() throws MusicServiceException, MusicQueryException {
-        dataStore.close();
+    	System.out.println("After class TestMusicCore");
+        testObject = new PreparedQueryObject();
+        testObject.appendQueryString(CassandraCQL.dropKeyspace);
+        MusicCore.eventualPut(testObject);
+        MusicCore.mDstoreHandle.close();
     }
 
     @Test