Unit tests for MusicDataStore and CassaLockStore

Change-Id: I8ad41f58262210204a34cf62e4172653d335d983
Issue-ID: MUSIC-521
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>

5 files changed, 836 insertions, 13 deletions

diff --git a/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java b/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java
index 2e17670f..dd911491 100755
--- a/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java
+++ b/music-core/src/main/java/org/onap/music/datastore/MusicDataStore.java
@@ -61,6 +61,10 @@ import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
  *
  */
 public class MusicDataStore {
+
+    public static final String CONSISTENCY_LEVEL_ONE = "ONE";
+    public static final String CONSISTENCY_LEVEL_QUORUM = "QUORUM";
+    public static final String CONSISTENCY_LEVEL_LOCAL_QUORUM = "LOCAL_QUORUM";
     private Session session;
     private Cluster cluster;
 
@@ -466,16 +470,11 @@ public class MusicDataStore {
         ResultSet results = null;
         try {
             SimpleStatement statement = new SimpleStatement(queryObject.getQuery(), queryObject.getValues().toArray());
-
-            if (consistencyLevel.equalsIgnoreCase(MusicUtil.ONE)) {
-                if(queryObject.getConsistency() == null) {
+            if (consistencyLevel.equalsIgnoreCase(CONSISTENCY_LEVEL_ONE)) {
                     statement.setConsistencyLevel(ConsistencyLevel.ONE);
-                } else {
-                    statement.setConsistencyLevel(MusicUtil.getConsistencyLevel(queryObject.getConsistency()));
-                }
-            } else if (consistencyLevel.equalsIgnoreCase(MusicUtil.QUORUM)) {
+            } else if (consistencyLevel.equalsIgnoreCase(CONSISTENCY_LEVEL_QUORUM)) {
                 statement.setConsistencyLevel(ConsistencyLevel.QUORUM);
-            } else if (consistencyLevel.equalsIgnoreCase(MusicUtil.LOCAL_QUORUM)) {
+            } else if (consistencyLevel.equalsIgnoreCase(CONSISTENCY_LEVEL_LOCAL_QUORUM)) {
                 statement.setConsistencyLevel(ConsistencyLevel.LOCAL_QUORUM);
             }
 
@@ -498,7 +497,7 @@ public class MusicDataStore {
      */
     public ResultSet executeOneConsistencyGet(PreparedQueryObject queryObject)
                     throws MusicServiceException, MusicQueryException {
-        return executeGet(queryObject, MusicUtil.ONE);
+        return executeGet(queryObject, CONSISTENCY_LEVEL_ONE);
     }
     
     /**
@@ -509,7 +508,7 @@ public class MusicDataStore {
      */
     public ResultSet executeLocalQuorumConsistencyGet(PreparedQueryObject queryObject)
                     throws MusicServiceException, MusicQueryException {
-        return executeGet(queryObject, MusicUtil.LOCAL_QUORUM);
+        return executeGet(queryObject, CONSISTENCY_LEVEL_LOCAL_QUORUM);
     }
     
     /**
@@ -520,7 +519,7 @@ public class MusicDataStore {
      */
     public ResultSet executeQuorumConsistencyGet(PreparedQueryObject queryObject)
                     throws MusicServiceException, MusicQueryException {
-        return executeGet(queryObject, MusicUtil.QUORUM);
+        return executeGet(queryObject, CONSISTENCY_LEVEL_QUORUM);
     }
     
 }
diff --git a/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java
new file mode 100644
index 00000000..4de995f7
--- /dev/null
+++ b/music-core/src/test/java/org/onap/music/datastore/MusicDataStoreTest.java
@@ -0,0 +1,440 @@
+/*******************************************************************************
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2019 AT&T Intellectual Property
+ * ===================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ *******************************************************************************/
+package org.onap.music.datastore;
+
+import static org.junit.Assert.*;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.music.exceptions.MusicQueryException;
+import org.onap.music.exceptions.MusicServiceException;
+import org.onap.music.main.MusicUtil;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.CodecRegistry;
+import com.datastax.driver.core.ColumnDefinitions;
+import com.datastax.driver.core.ColumnDefinitions.Definition;
+import com.datastax.driver.core.exceptions.WriteTimeoutException;
+import com.datastax.driver.core.ColumnMetadata;
+import com.datastax.driver.core.Configuration;
+import com.datastax.driver.core.ConsistencyLevel;
+import com.datastax.driver.core.DataType;
+import com.datastax.driver.core.KeyspaceMetadata;
+import com.datastax.driver.core.Metadata;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.SimpleStatement;
+import com.datastax.driver.core.Statement;
+import com.datastax.driver.core.TableMetadata;
+import com.datastax.driver.core.WriteType;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MusicDataStoreTest {
+    
+    MusicDataStore dataStore;
+    
+    @Mock
+    Session session;
+    
+    @Mock
+    Cluster cluster;
+    
+    @Before
+    public void before() {
+        CodecRegistry cr = Mockito.mock(CodecRegistry.class);
+        Configuration config = Mockito.mock(Configuration.class);
+        Mockito.when(cluster.getConfiguration()).thenReturn(config);
+        Mockito.when(config.getCodecRegistry()).thenReturn(cr);
+        dataStore = new MusicDataStore(cluster, session);
+    }
+
+    @Test
+    public void testMusicDataStore() {
+        //MusicDataStore mds = new MusicDataStore();
+    }
+    
+    @Test
+    public void testMusicDataStoreClusterSession() {
+        Session session = Mockito.mock(Session.class);
+        Cluster cluster = Mockito.mock(Cluster.class);
+        
+        CodecRegistry cr = Mockito.mock(CodecRegistry.class);
+        Configuration config = Mockito.mock(Configuration.class);
+        Mockito.when(cluster.getConfiguration()).thenReturn(config);
+        Mockito.when(config.getCodecRegistry()).thenReturn(cr);
+        
+        
+        MusicDataStore mds = new MusicDataStore(cluster, session);
+        assertEquals(session, mds.getSession());
+        assertEquals(cluster, mds.getCluster());
+    }
+
+    @Test
+    public void testSession() {
+        Session session = Mockito.mock(Session.class);
+        dataStore.setSession(session);
+        assertEquals(session, dataStore.getSession());
+    }
+
+    @Test
+    public void testCluster() {
+        Cluster cluster = Mockito.mock(Cluster.class);
+        CodecRegistry cr = Mockito.mock(CodecRegistry.class);
+        Configuration config = Mockito.mock(Configuration.class);
+        Mockito.when(cluster.getConfiguration()).thenReturn(config);
+        Mockito.when(config.getCodecRegistry()).thenReturn(cr);
+        
+        dataStore.setCluster(cluster);
+        assertEquals(cluster, dataStore.getCluster());
+    }
+
+    @Test
+    public void testClose() {
+        dataStore.close();
+        Mockito.verify(session).close();
+    }
+
+    @Test
+    public void testReturnColumnDataType() {
+        Metadata meta = Mockito.mock(Metadata.class);
+        Mockito.when(cluster.getMetadata()).thenReturn(meta);
+        KeyspaceMetadata ksmd = Mockito.mock(KeyspaceMetadata.class);
+        Mockito.when(meta.getKeyspace("keyspace")).thenReturn(ksmd);
+        TableMetadata tmd = Mockito.mock(TableMetadata.class);
+        Mockito.when(ksmd.getTable("table")).thenReturn(tmd);
+        ColumnMetadata cmd = Mockito.mock(ColumnMetadata.class);
+        Mockito.when(tmd.getColumn("columnName")).thenReturn(cmd);
+        Mockito.when(cmd.getType()).thenReturn(com.datastax.driver.core.DataType.text());
+            
+        com.datastax.driver.core.DataType dt = dataStore.returnColumnDataType("keyspace", "table", "columnName");
+        assertEquals(com.datastax.driver.core.DataType.text(), dt);
+    }
+
+    @Test
+    public void testReturnColumnMetadata() {
+        Metadata meta = Mockito.mock(Metadata.class);
+        Mockito.when(cluster.getMetadata()).thenReturn(meta);
+        KeyspaceMetadata ksmd = Mockito.mock(KeyspaceMetadata.class);
+        Mockito.when(meta.getKeyspace("keyspace")).thenReturn(ksmd);
+        TableMetadata tmd = Mockito.mock(TableMetadata.class);
+        Mockito.when(ksmd.getTable("tableName")).thenReturn(tmd);
+        
+        dataStore.returnColumnMetadata("keyspace", "tableName");
+        assertEquals(tmd, dataStore.returnColumnMetadata("keyspace", "tableName"));
+    }
+
+    @Test
+    public void testReturnKeyspaceMetadata() {
+        Metadata meta = Mockito.mock(Metadata.class);
+        Mockito.when(cluster.getMetadata()).thenReturn(meta);
+        KeyspaceMetadata ksmd = Mockito.mock(KeyspaceMetadata.class);
+        Mockito.when(meta.getKeyspace("keyspace")).thenReturn(ksmd);
+        
+        assertEquals(ksmd, dataStore.returnKeyspaceMetadata("keyspace"));
+    }
+
+    @Test
+    public void testGetColValue() {
+        Row row = Mockito.mock(Row.class);
+        Mockito.when(row.getString("columnName")).thenReturn("value");
+        UUID uuid = UUID.randomUUID();
+        Mockito.when(row.getUUID("columnName")).thenReturn(uuid);
+        Mockito.when(row.getVarint("columnName")).thenReturn(BigInteger.ONE);
+        Mockito.when(row.getLong("columnName")).thenReturn((long) 117);
+        Mockito.when(row.getInt("columnName")).thenReturn(5);
+        Mockito.when(row.getFloat("columnName")).thenReturn(Float.MAX_VALUE);
+        Mockito.when(row.getDouble("columnName")).thenReturn(Double.valueOf("2.5"));
+        Mockito.when(row.getBool("columnName")).thenReturn(true);
+        Mockito.when(row.getMap("columnName", String.class, String.class)).thenReturn(new HashMap<String, String>());
+        Mockito.when(row.getList("columnName", String.class)).thenReturn(new ArrayList<String>());
+        
+        
+        assertEquals("value", dataStore.getColValue(row, "columnName", DataType.varchar()));
+        assertEquals(uuid, dataStore.getColValue(row, "columnName", DataType.uuid()));
+        assertEquals(BigInteger.ONE, dataStore.getColValue(row, "columnName", DataType.varint()));
+        assertEquals((long) 117, dataStore.getColValue(row, "columnName", DataType.bigint()));
+        assertEquals(5, dataStore.getColValue(row, "columnName", DataType.cint()));
+        assertEquals(Float.MAX_VALUE, dataStore.getColValue(row, "columnName", DataType.cfloat()));
+        assertEquals(2.5, dataStore.getColValue(row, "columnName", DataType.cdouble()));
+        assertEquals(true, dataStore.getColValue(row, "columnName", DataType.cboolean()));
+        assertEquals(0, ((Map<String, String>) dataStore.getColValue(row, "columnName",
+                DataType.map(DataType.varchar(), DataType.varchar()))).size());
+        assertEquals(0,
+                ((List<String>) dataStore.getColValue(row, "columnName", DataType.list(DataType.varchar()))).size());
+    }
+
+    @Test
+    public void testGetBlobValue() {
+        Row row = Mockito.mock(Row.class);
+        Mockito.when(row.getBytes("col")).thenReturn(ByteBuffer.allocate(16));
+        
+        byte[] byteArray = dataStore.getBlobValue(row, "col", DataType.blob());
+        assertEquals(16, byteArray.length);
+    }
+
+    @Test
+    public void testDoesRowSatisfyCondition() throws Exception {
+        Row row = Mockito.mock(Row.class);
+        ColumnDefinitions cd = Mockito.mock(ColumnDefinitions.class);
+        Mockito.when(row.getColumnDefinitions()).thenReturn(cd);
+        Mockito.when(cd.getType("col1")).thenReturn(DataType.varchar());
+
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("col1",  "val1");
+        
+        Mockito.when(row.getString("col1")).thenReturn("val1");
+        
+        assertTrue(dataStore.doesRowSatisfyCondition(row, condition));
+        
+        condition.put("col1",  "val2");
+        assertFalse(dataStore.doesRowSatisfyCondition(row, condition));
+    }
+
+    @Test
+    public void testMarshalData() {
+        ResultSet results = Mockito.mock(ResultSet.class);
+        Row row = Mockito.mock(Row.class);
+        Mockito.when(row.getString("colName")).thenReturn("rowValue");
+        //mock for (Row row: results)
+        Iterator mockIterator = Mockito.mock(Iterator.class);
+        //Mockito.doCallRealMethod().when(results).forEach(Mockito.any(Consumer.class));
+        Mockito.when(results.iterator()).thenReturn(mockIterator);
+        Mockito.when(mockIterator.hasNext()).thenReturn(true, false);
+        Mockito.when(mockIterator.next()).thenReturn(row);
+        
+        ColumnDefinitions cd = Mockito.mock(ColumnDefinitions.class);
+        Mockito.when(row.getColumnDefinitions()).thenReturn(cd);
+        //for (Definition: colDefinitions)
+        Iterator mockIterator2 = Mockito.mock(Iterator.class);
+        //Mockito.doCallRealMethod().when(cd).forEach(Mockito.any(Consumer.class));
+        Mockito.when(cd.iterator()).thenReturn(mockIterator2);
+        Mockito.when(mockIterator2.hasNext()).thenReturn(true, false);
+        Definition def = Mockito.mock(Definition.class);
+        Mockito.when(mockIterator2.next()).thenReturn(def);
+        Mockito.when(def.getType()).thenReturn(DataType.varchar());
+        Mockito.when(def.getName()).thenReturn("colName");
+        
+        Map<String, HashMap<String, Object>> data = dataStore.marshalData(results); 
+        System.out.println("Marshalled data: " + data);
+        
+        assertTrue(data.containsKey("row 0"));
+        assertEquals("rowValue", data.get("row 0").get("colName"));
+    }
+
+    private ArgumentCaptor<SimpleStatement> sessionExecuteResponse() {
+        ResultSet rs = Mockito.mock(ResultSet.class);
+        Mockito.when(session.execute(Mockito.any(Statement.class))).thenReturn(rs);
+        
+        ArgumentCaptor<SimpleStatement> argument = ArgumentCaptor.forClass(SimpleStatement.class);
+        return argument;
+    }
+
+    @Test
+    public void testExecutePutPreparedQueryObjectString() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES (?,?);";
+        String lastName = "KRUIKSWIJK";
+        String firstName = "Steven";
+        
+        PreparedQueryObject query = new PreparedQueryObject(queryString, lastName, firstName);
+        dataStore.executePut(query, MusicUtil.CRITICAL);
+
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.QUORUM, argument.getValue().getConsistencyLevel());
+        assertEquals(queryString, argument.getValue().getQueryString());
+        assertEquals(2, argument.getValue().valuesCount());
+    }
+    
+    @Test
+    public void testExecutePut_ONE() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES (?,?);";
+        String lastName = "KRUIKSWIJK";
+        String firstName = "Steven";
+        
+        PreparedQueryObject query = new PreparedQueryObject(queryString, lastName, firstName);
+        dataStore.executePut(query, MusicUtil.ONE);
+
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ONE, argument.getValue().getConsistencyLevel());
+        assertEquals(queryString, argument.getValue().getQueryString());
+        assertEquals(2, argument.getValue().valuesCount());
+    }
+    
+    @Test
+    public void testExecutePut_quorum() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES (?,?);";
+        String lastName = "KRUIKSWIJK";
+        String firstName = "Steven";
+        
+        PreparedQueryObject query = new PreparedQueryObject(queryString, lastName, firstName);
+        dataStore.executePut(query, MusicUtil.QUORUM);
+
+        Mockito.verify(session).execute(argument.capture());
+        //should be quorum!
+        assertEquals(ConsistencyLevel.LOCAL_QUORUM, argument.getValue().getConsistencyLevel());
+        assertEquals(queryString, argument.getValue().getQueryString());
+        assertEquals(2, argument.getValue().valuesCount());
+    }
+    
+    @Test
+    public void testExecutePut_ALL() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES (?,?);";
+        String lastName = "KRUIKSWIJK";
+        String firstName = "Steven";
+        
+        PreparedQueryObject query = new PreparedQueryObject(queryString, lastName, firstName);
+        dataStore.executePut(query, MusicUtil.ALL);
+
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ALL, argument.getValue().getConsistencyLevel());
+        assertEquals(queryString, argument.getValue().getQueryString());
+        assertEquals(2, argument.getValue().valuesCount());
+    }
+    
+    @Test(expected = MusicQueryException.class)
+    public void testExecutePut_BadQueryObj() throws Exception {
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES (?,?);";
+        String lastName = "KRUIKSWIJK";
+        String firstName = "Steven";
+        
+        //Provide extra value here, middle initial
+        PreparedQueryObject query = new PreparedQueryObject(queryString, lastName, firstName, "P");
+        try {
+            dataStore.executePut(query, MusicUtil.CRITICAL);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw e;
+        }
+
+        fail("Should have throw error");
+    }
+
+    @Test
+    public void testExecutePutPreparedQueryObjectStringLong() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        String queryString = "INSERT INTO cycling.cyclist_name (lastname, firstname) VALUES ('KRUIKSWIJK','Steven');";
+
+        
+        PreparedQueryObject query = new PreparedQueryObject(queryString);
+        dataStore.executePut(query, MusicUtil.EVENTUAL, 10);
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ONE, argument.getValue().getConsistencyLevel());
+        assertEquals(queryString, argument.getValue().getQueryString());
+    }
+
+    @Test
+    public void testExecuteGet() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+
+        PreparedQueryObject query = new PreparedQueryObject("SELECT * FROM KEYSPACE.TABLE");
+        
+        dataStore.executeGet(query, MusicUtil.ONE);
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ONE, argument.getValue().getConsistencyLevel());
+        assertEquals("SELECT * FROM KEYSPACE.TABLE", argument.getValue().getQueryString());
+    }
+    
+    @Test (expected = MusicQueryException.class)
+    public void testExecuteGet_badQuery() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+
+        PreparedQueryObject query = new PreparedQueryObject("SELECT * FROM KEYSPACE.TABLE", "broken");
+        
+        dataStore.executeGet(query, MusicUtil.ONE);
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ONE, argument.getValue().getConsistencyLevel());
+        assertEquals("SELECT * FROM KEYSPACE.TABLE", argument.getValue().getQueryString());
+    }
+
+    @Test
+    public void testExecuteOneConsistencyGet() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        PreparedQueryObject query = new PreparedQueryObject("SELECT * FROM KEYSPACE.TABLE");
+        
+        dataStore.executeOneConsistencyGet(query);
+        
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.ONE, argument.getValue().getConsistencyLevel());
+        assertEquals("SELECT * FROM KEYSPACE.TABLE", argument.getValue().getQueryString());
+    }
+
+    @Test
+    public void testExecuteLocalQuorumConsistencyGet() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        PreparedQueryObject query = new PreparedQueryObject("SELECT * FROM KEYSPACE.TABLE");
+        
+        dataStore.executeLocalQuorumConsistencyGet(query);
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.LOCAL_QUORUM, argument.getValue().getConsistencyLevel());
+        assertEquals("SELECT * FROM KEYSPACE.TABLE", argument.getValue().getQueryString());
+    }
+
+    @Test
+    public void testExecuteQuorumConsistencyGet() throws Exception {
+        ArgumentCaptor<SimpleStatement> argument = sessionExecuteResponse();
+        PreparedQueryObject query = new PreparedQueryObject("SELECT * FROM KEYSPACE.TABLE");
+        
+        dataStore.executeQuorumConsistencyGet(query);
+        
+        Mockito.verify(session).execute(argument.capture());
+        assertEquals(ConsistencyLevel.QUORUM, argument.getValue().getConsistencyLevel());
+        assertEquals("SELECT * FROM KEYSPACE.TABLE", argument.getValue().getQueryString());
+    }
+
+    
+    @Test
+    public void testExecutePut() {
+        Mockito.when(session.execute(Mockito.any(SimpleStatement.class)))
+                .thenThrow(new WriteTimeoutException(ConsistencyLevel.QUORUM, WriteType.CAS, 1, 3));
+        
+        try {
+            dataStore.executePut(new PreparedQueryObject("Test query"), "critical");
+        } catch (MusicServiceException e) {
+            return;
+        } catch (MusicQueryException e) {
+            // should never reach here
+            fail();
+        }
+        fail();
+    }
+}
diff --git a/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonIndexTest.java b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonIndexTest.java
new file mode 100644
index 00000000..0d89a339
--- /dev/null
+++ b/music-core/src/test/java/org/onap/music/datastore/jsonobjects/JsonIndexTest.java
@@ -0,0 +1,74 @@
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2017 AT&T Intellectual Property
+ * ===================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music.datastore.jsonobjects;
+
+import static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.music.datastore.PreparedQueryObject;
+
+public class JsonIndexTest {
+
+    JsonIndex ji = null;
+    
+    
+    @Before
+    public void init() {
+        ji = new JsonIndex(null, null, null, null);
+    }
+                    
+                
+    
+    @Test
+    public void testKeyspace() {
+        ji.setKeyspaceName("keyspaceName");
+        assertEquals("keyspaceName", ji.getKeyspaceName());
+    }
+    
+    @Test
+    public void testIndexName() {
+        ji.setIndexName("indexName");
+        assertEquals("indexName", ji.getIndexName());
+    }
+    
+    @Test
+    public void testFieldName() {
+        ji.setFieldName("field");
+        assertEquals("field", ji.getFieldName());
+    }
+    
+    @Test
+    public void testTableName() {
+        ji.setTableName("table");
+        assertEquals("table", ji.getTableName());
+    }
+    
+    @Test
+    public void testCreateIndexQuery() {
+        JsonIndex ji2 = new JsonIndex("index", "keyspace", "table", "field");
+        PreparedQueryObject query = ji2.genCreateIndexQuery();
+        assertEquals("Create index if not exists index on keyspace.table (field);", query.getQuery());
+    }
+}
diff --git a/music-core/src/test/java/org/onap/music/lockingservice/cassandra/CassaLockStoreTest.java b/music-core/src/test/java/org/onap/music/lockingservice/cassandra/CassaLockStoreTest.java
index eccdeb5b..a608a970 100644
--- a/music-core/src/test/java/org/onap/music/lockingservice/cassandra/CassaLockStoreTest.java
+++ b/music-core/src/test/java/org/onap/music/lockingservice/cassandra/CassaLockStoreTest.java
@@ -23,7 +23,7 @@
 package org.onap.music.lockingservice.cassandra;
 
 import static org.junit.Assert.assertEquals;
-
+import static org.junit.Assert.fail;
 import java.util.Iterator;
 import java.util.List;
 
@@ -35,9 +35,11 @@ import org.onap.music.exceptions.MusicLockingException;
 import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.main.DeadlockDetectionUtil;
-
+import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
+import com.datastax.driver.core.WriteType;
+import com.datastax.driver.core.exceptions.WriteTimeoutException;
 
 public class CassaLockStoreTest {
 
@@ -282,4 +284,28 @@ public class CassaLockStoreTest {
 		}
 	}
 
+	@Test
+    public void testDequeueLockRef() throws Exception {
+        cassaLockStore.deQueueLockRef("keyspace1", "table1", "key6", "6", 2);
+        
+        // note only expecting 1 call to this instance, expecting it to succeed
+        Mockito.verify(dsHandle, Mockito.times(1)).executePut(Mockito.any(), Mockito.anyString());
+    }
+	
+	@Test
+	public void testDequeueLockRefWriteTimeout() throws Exception {
+	    int retryCount = 22;
+	    try {
+	        Mockito.when(dsHandle.executePut(Mockito.any(), Mockito.anyString()))
+                .thenThrow(new MusicServiceException("Cassandra timeout during..."));
+            cassaLockStore.deQueueLockRef("keyspace1", "table1", "key6", "6", retryCount);
+            
+            // Should never reach here
+            fail();
+        } catch (MusicServiceException | MusicQueryException | MusicLockingException e) {
+            // should throw an error
+        }
+	    
+	    Mockito.verify(dsHandle, Mockito.times(retryCount)).executePut(Mockito.any(), Mockito.anyString());
+	}
 }
diff --git a/music-core/src/test/java/org/onap/music/service/impl/MusicCassaCoreTest.java b/music-core/src/test/java/org/onap/music/service/impl/MusicCassaCoreTest.java
new file mode 100644
index 00000000..280ba207
--- /dev/null
+++ b/music-core/src/test/java/org/onap/music/service/impl/MusicCassaCoreTest.java
@@ -0,0 +1,284 @@
+/*******************************************************************************
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2018 AT&T Intellectual Property
+ * ===================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ *******************************************************************************/
+package org.onap.music.service.impl;
+
+import static org.junit.Assert.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+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.lockingservice.cassandra.CassaLockStore;
+import org.onap.music.lockingservice.cassandra.CassaLockStore.LockObject;
+import org.onap.music.lockingservice.cassandra.LockType;
+import org.onap.music.main.MusicUtil;
+import org.onap.music.main.ResultType;
+import org.onap.music.main.ReturnType;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MusicCassaCoreTest {
+    
+    @Mock
+    private CassaLockStore mLockHandle;
+    
+    MusicCassaCore core;
+    
+    @Before
+    public void before() {
+        core = MusicCassaCore.getInstance();
+        MusicCassaCore.setmLockHandle(mLockHandle);
+    }
+    
+    @Test
+    public void testGetmLockHandle() {
+        assertEquals(mLockHandle, MusicCassaCore.getmLockHandle());
+    }
+
+    @Test
+    public void testSetmLockHandle() {
+        CassaLockStore m2 = Mockito.mock(CassaLockStore.class);
+        MusicCassaCore.setmLockHandle(m2);
+        assertEquals(m2, MusicCassaCore.getmLockHandle());
+        //revert back to original handle
+        MusicCassaCore.setmLockHandle(mLockHandle);
+    }
+
+    @Test
+    public void testGetInstance() {
+        assertEquals(core, MusicCassaCore.getInstance());
+    }
+
+    @Test
+    public void testGetLockingServiceHandle() {
+        assertEquals(mLockHandle, MusicCassaCore.getmLockHandle());
+    }
+
+    @Test
+    public void testCreateLockReferenceAtomicString() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        Mockito.when(mLockHandle.genLockRefandEnQueue("keyspace", "table", "lockName", LockType.WRITE, null))
+                .thenReturn("lockReturned");
+
+        String lockRef = core.createLockReferenceAtomic(fullyQualifiedKey);
+
+        Mockito.verify(mLockHandle).genLockRefandEnQueue("keyspace", "table", "lockName", LockType.WRITE, null);
+        assertEquals("lockReturned", lockRef);
+    }
+
+    @Test
+    public void testCreateLockReferenceStringString() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String owner = "owner1";
+        Mockito.when(mLockHandle.genLockRefandEnQueue("keyspace", "table", "lockName", LockType.WRITE, owner))
+            .thenReturn("lockReturned");
+        
+        String lockRef = core.createLockReference(fullyQualifiedKey, owner);
+
+        Mockito.verify(mLockHandle).genLockRefandEnQueue("keyspace", "table", "lockName", LockType.WRITE, owner);
+        assertEquals("lockReturned", lockRef);
+    }
+
+    @Test
+    public void testCreateLockReferenceAtomicStringLockType() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        Mockito.when(mLockHandle.genLockRefandEnQueue("keyspace", "table", "lockName", LockType.READ, null))
+                .thenReturn("lockReturned");
+
+        String lockRef = core.createLockReferenceAtomic(fullyQualifiedKey, LockType.READ);
+
+        Mockito.verify(mLockHandle).genLockRefandEnQueue("keyspace", "table", "lockName", LockType.READ, null);
+        assertEquals("lockReturned", lockRef);
+    }
+
+    @Test
+    public void testCreateLockReferenceStringLockTypeString() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String owner = "owner1";
+        Mockito.when(mLockHandle.genLockRefandEnQueue("keyspace", "table", "lockName", LockType.READ, owner))
+            .thenReturn("lockReturned");
+        
+        String lockRef = core.createLockReference(fullyQualifiedKey, LockType.READ, owner);
+
+        Mockito.verify(mLockHandle).genLockRefandEnQueue("keyspace", "table", "lockName", LockType.READ, owner);
+        assertEquals("lockReturned", lockRef);
+    }
+
+    @Test
+    public void testPromoteLock() throws Exception {
+        String lockId = "$keyspace.table.lockName$1";
+        Mockito.when(mLockHandle.promoteLock("keyspace", "table", "lockName", "1"))
+            .thenReturn(new ReturnType(ResultType.SUCCESS, "Lock Promoted"));
+        
+        ReturnType rt = core.promoteLock(lockId);
+        assertEquals(ResultType.SUCCESS, rt.getResult());
+        assertEquals("Lock Promoted", rt.getMessage());
+    }
+
+    @Test
+    public void testAcquireLockWithLease() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String lockId = "$keyspace.table.lockName$1";
+        long leasePeriod = 1000;
+        String currTime = String.valueOf(System.currentTimeMillis());
+        Mockito.when(mLockHandle.peekLockQueue("keyspace", "table", "lockName"))
+            .thenReturn(mLockHandle.new LockObject(true, lockId, currTime, currTime, LockType.WRITE, null));
+        Mockito.when(mLockHandle.getLockInfo("keyspace", "table", "lockName", "1"))
+            .thenReturn(mLockHandle.new LockObject(false, lockId, null, null, LockType.WRITE, null));
+        
+        ReturnType rt = core.acquireLockWithLease(fullyQualifiedKey, lockId, leasePeriod);
+        assertEquals(ResultType.FAILURE, rt.getResult());
+    }
+
+    @Test
+    public void testAcquireLock() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String lockId = "$keyspace.table.lockName$1";
+        Mockito.when(mLockHandle.getLockInfo("keyspace", "table", "lockName", "1"))
+            .thenReturn(mLockHandle.new LockObject(false, lockId, null, null, LockType.WRITE, null));
+        
+        ReturnType rt = core.acquireLock(fullyQualifiedKey, lockId);
+        
+        assertEquals(ResultType.FAILURE, rt.getResult());
+        Mockito.verify(mLockHandle).getLockInfo("keyspace", "table", "lockName", "1");
+        /*TODO: if we successfully acquire the lock we hit an error by trying to read MusicDatastoreHandle */
+    }
+
+    @Test
+    public void testWhoseTurnIsIt() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        Mockito.when(mLockHandle.peekLockQueue("keyspace", "table", "lockName"))
+            .thenReturn(mLockHandle.new LockObject(true, "1", "", "", LockType.WRITE, null));
+        
+        String topOfQ = core.whoseTurnIsIt(fullyQualifiedKey);
+        System.out.println(topOfQ);
+        
+        assertEquals("$"+fullyQualifiedKey+"$1", topOfQ);
+    }
+
+    @Test
+    public void testGetCurrentLockHolders() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        List<String> currentHolders = new ArrayList<>();
+        currentHolders.add("$"+fullyQualifiedKey+"$1");
+        currentHolders.add("$"+fullyQualifiedKey+"$2");
+        Mockito.when(mLockHandle.getCurrentLockHolders("keyspace", "table", "lockName"))
+            .thenReturn(currentHolders);
+
+        List<String> holders = core.getCurrentLockHolders(fullyQualifiedKey);
+        
+        assertTrue(currentHolders.containsAll(holders) && holders.containsAll(currentHolders));
+    }
+
+    @Test
+    public void testGetLockNameFromId() {
+        String lockId = "$keyspace.table.lockName$1";
+        assertEquals("keyspace.table.lockName", core.getLockNameFromId(lockId));
+    }
+
+    @Test
+    public void testDestroyLockRefString() throws Exception {
+        String lockId = "$keyspace.table.lockName$1";
+
+        core.destroyLockRef(lockId);
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "1", MusicUtil.getRetryCount());
+    }
+
+    @Test
+    public void testDestroyLockRefStringString() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String lockReference = "1";
+        
+        core.destroyLockRef(fullyQualifiedKey, lockReference);
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "1", MusicUtil.getRetryCount());
+    }
+
+    @Test
+    public void testReleaseLock() throws Exception {
+        String lockId = "$keyspace.table.lockName$1";
+        
+        core.releaseLock(lockId, true);
+        
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "1", MusicUtil.getRetryCount());
+    }
+
+    @Test
+    public void testVoluntaryReleaseLock() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        String lockReference = "1";
+        
+        core.voluntaryReleaseLock(fullyQualifiedKey, lockReference);
+        
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "1", MusicUtil.getRetryCount());
+    }
+
+    @Test
+    public void testReleaseAllLocksForOwner() throws Exception {
+        List<String> ownersLocks = new ArrayList<>();
+        ownersLocks.add("lockName$1");
+        ownersLocks.add("lockName$2");
+        Mockito.when(mLockHandle.getAllLocksForOwner("ownerId", "keyspace", "table"))
+            .thenReturn(ownersLocks);
+        
+        List<String> locksReleased = core.releaseAllLocksForOwner("ownerId", "keyspace", "table");
+        
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "1", MusicUtil.getRetryCount());
+        Mockito.verify(mLockHandle).deQueueLockRef("keyspace", "table", "lockName", "2", MusicUtil.getRetryCount());
+        assertTrue(ownersLocks.containsAll(locksReleased) && locksReleased.containsAll(ownersLocks));
+    }
+
+
+    @Test
+    public void testValidateLock() {
+        String lockId = "$keyspace.table.lockName$1";
+        
+        assertFalse(core.validateLock(lockId).containsKey("Error"));
+    }
+
+    @Test
+    public void testGetLockQueue() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        List<String> myList = new ArrayList<>();
+        Mockito.when(mLockHandle.getLockQueue("keyspace", "table", "lockName"))
+            .thenReturn(myList);
+        List<String> theirList = core.getLockQueue(fullyQualifiedKey);
+        
+        assertEquals(myList, theirList);
+    }
+
+    @Test
+    public void testGetLockQueueSize() throws Exception {
+        String fullyQualifiedKey = "keyspace.table.lockName";
+        Mockito.when(mLockHandle.getLockQueueSize("keyspace", "table", "lockName"))
+            .thenReturn((long) 23);
+        long theirSize = core.getLockQueueSize(fullyQualifiedKey);
+        
+        assertEquals(23, theirSize);
+    }
+
+}