feat: Refactor the test container image (#506)

Ahoo-Wang · Dec 7, 2023 · 4b1e7d9 · 4b1e7d9
1 parent eef1017
commit 4b1e7d9
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 45 deletions.
diff --git a/...mongo/src/test/java/me/ahoo/cosid/mongo/GroupedMongoReactiveIdSegmentDistributorTest.java b/...mongo/src/test/java/me/ahoo/cosid/mongo/GroupedMongoReactiveIdSegmentDistributorTest.java
@@ -15,10 +15,9 @@
 
 import me.ahoo.cosid.mongo.reactive.MongoReactiveIdSegmentDistributorFactory;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveIdSegmentInitializer;
-import me.ahoo.cosid.segment.IdSegmentDistributor;
 import me.ahoo.cosid.segment.IdSegmentDistributorFactory;
+import me.ahoo.cosid.test.container.MongoLauncher;
 import me.ahoo.cosid.test.segment.distributor.GroupedIdSegmentDistributorSpec;
-import me.ahoo.cosid.test.segment.distributor.IdSegmentDistributorSpec;
 
 import com.mongodb.reactivestreams.client.MongoClients;
 import com.mongodb.reactivestreams.client.MongoDatabase;

diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoIdSegmentDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoIdSegmentDistributorTest.java
@@ -15,6 +15,7 @@
 
 import me.ahoo.cosid.segment.IdSegmentDistributor;
 import me.ahoo.cosid.segment.IdSegmentDistributorFactory;
+import me.ahoo.cosid.test.container.MongoLauncher;
 import me.ahoo.cosid.test.segment.distributor.IdSegmentDistributorSpec;
 
 import com.mongodb.client.MongoClients;

diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoIdSegmentInitializerTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoIdSegmentInitializerTest.java
@@ -16,6 +16,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import me.ahoo.cosid.test.MockIdGenerator;
+import me.ahoo.cosid.test.container.MongoLauncher;
 
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;

diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java
@@ -16,14 +16,13 @@
 import me.ahoo.cosid.machine.ClockBackwardsSynchronizer;
 import me.ahoo.cosid.machine.MachineIdDistributor;
 import me.ahoo.cosid.machine.MachineStateStorage;
+import me.ahoo.cosid.test.container.MongoLauncher;
 import me.ahoo.cosid.test.machine.distributor.MachineIdDistributorSpec;
 
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import org.junit.jupiter.api.BeforeEach;
 
-import java.time.Duration;
-
 class MongoMachineIdDistributorTest extends MachineIdDistributorSpec {
     MongoDatabase mongoDatabase;
     MachineIdDistributor machineIdDistributor;

diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveIdSegmentDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveIdSegmentDistributorTest.java
@@ -23,6 +23,7 @@
 import me.ahoo.cosid.segment.IdSegmentDistributorFactory;
 import me.ahoo.cosid.segment.SegmentChainId;
 import me.ahoo.cosid.test.MockIdGenerator;
+import me.ahoo.cosid.test.container.MongoLauncher;
 import me.ahoo.cosid.test.segment.distributor.IdSegmentDistributorSpec;
 
 import com.mongodb.reactivestreams.client.MongoClients;

diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java
@@ -18,14 +18,13 @@
 import me.ahoo.cosid.machine.MachineStateStorage;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveMachineCollection;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveMachineInitializer;
+import me.ahoo.cosid.test.container.MongoLauncher;
 import me.ahoo.cosid.test.machine.distributor.MachineIdDistributorSpec;
 
 import com.mongodb.reactivestreams.client.MongoClients;
 import com.mongodb.reactivestreams.client.MongoDatabase;
 import org.junit.jupiter.api.BeforeEach;
 
-import java.time.Duration;
-
 class MongoReactiveMachineIdDistributorTest extends MachineIdDistributorSpec {
     MongoDatabase mongoDatabase;
     MachineIdDistributor machineIdDistributor;

diff --git a/...osid/spring/boot/starter/machine/CosIdMongoMachineIdDistributorAutoConfigurationTest.java b/...osid/spring/boot/starter/machine/CosIdMongoMachineIdDistributorAutoConfigurationTest.java
@@ -19,8 +19,8 @@
 import me.ahoo.cosid.mongo.reactive.MongoReactiveMachineCollection;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveMachineInitializer;
 import me.ahoo.cosid.spring.boot.starter.CosIdAutoConfiguration;
-import me.ahoo.cosid.spring.boot.starter.mongo.MongoLauncher;
 import me.ahoo.cosid.test.MockIdGenerator;
+import me.ahoo.cosid.test.container.MongoLauncher;
 
 import org.assertj.core.api.AssertionsForInterfaceTypes;
 import org.junit.jupiter.api.Test;

diff --git a/...ing-boot-starter/src/test/java/me/ahoo/cosid/spring/boot/starter/mongo/MongoLauncher.java b/...ing-boot-starter/src/test/java/me/ahoo/cosid/spring/boot/starter/mongo/MongoLauncher.java
diff --git a/...ava/me/ahoo/cosid/spring/boot/starter/segment/CosIdMongoSegmentAutoConfigurationTest.java b/...ava/me/ahoo/cosid/spring/boot/starter/segment/CosIdMongoSegmentAutoConfigurationTest.java
@@ -17,7 +17,7 @@
 import me.ahoo.cosid.mongo.MongoIdSegmentInitializer;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveIdSegmentDistributorFactory;
 import me.ahoo.cosid.mongo.reactive.MongoReactiveIdSegmentInitializer;
-import me.ahoo.cosid.spring.boot.starter.mongo.MongoLauncher;
+import me.ahoo.cosid.test.container.MongoLauncher;
 
 import org.assertj.core.api.AssertionsForInterfaceTypes;
 import org.junit.jupiter.api.Test;

diff --git a/cosid-test/build.gradle.kts b/cosid-test/build.gradle.kts
@@ -13,8 +13,18 @@
 
 description = "CosId test specification module"
 
+java {
+    registerFeature("mongoSupport") {
+        usingSourceSet(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME])
+        capability(group.toString(), "mongo-support", version.toString())
+    }
+}
+
 dependencies {
     implementation(project(":cosid-core"))
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.hamcrest:hamcrest")
+    "mongoSupportImplementation"("org.testcontainers:testcontainers")
+    "mongoSupportImplementation"("org.testcontainers:junit-jupiter")
+    "mongoSupportImplementation"("org.testcontainers:mongodb")
 }
diff --git a/...va/me/ahoo/cosid/mongo/MongoLauncher.java → ...o/cosid/test/container/MongoLauncher.java b/...va/me/ahoo/cosid/mongo/MongoLauncher.java → ...o/cosid/test/container/MongoLauncher.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package me.ahoo.cosid.mongo;
+package me.ahoo.cosid.test.container;
 
 
 import org.testcontainers.containers.MongoDBContainer;