Caching util test cases

And cleaning up of other tests

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

1 files changed, 1 insertions, 36 deletions

diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
index b00c4fcc..93d8fcb9 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicAdminAPI.java
@@ -109,8 +109,7 @@ public class TstRestMusicAdminAPI {
 		System.out.println("Testing RestMusicAdmin class");
 		//PowerMockito.mockStatic(MusicAuthentication.class);
     	try {
-    		MusicDataStoreHandle.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
-			createAdminTable();
+    		//MusicDataStoreHandle.mDstoreHandle = CassandraCQL.connectToEmbeddedCassandra();
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("Unable to initialize before TestRestMusicData test class. " + e.getMessage());
@@ -326,39 +325,5 @@ public class TstRestMusicAdminAPI {
         Map<String, Object> resultMap = (Map<String, Object>) admin.deleteOnboardApp(jsonOnboard,adminAuthorization).getEntity();
         assertNotNull(resultMap);
     }
-    
-    
-    private static void createAdminTable() throws Exception {
-		testObject = new PreparedQueryObject();
-		testObject.appendQueryString(CassandraCQL.createAdminKeyspace);
-		MusicCore.eventualPut(testObject);
-		testObject = new PreparedQueryObject();
-		testObject.appendQueryString(CassandraCQL.createAdminTable);
-		MusicCore.eventualPut(testObject);
-
-		testObject = new PreparedQueryObject();
-		testObject.appendQueryString(
-				"INSERT INTO admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
-						+ "password, username, is_aaf) VALUES (?,?,?,?,?,?,?)");
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(),
-				MusicUtil.DEFAULTKEYSPACENAME));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "True"));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), BCrypt.hashpw(password, BCrypt.gensalt())));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF));
-		MusicCore.eventualPut(testObject);
-
-		testObject = new PreparedQueryObject();
-		testObject.appendQueryString(
-				"select uuid from admin.keyspace_master where application_name = ? allow filtering");
-		testObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-		ResultSet rs = MusicCore.get(testObject);
-		List<Row> rows = rs.all();
-		if (rows.size() > 0) {
-			System.out.println("#######UUID is:" + rows.get(0).getUUID("uuid"));
-		}
-	}
    
 }
\ No newline at end of file