Some bug fixes and Minor Chages.
[music.git] / src / test / java / org / onap / music / unittests / TstRestMusicDataAPI.java
index 23b9850..407d032 100644 (file)
@@ -44,7 +44,6 @@ import org.mindrot.jbcrypt.BCrypt;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.music.authentication.CachingUtil;
 import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.datastore.jsonobjects.JsonDelete;
@@ -137,6 +136,42 @@ public class TstRestMusicDataAPI {
         Map<String, String> respMap = (Map<String, String>) response.getEntity();
         assertEquals(ResultType.FAILURE, respMap.get("status"));
     }
+    
+    @Test
+    public void test1_createKeyspaceSuccess() throws Exception {
+        System.out.println("Testing successful creation and deletion of keyspace");
+        MusicUtil.setKeyspaceActive(true);
+        
+        String keyspaceToCreate = "temp"+keyspaceName;
+        
+        
+        JsonKeySpace jsonKeyspace = new JsonKeySpace();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        Map<String, Object> replicationInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        replicationInfo.put("class", "SimpleStrategy");
+        replicationInfo.put("replication_factor", 1);
+        jsonKeyspace.setConsistencyInfo(consistencyInfo);
+        jsonKeyspace.setDurabilityOfWrites("true");
+        //don't overwrite a keyspace we already have
+        jsonKeyspace.setKeyspaceName(keyspaceToCreate);
+        jsonKeyspace.setReplicationInfo(replicationInfo);
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
+        Response response =
+                data.createKeySpace("1", "1", "1", null, authorization, appName, jsonKeyspace, keyspaceToCreate);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+        Map<String, String> respMap = (Map<String, String>) response.getEntity();
+        assertEquals(ResultType.SUCCESS, respMap.get("status"));
+        
+        response = data.dropKeySpace("1", "1", "1", null, authorization, appName, keyspaceToCreate);
+        assertEquals(200, response.getStatus());
+        respMap = (Map<String, String>) response.getEntity();
+        assertEquals(ResultType.SUCCESS, respMap.get("status"));
+        
+        //unset to not mess up any further tests
+        MusicUtil.setKeyspaceActive(false);
+    }
 
     @Test
     public void test3_createTable() throws Exception {
@@ -159,6 +194,16 @@ public class TstRestMusicDataAPI {
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test3_createTableNoBody() throws Exception {
+        System.out.println("Testing create table w/o body");
+
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, null, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(400, response.getStatus());
+    }
 
     @Test
     public void test3_createTableNoName() throws Exception {
@@ -181,6 +226,22 @@ public class TstRestMusicDataAPI {
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
         assertEquals(400, response.getStatus());
     }
+    
+    @Test
+    public void test3_createTableNoFields() throws Exception {
+        System.out.println("Testing create table without fields");
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        jsonTable.setKeyspaceName(keyspaceName);
+        jsonTable.setPrimaryKey("emp_name");
+        jsonTable.setTableName("");
+        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonTable, keyspaceName, "");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(400, response.getStatus());
+    }
 
 
     @Test
@@ -261,58 +322,13 @@ public class TstRestMusicDataAPI {
         assertEquals(400, response2.getStatus());
         Map<String, String> respMap = (Map<String, String>) response2.getEntity();
         assertEquals(ResultType.FAILURE, respMap.get("status"));
-        assertEquals("Table " + keyspaceName + "." + tableNameDup + " already exists", respMap.get("error"));
+        assertEquals("AlreadyExistsException: Table " + keyspaceName + "." + tableNameDup + " already exists", respMap.get("error"));
     }
 
-    // Improper Auth
-    @Test
-    public void test3_createTable1() throws Exception {
-        System.out.println("Testing create table w/ improper authentication");
-        JsonTable jsonTable = new JsonTable();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, String> fields = new HashMap<>();
-        fields.put("uuid", "text");
-        fields.put("emp_name", "text");
-        fields.put("emp_salary", "varint");
-        fields.put("PRIMARY KEY", "(emp_name)");
-        consistencyInfo.put("type", "eventual");
-        jsonTable.setConsistencyInfo(consistencyInfo);
-        jsonTable.setKeyspaceName(keyspaceName);
-        jsonTable.setPrimaryKey("emp_name");
-        jsonTable.setTableName(tableName);
-        jsonTable.setFields(fields);
-        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                wrongAuthorization, jsonTable, keyspaceName, tableName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
-    }
-
-    // Improper keyspace
-    @Test
-    public void test3_createTable3() throws Exception {
-        System.out.println("Testing create table for wrong keyspace");
-        JsonTable jsonTable = new JsonTable();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, String> fields = new HashMap<>();
-        fields.put("uuid", "text");
-        fields.put("emp_name", "text");
-        fields.put("emp_salary", "varint");
-        fields.put("PRIMARY KEY", "(emp_name)");
-        consistencyInfo.put("type", "eventual");
-        jsonTable.setConsistencyInfo(consistencyInfo);
-        jsonTable.setKeyspaceName(keyspaceName);
-        jsonTable.setPrimaryKey("emp_name");
-        jsonTable.setTableName(tableName);
-        jsonTable.setFields(fields);
-        Response response = data.createTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                authorization, jsonTable, "wrong", tableName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-        assertEquals(401, response.getStatus());
-    }
 
     // Improper parenthesis in key field
     @Test
-    public void test3_createTable_badParantesis() throws Exception {
+    public void test3_createTable_badParanthesis() throws Exception {
         System.out.println("Testing malformed create table request");
         String tableNameC = "testTable0";
         JsonTable jsonTable = new JsonTable();
@@ -479,7 +495,7 @@ public class TstRestMusicDataAPI {
 
         assertEquals(200, response.getStatus());
     }
-
+    
     // create index without table name
     @Test
     public void test3_createTableIndexNoName() throws Exception {
@@ -533,7 +549,54 @@ public class TstRestMusicDataAPI {
 
         assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test4_insertIntoTableNoBody() throws Exception {
+        System.out.println("Testing insert into table w/o body");
+        createTable();
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, null, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+
+    @Test
+    public void test4_insertIntoTableNoaValues() throws Exception {
+        System.out.println("Testing insert into table");
+        createTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        jsonInsert.setKeyspaceName(keyspaceName);
+        jsonInsert.setTableName(tableName);
+
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonInsert, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+    
+    @Test
+    public void test4_insertIntoTableNoValues() throws Exception {
+        System.out.println("Testing insert into table");
+        createTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "eventual");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        jsonInsert.setKeyspaceName(keyspaceName);
+        jsonInsert.setTableName(tableName);
 
+        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonInsert, keyspaceName, tableName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
+    
     @Test
     public void test4_insertIntoTableCriticalNoLockID() throws Exception {
         System.out.println("Testing critical insert into table without lockid");
@@ -622,29 +685,6 @@ public class TstRestMusicDataAPI {
         assertEquals(200, response.getStatus());
     }
 
-    // Auth Error
-    @Test
-    public void test4_insertIntoTable3() throws Exception {
-        System.out.println("Testing insert into table with bad credentials");
-        createTable();
-        JsonInsert jsonInsert = new JsonInsert();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        Map<String, Object> values = new HashMap<>();
-        values.put("uuid", "cfd66ccc-d857-4e90-b1e5-df98a3d40cd6");
-        values.put("emp_name", "test1");
-        values.put("emp_salary", 1500);
-        consistencyInfo.put("type", "eventual");
-        jsonInsert.setConsistencyInfo(consistencyInfo);
-        jsonInsert.setKeyspaceName(keyspaceName);
-        jsonInsert.setTableName(tableName);
-        jsonInsert.setValues(values);
-        Response response = data.insertIntoTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                wrongAuthorization, jsonInsert, keyspaceName, tableName);
-        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
-
-        assertEquals(401, response.getStatus());
-    }
-
     // Table wrong
     @Test
     public void test4_insertIntoTable4() throws Exception {
@@ -715,93 +755,70 @@ public class TstRestMusicDataAPI {
 
         assertEquals(200, response.getStatus());
     }
+    
 
-    @Test
-    public void test5_updateTableNoName() throws Exception {
-        System.out.println("Testing update table without tablename");
+    public void test5_updateTableNoBody() throws Exception {
+        System.out.println("Testing update table no body");
         createTable();
-
-        JsonUpdate jsonUpdate = new JsonUpdate();
-        Map<String, String> consistencyInfo = new HashMap<>();
-        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
-        Map<String, Object> values = new HashMap<>();
-        row.add("emp_name", "testname");
-        values.put("emp_salary", 2500);
-        consistencyInfo.put("type", "atomic");
-        jsonUpdate.setConsistencyInfo(consistencyInfo);
-        jsonUpdate.setKeyspaceName(keyspaceName);
-        jsonUpdate.setTableName(tableName);
-        jsonUpdate.setValues(values);
+        
         Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                authorization, jsonUpdate, "", "", info);
+                authorization, null, keyspaceName, tableName, info);
 
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
         assertEquals(400, response.getStatus());
     }
-
-    // need mock code to create error for MusicCore methods
+    
     @Test
-    public void test5_updateTableAuthE() throws Exception {
-        System.out.println("Testing update table #2");
+    public void test5_updateTable_tableDNE() throws Exception {
+        System.out.println("Testing update table that does not exist");
         createTable();
-        // MockitoAnnotations.initMocks(this);
+
         JsonUpdate jsonUpdate = new JsonUpdate();
         Map<String, String> consistencyInfo = new HashMap<>();
-        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
         Map<String, Object> values = new HashMap<>();
-        row.add("emp_name", "testname");
         values.put("emp_salary", 2500);
         consistencyInfo.put("type", "atomic");
         jsonUpdate.setConsistencyInfo(consistencyInfo);
         jsonUpdate.setKeyspaceName(keyspaceName);
-        jsonUpdate.setTableName(tableName);
+        jsonUpdate.setTableName("wrong_"+tableName);
         jsonUpdate.setValues(values);
-        // add ttl & timestamp
-        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
-        Mockito.when(info.getQueryParameters()).thenReturn(row);
-        // Map<String, Object> m1= new HashMap<>() ;
-        // Mockito.when(MusicCore.autheticateUser(appName,userId,password,keyspaceName,"abc66ccc-d857-4e90-b1e5-df98a3d40ce6","updateTable")).thenReturn(m1);
         Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                authorization, jsonUpdate, keyspaceName, tableName, info);
+                authorization, jsonUpdate, keyspaceName, "wrong_"+ tableName, info);
+
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
-        assertEquals(200, response.getStatus());
+        assertEquals(400, response.getStatus());
     }
-
-    @Ignore
+    
     @Test
-    public void test5_updateTableAuthException1() throws Exception {
-        System.out.println("Testing update table authentication error");
+    public void test5_updateTableNoName() throws Exception {
+        System.out.println("Testing update table without tablename");
         createTable();
+
         JsonUpdate jsonUpdate = new JsonUpdate();
         Map<String, String> consistencyInfo = new HashMap<>();
-        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
         Map<String, Object> values = new HashMap<>();
-        row.add("emp_name", "testname");
         values.put("emp_salary", 2500);
         consistencyInfo.put("type", "atomic");
         jsonUpdate.setConsistencyInfo(consistencyInfo);
         jsonUpdate.setKeyspaceName(keyspaceName);
         jsonUpdate.setTableName(tableName);
         jsonUpdate.setValues(values);
-
-        Mockito.when(info.getQueryParameters()).thenReturn(row);
-        String authDatax = ":";
-        String authorizationx = new String(Base64.encode(authDatax.getBytes()));
         Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
-                authorizationx, jsonUpdate, keyspaceName, tableName, info);
+                authorization, jsonUpdate, "", "", info);
+
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
-        assertEquals(401, response.getStatus());
+        assertEquals(400, response.getStatus());
     }
 
-    @Ignore
+    // need mock code to create error for MusicCore methods
     @Test
-    public void test5_updateTableAuthEmpty() throws Exception {
-        System.out.println("Testing update table without authentication");
+    public void test5_updateTableAuthE() throws Exception {
+        System.out.println("Testing update table #2");
         createTable();
-
+        // MockitoAnnotations.initMocks(this);
         JsonUpdate jsonUpdate = new JsonUpdate();
         Map<String, String> consistencyInfo = new HashMap<>();
         MultivaluedMap<String, String> row = new MultivaluedMapImpl();
@@ -813,21 +830,21 @@ public class TstRestMusicDataAPI {
         jsonUpdate.setKeyspaceName(keyspaceName);
         jsonUpdate.setTableName(tableName);
         jsonUpdate.setValues(values);
-
+        // add ttl & timestamp
+        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
         Mockito.when(info.getQueryParameters()).thenReturn(row);
-        String authDatax = ":" + password;
-        String authorizationx = new String(Base64.encode(authDatax.getBytes()));
-        String appNamex = "xx";
-        Response response = data.updateTable("1", "1", "1", "", appNamex, authorizationx, jsonUpdate, keyspaceName,
-                tableName, info);
+        // Map<String, Object> m1= new HashMap<>() ;
+        // Mockito.when(MusicCore.autheticateUser(appName,userId,password,keyspaceName,"abc66ccc-d857-4e90-b1e5-df98a3d40ce6","updateTable")).thenReturn(m1);
+        Response response = data.updateTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, jsonUpdate, keyspaceName, tableName, info);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
 
-        assertEquals(401, response.getStatus());
+        assertEquals(200, response.getStatus());
     }
 
        @Test
-       public void test6_selectAtomic() throws Exception {
-               System.out.println("Testing select atomic");
+       public void test6_critical_selectAtomic() throws Exception {
+               System.out.println("Testing critical select atomic");
                createAndInsertIntoTable();
                JsonInsert jsonInsert = new JsonInsert();
                Map<String, String> consistencyInfo = new HashMap<>();
@@ -845,7 +862,60 @@ public class TstRestMusicDataAPI {
                Map<String, String> row0 = (Map<String, String>) result.get("row 0");
                assertEquals("testname", row0.get("emp_name"));
                assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
-       }
+       }       
+
+       
+       @Test
+    public void test6_critical_select() throws Exception {
+        System.out.println("Testing critical select w/o body");
+        createAndInsertIntoTable();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.selectCritical("1", "1", "1","abc66ccc-d857-4e90-b1e5-df98a3d40ce6", 
+                appName, authorization, null, keyspaceName, tableName,info);
+        HashMap<String,HashMap<String,Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
+        HashMap<String, Object> result = map.get("result");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        
+        assertEquals(400, response.getStatus());
+    }
+    
+    // Added during merge?
+       @Test
+    public void test6_critical_selectCritical_nolockid() throws Exception {
+        System.out.println("Testing critical select critical w/o lockid");
+        createAndInsertIntoTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        MultivaluedMap<String, String> row = new MultivaluedMapImpl();
+        row.add("emp_name", "testname");
+        consistencyInfo.put("type", "critical");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        Mockito.when(info.getQueryParameters()).thenReturn(row);
+        Response response = data.selectCritical("1", "1", "1","abc66ccc-d857-4e90-b1e5-df98a3d40ce6", 
+                appName, authorization, jsonInsert, keyspaceName, tableName,info);
+        HashMap<String,HashMap<String,Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
+        HashMap<String, Object> result = map.get("result");
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        
+        assertEquals(400, response.getStatus());
+    }
+       
+       @Test
+    public void test6_critical_select_nulltable() throws Exception {
+        System.out.println("Testing critical select w/ null tablename");
+        createAndInsertIntoTable();
+        JsonInsert jsonInsert = new JsonInsert();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonInsert.setConsistencyInfo(consistencyInfo);
+        Response response = data.selectCritical("1", "1", "1","abc66ccc-d857-4e90-b1e5-df98a3d40ce6", 
+                appName, authorization, jsonInsert, keyspaceName, null,info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        
+        assertEquals(400, response.getStatus());
+    }
 
     @Test
     public void test6_select() throws Exception {
@@ -858,8 +928,8 @@ public class TstRestMusicDataAPI {
         consistencyInfo.put("type", "atomic");
         jsonSelect.setConsistencyInfo(consistencyInfo);
         Mockito.when(info.getQueryParameters()).thenReturn(row);
-        Response response = data.select("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
-                keyspaceName, tableName, info);
+        Response response = data.selectWithCritical("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName, authorization,
+                null,keyspaceName, tableName, info);
         HashMap<String, HashMap<String, Object>> map = (HashMap<String, HashMap<String, Object>>) response.getEntity();
         HashMap<String, Object> result = map.get("result");
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
@@ -868,6 +938,21 @@ public class TstRestMusicDataAPI {
         assertEquals("testname", row0.get("emp_name"));
         assertEquals(BigInteger.valueOf(500), row0.get("emp_salary"));
     }
+    
+    @Test
+    public void test6_select_nullTablename() throws Exception {
+        System.out.println("Testing select w/ null tablename");
+        createAndInsertIntoTable();
+        JsonSelect jsonSelect = new JsonSelect();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonSelect.setConsistencyInfo(consistencyInfo);
+        Response response = data.selectWithCritical("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6",
+                appName, wrongAuthorization,null, keyspaceName, null, info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
 
     @Test
     public void test6_deleteFromTable() throws Exception {
@@ -883,8 +968,23 @@ public class TstRestMusicDataAPI {
         Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
                 authorization, jsonDelete, keyspaceName, tableName, info);
         System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
     }
-
+    
+    @Test
+    public void test6_deleteFromTable_missingTablename() throws Exception {
+        System.out.println("Testing delete from table w/ null tablename");
+        createAndInsertIntoTable();
+        JsonDelete jsonDelete = new JsonDelete();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonDelete.setConsistencyInfo(consistencyInfo);
+        Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                wrongAuthorization, jsonDelete, keyspaceName, null, info);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(400, response.getStatus());
+    }
+    
     // Values
     @Ignore
     @Test
@@ -897,7 +997,6 @@ public class TstRestMusicDataAPI {
         MultivaluedMap<String, String> row = new MultivaluedMapImpl();
         consistencyInfo.put("type", "atomic");
         jsonDelete.setConsistencyInfo(consistencyInfo);
-        // Mockito.doNothing().when(http).addHeader(xLatestVersion, MusicUtil.getVersion());
         Mockito.when(info.getQueryParameters()).thenReturn(row);
         Response response = data.deleteFromTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
                 authorization, jsonDelete, keyspaceName, tableName, info);
@@ -936,6 +1035,21 @@ public class TstRestMusicDataAPI {
 
         assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test7_dropTable_nullTablename() throws Exception {
+        System.out.println("Testing drop table w/ null tablename");
+        createTable();
+        JsonTable jsonTable = new JsonTable();
+        Map<String, String> consistencyInfo = new HashMap<>();
+        consistencyInfo.put("type", "atomic");
+        jsonTable.setConsistencyInfo(consistencyInfo);
+        Response response = data.dropTable("1", "1", "1", "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName,
+                authorization, keyspaceName, null);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+
+        assertEquals(400, response.getStatus());
+    }
 
 
     @Test
@@ -977,8 +1091,6 @@ public class TstRestMusicDataAPI {
         query.addValue(MusicUtil.convertToActualDataType(DataType.text(), hashedpwd));
         query.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
         query.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF));
-        CachingUtil.updateMusicCache(keyspaceName, appName);
-        CachingUtil.updateMusicValidateCache(appName, userId, hashedpwd);
         MusicCore.eventualPut(query);
     }