test env module

mikewacker · Feb 23, 2025 · 7d63f20 · 7d63f20
1 parent 6337763
commit 7d63f20
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 32 deletions.
diff --git a/...le/client/src/test/java/org/example/age/module/client/testing/TestDependenciesModule.java b/...le/client/src/test/java/org/example/age/module/client/testing/TestDependenciesModule.java
@@ -5,9 +5,9 @@
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import org.example.age.module.client.AvsClientsConfig;
 import org.example.age.module.client.SiteClientsConfig;
+import org.example.age.testing.TestEnvModule;
 
 /**
  * Dagger module that binds...
@@ -19,7 +19,7 @@
  * <p>
  * Depends on an unbound <code>@Named("port") int</code>.
  */
-@Module
+@Module(includes = TestEnvModule.class)
 public interface TestDependenciesModule {
 
     @Provides
@@ -33,11 +33,4 @@ static SiteClientsConfig provideSiteClientsConfig(@Named("port") int port) {
     static AvsClientsConfig provideAvsClientsConfig(@Named("port") int port) {
         return TestConfig.createAvs(port);
     }
-
-    @Provides
-    @Named("worker")
-    @Singleton
-    static ExecutorService providerWorker() {
-        return Executors.newFixedThreadPool(1);
-    }
 }
diff --git a/...demo/src/test/java/org/example/age/module/crypto/demo/testing/TestDependenciesModule.java b/...demo/src/test/java/org/example/age/module/crypto/demo/testing/TestDependenciesModule.java
@@ -5,7 +5,7 @@
 import dagger.Provides;
 import org.example.age.module.crypto.demo.AvsKeysConfig;
 import org.example.age.module.crypto.demo.SiteKeysConfig;
-import org.example.age.testing.TestObjectMapper;
+import org.example.age.testing.TestEnvModule;
 
 /**
  * Dagger module that binds...
@@ -15,7 +15,7 @@
  *     <li>{@link ObjectMapper}
  * </ul>
  */
-@Module(includes = TestObjectMapper.Module.class)
+@Module(includes = TestEnvModule.class)
 public interface TestDependenciesModule {
 
     @Provides

diff --git a/...y/src/test/java/org/example/age/module/store/inmemory/testing/TestDependenciesModule.java b/...y/src/test/java/org/example/age/module/store/inmemory/testing/TestDependenciesModule.java
@@ -4,7 +4,7 @@
 import dagger.Binds;
 import dagger.Module;
 import java.util.concurrent.ScheduledExecutorService;
-import org.example.age.testing.TestObjectMapper;
+import org.example.age.testing.TestEnvModule;
 
 /**
  * Dagger module that binds...
@@ -13,7 +13,7 @@
  *     <li>{@link ScheduledExecutorService} (with {@link FakeScheduledExecutorService})
  * </ul>
  */
-@Module(includes = TestObjectMapper.Module.class)
+@Module(includes = TestEnvModule.class)
 public interface TestDependenciesModule {
 
     @Binds

diff --git a/service/src/test/java/org/example/age/service/testing/TestDependenciesModule.java b/service/src/test/java/org/example/age/service/testing/TestDependenciesModule.java
@@ -16,7 +16,7 @@
 import org.example.age.service.testing.request.TestAccountId;
 import org.example.age.service.testing.request.TestRequestModule;
 import org.example.age.service.testing.store.TestStoreModule;
-import org.example.age.testing.TestObjectMapper;
+import org.example.age.testing.TestEnvModule;
 
 /**
  * Dagger module that binds...
@@ -35,13 +35,7 @@
  * <p>
  * It also binds {@link TestAccountId}.
  */
-@Module(
-        includes = {
-            TestRequestModule.class,
-            TestStoreModule.class,
-            TestCryptoModule.class,
-            TestObjectMapper.Module.class
-        })
+@Module(includes = {TestRequestModule.class, TestStoreModule.class, TestCryptoModule.class, TestEnvModule.class})
 public interface TestDependenciesModule {
 
     @Provides

diff --git a/testing/src/main/java/org/example/age/testing/TestEnvModule.java b/testing/src/main/java/org/example/age/testing/TestEnvModule.java
@@ -0,0 +1,35 @@
+package org.example.age.testing;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import dagger.Module;
+import dagger.Provides;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Dagger module that binds...
+ * <ul>
+ *     <li>{@link ObjectMapper}
+ *     <li><code>@Named("worker") {@link ExecutorService}</code>
+ * </ul>
+ * <p>
+ * Thread pools have a single thread.
+ */
+@Module
+public interface TestEnvModule {
+
+    @Provides
+    @Singleton
+    static ObjectMapper provideObjectMapper() {
+        return TestObjectMapper.get();
+    }
+
+    @Provides
+    @Named("worker")
+    @Singleton
+    static ExecutorService provideWorkerThreadPool() {
+        return Executors.newFixedThreadPool(1);
+    }
+}
diff --git a/testing/src/main/java/org/example/age/testing/TestObjectMapper.java b/testing/src/main/java/org/example/age/testing/TestObjectMapper.java
@@ -1,7 +1,6 @@
 package org.example.age.testing;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import dagger.Provides;
 import io.dropwizard.jackson.Jackson;
 
 /** {@link ObjectMapper} singleton for testing. */
@@ -14,16 +13,6 @@ public static ObjectMapper get() {
         return mapper;
     }
 
-    /** Dagger module that binds {@link ObjectMapper}. */
-    @dagger.Module
-    public interface Module {
-
-        @Provides
-        static ObjectMapper provideObjectMapper() {
-            return get();
-        }
-    }
-
     // static class
     private TestObjectMapper() {}
 }