Apply suggestions

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java

@@ -1,5 +1,8 @@
 package com.scalar.db.storage.cassandra;
 
+import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.MAX_RETRY_COUNT;
+import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.SLEEP_BETWEEN_RETRIES_SECONDS;
+
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageAdminPermissionIntegrationTestBase;
 import com.scalar.db.util.AdminTestUtils;
@@ -12,9 +15,6 @@
 
 public class CassandraAdminPermissionIntegrationTest
     extends DistributedStorageAdminPermissionIntegrationTestBase {
-  private static final int SLEEP_BETWEEN_RETRIES_SECONDS = 3;
-  private static final int MAX_RETRY_COUNT = 10;
-
   @Override
   protected Properties getProperties(String testName) {
     return CassandraEnv.getProperties(testName);
@@ -93,7 +93,7 @@ protected void waitForNamespaceDeletion() {
           return;
         }
         Uninterruptibles.sleepUninterruptibly(
-            SLEEP_BETWEEN_RETRIES_SECONDS, java.util.concurrent.TimeUnit.MILLISECONDS);
+            SLEEP_BETWEEN_RETRIES_SECONDS, java.util.concurrent.TimeUnit.SECONDS);
         retryCount++;
       }
       utils.close();

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraEnv.java

@@ -41,25 +41,14 @@ public static Properties getProperties(String testName) {
   }
 
   public static Properties getPropertiesForNormalUser(String testName) {
-    String contactPoints =
-        System.getProperty(PROP_CASSANDRA_CONTACT_POINTS, DEFAULT_CASSANDRA_CONTACT_POINTS);
+    Properties properties = getProperties(testName);
+
     String username =
         System.getProperty(PROP_CASSANDRA_NORMAL_USERNAME, DEFAULT_CASSANDRA_NORMAL_USERNAME);
     String password =
         System.getProperty(PROP_CASSANDRA_NORMAL_PASSWORD, DEFAULT_CASSANDRA_NORMAL_PASSWORD);
-
-    Properties properties = new Properties();
-    properties.setProperty(DatabaseConfig.CONTACT_POINTS, contactPoints);
     properties.setProperty(DatabaseConfig.USERNAME, username);
     properties.setProperty(DatabaseConfig.PASSWORD, password);
-    properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
-    properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "true");
-    properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
-
-    // Add testName as a metadata schema suffix
-    properties.setProperty(
-        DatabaseConfig.SYSTEM_NAMESPACE_NAME,
-        DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME + "_" + testName);
 
     return properties;
   }

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraPermissionIntegrationTest.java

@@ -1,5 +1,8 @@
 package com.scalar.db.storage.cassandra;
 
+import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.MAX_RETRY_COUNT;
+import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.SLEEP_BETWEEN_RETRIES_SECONDS;
+
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStoragePermissionIntegrationTestBase;
 import com.scalar.db.util.AdminTestUtils;
@@ -11,9 +14,6 @@
 
 public class CassandraPermissionIntegrationTest
     extends DistributedStoragePermissionIntegrationTestBase {
-  private static final int SLEEP_BETWEEN_RETRIES_SECONDS = 3;
-  private static final int MAX_RETRY_COUNT = 10;
-
   @Override
   protected Properties getProperties(String testName) {
     return CassandraEnv.getProperties(testName);

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraPermissionTestUtils.java

@@ -6,6 +6,9 @@
 import java.util.Properties;
 
 public class CassandraPermissionTestUtils implements PermissionTestUtils {
+  public static final int SLEEP_BETWEEN_RETRIES_SECONDS = 3;
+  public static final int MAX_RETRY_COUNT = 10;
+
   private final ClusterManager clusterManager;
 
   public CassandraPermissionTestUtils(Properties properties) {

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java

@@ -80,13 +80,17 @@ public void afterAll() throws Exception {
     }
 
     try {
-      adminForRootUser.close();
+      if (adminForRootUser != null) {
+        adminForRootUser.close();
+      }
     } catch (Exception e) {
       logger.warn("Failed to close admin for root user", e);
     }
 
     try {
-      adminForNormalUser.close();
+      if (adminForNormalUser != null) {
+        adminForNormalUser.close();
+      }
     } catch (Exception e) {
       logger.warn("Failed to close admin for normal user", e);
     }