Rearrange schema loader integration tests (scalar-labs#565)

genieCS · Apr 26, 2022 · 49a26f6 · 49a26f6
1 parent c5dec08
commit 49a26f6
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 30 deletions.
diff --git a/schema-loader/build.gradle b/schema-loader/build.gradle
@@ -22,7 +22,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/cassandra/*.java'
+            include '**/com/scalar/db/storage/cassandra/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }
@@ -32,7 +32,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/cosmos/*.java'
+            include '**/com/scalar/db/storage/cosmos/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }
@@ -42,7 +42,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/dynamo/*.java'
+            include '**/com/scalar/db/storage/dynamo/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }
@@ -52,7 +52,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/jdbc/*.java'
+            include '**/com/scalar/db/storage/jdbc/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }
@@ -62,7 +62,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/multistorage/*.java'
+            include '**/com/scalar/db/storage/multistorage/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }
@@ -72,7 +72,7 @@ sourceSets {
             runtimeClasspath += main.output + test.output
             srcDir file('src/integration-test/java')
             include '**/com/scalar/db/schemaloader/*.java'
-            include '**/com/scalar/db/schemaloader/server/*.java'
+            include '**/com/scalar/db/server/*.java'
         }
         resources.srcDir file('src/integration-test/resources')
     }

diff --git a/...erver/SchemaLoaderWithScalarDbServer.java → ...erver/SchemaLoaderWithScalarDbServer.java b/...erver/SchemaLoaderWithScalarDbServer.java → ...erver/SchemaLoaderWithScalarDbServer.java
@@ -1,11 +1,8 @@
-package com.scalar.db.schemaloader.server;
+package com.scalar.db.server;
 
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.server.ScalarDbServer;
-import com.scalar.db.server.ServerConfig;
-import com.scalar.db.server.ServerEnv;
 import java.io.IOException;
 import org.junit.jupiter.api.AfterAll;
 

diff --git a/...CassandraSchemaLoaderIntegrationTest.java → ...CassandraSchemaLoaderIntegrationTest.java b/...CassandraSchemaLoaderIntegrationTest.java → ...CassandraSchemaLoaderIntegrationTest.java
@@ -1,8 +1,7 @@
-package com.scalar.db.schemaloader.cassandra;
+package com.scalar.db.storage.cassandra;
 
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.cassandra.CassandraEnv;
 
 public class CassandraSchemaLoaderIntegrationTest extends SchemaLoaderIntegrationTestBase {
 

diff --git a/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java b/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java
@@ -1,9 +1,8 @@
-package com.scalar.db.schemaloader.cassandra;
+package com.scalar.db.storage.cassandra;
 
 import com.google.common.collect.ImmutableList;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.cassandra.CassandraEnv;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

diff --git a/...os/CosmosSchemaLoaderIntegrationTest.java → ...os/CosmosSchemaLoaderIntegrationTest.java b/...os/CosmosSchemaLoaderIntegrationTest.java → ...os/CosmosSchemaLoaderIntegrationTest.java
@@ -1,8 +1,7 @@
-package com.scalar.db.schemaloader.cosmos;
+package com.scalar.db.storage.cosmos;
 
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.cosmos.CosmosEnv;
 import java.util.Optional;
 
 public class CosmosSchemaLoaderIntegrationTest extends SchemaLoaderIntegrationTestBase {

diff --git a/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java b/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java
@@ -1,9 +1,8 @@
-package com.scalar.db.schemaloader.cosmos;
+package com.scalar.db.storage.cosmos;
 
 import com.google.common.collect.ImmutableList;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.cosmos.CosmosEnv;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

diff --git a/...mo/DynamoSchemaLoaderIntegrationTest.java → ...mo/DynamoSchemaLoaderIntegrationTest.java b/...mo/DynamoSchemaLoaderIntegrationTest.java → ...mo/DynamoSchemaLoaderIntegrationTest.java
@@ -1,9 +1,8 @@
-package com.scalar.db.schemaloader.dynamo;
+package com.scalar.db.storage.dynamo;
 
 import com.google.common.collect.ImmutableList;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.dynamo.DynamoEnv;
 import java.util.List;
 
 public class DynamoSchemaLoaderIntegrationTest extends SchemaLoaderIntegrationTestBase {

diff --git a/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java b/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java
@@ -1,10 +1,8 @@
-package com.scalar.db.schemaloader.dynamo;
+package com.scalar.db.storage.dynamo;
 
 import com.google.common.collect.ImmutableList;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.dynamo.DynamoConfig;
-import com.scalar.db.storage.dynamo.DynamoEnv;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

diff --git a/...jdbc/JdbcSchemaLoaderIntegrationTest.java → ...jdbc/JdbcSchemaLoaderIntegrationTest.java b/...jdbc/JdbcSchemaLoaderIntegrationTest.java → ...jdbc/JdbcSchemaLoaderIntegrationTest.java
@@ -1,8 +1,7 @@
-package com.scalar.db.schemaloader.jdbc;
+package com.scalar.db.storage.jdbc;
 
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.jdbc.JdbcEnv;
 
 public class JdbcSchemaLoaderIntegrationTest extends SchemaLoaderIntegrationTestBase {
 

diff --git a/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java b/...thStorageSpecificArgsIntegrationTest.java → ...thStorageSpecificArgsIntegrationTest.java
@@ -1,9 +1,8 @@
-package com.scalar.db.schemaloader.jdbc;
+package com.scalar.db.storage.jdbc;
 
 import com.google.common.collect.ImmutableList;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.jdbc.JdbcEnv;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;

diff --git a/...tiStorageSchemaLoaderIntegrationTest.java → ...tiStorageSchemaLoaderIntegrationTest.java b/...tiStorageSchemaLoaderIntegrationTest.java → ...tiStorageSchemaLoaderIntegrationTest.java
@@ -1,9 +1,7 @@
-package com.scalar.db.schemaloader.multistorage;
+package com.scalar.db.storage.multistorage;
 
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase;
-import com.scalar.db.storage.multistorage.MultiStorageConfig;
-import com.scalar.db.storage.multistorage.MultiStorageEnv;
 import com.scalar.db.transaction.consensuscommit.Coordinator;
 import java.util.Properties;