diff --git a/.idea/runConfigurations/All_in_briar_headless.xml b/.idea/runConfigurations/All_in_briar_headless.xml deleted file mode 100644 index 906ace467..000000000 --- a/.idea/runConfigurations/All_in_briar_headless.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml index a1de55c01..102bdba54 100644 --- a/.idea/runConfigurations/All_tests.xml +++ b/.idea/runConfigurations/All_tests.xml @@ -1,30 +1,20 @@ - - - - - + \ No newline at end of file diff --git a/.idea/runConfigurations/All_tests_in_briar_headless.xml b/.idea/runConfigurations/All_tests_in_briar_headless.xml new file mode 100644 index 000000000..a60d9f518 --- /dev/null +++ b/.idea/runConfigurations/All_tests_in_briar_headless.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java index d162eea09..4358aab80 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java @@ -2,10 +2,13 @@ package org.briarproject.bramble; import org.briarproject.bramble.battery.AndroidBatteryModule; import org.briarproject.bramble.network.AndroidNetworkModule; +import org.briarproject.bramble.reporting.ReportingModule; public interface BrambleAndroidEagerSingletons { void inject(AndroidBatteryModule.EagerSingletons init); void inject(AndroidNetworkModule.EagerSingletons init); + + void inject(ReportingModule.EagerSingletons init); } diff --git a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java index beed8b65b..9fb25b20b 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java @@ -3,6 +3,8 @@ package org.briarproject.bramble; import org.briarproject.bramble.battery.AndroidBatteryModule; import org.briarproject.bramble.network.AndroidNetworkModule; import org.briarproject.bramble.plugin.tor.CircumventionModule; +import org.briarproject.bramble.reporting.ReportingModule; +import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.system.AndroidSystemModule; import dagger.Module; @@ -11,12 +13,15 @@ import dagger.Module; AndroidBatteryModule.class, AndroidNetworkModule.class, AndroidSystemModule.class, - CircumventionModule.class + CircumventionModule.class, + ReportingModule.class, + SocksModule.class }) public class BrambleAndroidModule { public static void initEagerSingletons(BrambleAndroidEagerSingletons c) { c.inject(new AndroidBatteryModule.EagerSingletons()); c.inject(new AndroidNetworkModule.EagerSingletons()); + c.inject(new ReportingModule.EagerSingletons()); } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java index f9f66375c..6ca1c4ec8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.identity.IdentityModule; import org.briarproject.bramble.lifecycle.LifecycleModule; import org.briarproject.bramble.plugin.PluginModule; import org.briarproject.bramble.properties.PropertiesModule; -import org.briarproject.bramble.reporting.ReportingModule; import org.briarproject.bramble.sync.validation.ValidationModule; import org.briarproject.bramble.system.SystemModule; import org.briarproject.bramble.transport.TransportModule; @@ -29,8 +28,6 @@ public interface BrambleCoreEagerSingletons { void inject(PropertiesModule.EagerSingletons init); - void inject(ReportingModule.EagerSingletons init); - void inject(SystemModule.EagerSingletons init); void inject(TransportModule.EagerSingletons init); @@ -38,4 +35,18 @@ public interface BrambleCoreEagerSingletons { void inject(ValidationModule.EagerSingletons init); void inject(VersioningModule.EagerSingletons init); + + default void injectBrambleCoreEagerSingletons() { + inject(new ContactModule.EagerSingletons()); + inject(new CryptoExecutorModule.EagerSingletons()); + inject(new DatabaseExecutorModule.EagerSingletons()); + inject(new IdentityModule.EagerSingletons()); + inject(new LifecycleModule.EagerSingletons()); + inject(new PluginModule.EagerSingletons()); + inject(new PropertiesModule.EagerSingletons()); + inject(new SystemModule.EagerSingletons()); + inject(new TransportModule.EagerSingletons()); + inject(new ValidationModule.EagerSingletons()); + inject(new VersioningModule.EagerSingletons()); + } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java index ebf43a69d..27b1f60f8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java @@ -16,9 +16,7 @@ import org.briarproject.bramble.properties.PropertiesModule; import org.briarproject.bramble.record.RecordModule; import org.briarproject.bramble.reliability.ReliabilityModule; import org.briarproject.bramble.rendezvous.RendezvousModule; -import org.briarproject.bramble.reporting.ReportingModule; import org.briarproject.bramble.settings.SettingsModule; -import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.sync.SyncModule; import org.briarproject.bramble.sync.validation.ValidationModule; import org.briarproject.bramble.system.SystemModule; @@ -44,9 +42,7 @@ import dagger.Module; RecordModule.class, ReliabilityModule.class, RendezvousModule.class, - ReportingModule.class, SettingsModule.class, - SocksModule.class, SyncModule.class, SystemModule.class, TransportModule.class, @@ -56,17 +52,6 @@ import dagger.Module; public class BrambleCoreModule { public static void initEagerSingletons(BrambleCoreEagerSingletons c) { - c.inject(new ContactModule.EagerSingletons()); - c.inject(new CryptoExecutorModule.EagerSingletons()); - c.inject(new DatabaseExecutorModule.EagerSingletons()); - c.inject(new IdentityModule.EagerSingletons()); - c.inject(new LifecycleModule.EagerSingletons()); - c.inject(new PluginModule.EagerSingletons()); - c.inject(new PropertiesModule.EagerSingletons()); - c.inject(new ReportingModule.EagerSingletons()); - c.inject(new SystemModule.EagerSingletons()); - c.inject(new TransportModule.EagerSingletons()); - c.inject(new ValidationModule.EagerSingletons()); - c.inject(new VersioningModule.EagerSingletons()); + c.injectBrambleCoreEagerSingletons(); } } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java index df8787115..8efe630f6 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java @@ -72,6 +72,7 @@ public class SyncIntegrationTest extends BrambleTestCase { SyncIntegrationTestComponent component = DaggerSyncIntegrationTestComponent.builder().build(); + component.injectBrambleCoreEagerSingletons(); component.inject(this); contactId = getContactId(); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java index e1657306a..0b0316207 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java @@ -1,11 +1,8 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.crypto.CryptoModule; -import org.briarproject.bramble.record.RecordModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestSecureRandomModule; -import org.briarproject.bramble.transport.TransportModule; +import org.briarproject.bramble.BrambleCoreEagerSingletons; +import org.briarproject.bramble.BrambleCoreModule; +import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import javax.inject.Singleton; @@ -13,15 +10,10 @@ import dagger.Component; @Singleton @Component(modules = { - TestSecureRandomModule.class, - CryptoModule.class, - RecordModule.class, - SyncModule.class, - SystemModule.class, - ValidationModule.class, - TransportModule.class + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class }) -interface SyncIntegrationTestComponent { +interface SyncIntegrationTestComponent extends BrambleCoreEagerSingletons { void inject(SyncIntegrationTest testCase); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java new file mode 100644 index 000000000..ab30c90a6 --- /dev/null +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java @@ -0,0 +1,16 @@ +package org.briarproject.bramble.test; + +import org.briarproject.bramble.battery.DefaultBatteryManagerModule; +import org.briarproject.bramble.event.DefaultEventExecutorModule; + +import dagger.Module; + +@Module(includes = { + DefaultBatteryManagerModule.class, + DefaultEventExecutorModule.class, + TestDatabaseConfigModule.class, + TestPluginConfigModule.class, + TestSecureRandomModule.class +}) +public class BrambleCoreIntegrationTestModule { +} diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfigModule.java similarity index 50% rename from bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfigModule.java index f03c8108f..d6189812c 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfigModule.java @@ -1,26 +1,22 @@ package org.briarproject.bramble.test; import org.briarproject.bramble.api.db.DatabaseConfig; -import org.briarproject.bramble.api.db.DatabaseExecutor; import java.io.File; -import java.util.concurrent.Executor; - -import javax.inject.Singleton; import dagger.Module; import dagger.Provides; @Module -public class TestDatabaseModule { +public class TestDatabaseConfigModule { private final DatabaseConfig config; - public TestDatabaseModule() { + public TestDatabaseConfigModule() { this(new File(".")); } - public TestDatabaseModule(File dir) { + public TestDatabaseConfigModule(File dir) { config = new TestDatabaseConfig(dir); } @@ -28,11 +24,4 @@ public class TestDatabaseModule { DatabaseConfig provideDatabaseConfig() { return config; } - - @Provides - @Singleton - @DatabaseExecutor - Executor provideDatabaseExecutor() { - return new ImmediateExecutor(); - } } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java deleted file mode 100644 index 70430a94c..000000000 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.briarproject.bramble.test; - -import org.briarproject.bramble.api.crypto.SecretKey; -import org.briarproject.bramble.api.lifecycle.IoExecutor; -import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.lifecycle.Service; -import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; - -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; - -import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING; - -@Module -public class TestLifecycleModule { - - @Provides - LifecycleManager provideLifecycleManager() { - @NotNullByDefault - LifecycleManager lifecycleManager = new LifecycleManager() { - - @Override - public void registerService(Service s) { - } - - @Override - public void registerOpenDatabaseHook(OpenDatabaseHook hook) { - } - - @Override - public void registerForShutdown(ExecutorService e) { - } - - @Override - public StartResult startServices(SecretKey dbKey) { - return StartResult.SUCCESS; - } - - @Override - public void stopServices() { - } - - @Override - public void waitForDatabase() { - } - - @Override - public void waitForStartup() { - } - - @Override - public void waitForShutdown() { - } - - @Override - public LifecycleState getLifecycleState() { - return RUNNING; - } - }; - return lifecycleManager; - } - - @Provides - ShutdownManager provideShutdownManager() { - @NotNullByDefault - ShutdownManager shutdownManager = new ShutdownManager() { - - @Override - public int addShutdownHook(Runnable hook) { - return 0; - } - - @Override - public boolean removeShutdownHook(int handle) { - return true; - } - }; - return shutdownManager; - } - - @Provides - @IoExecutor - @Singleton - Executor provideIoExecutor() { - return Executors.newCachedThreadPool(); - } -} diff --git a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java index c6f74d4ab..6ef05f5f1 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java @@ -2,6 +2,7 @@ package org.briarproject.bramble; import org.briarproject.bramble.network.JavaNetworkModule; import org.briarproject.bramble.plugin.tor.CircumventionModule; +import org.briarproject.bramble.socks.SocksModule; import org.briarproject.bramble.system.JavaSystemModule; import dagger.Module; @@ -9,7 +10,8 @@ import dagger.Module; @Module(includes = { JavaNetworkModule.class, JavaSystemModule.class, - CircumventionModule.class + CircumventionModule.class, + SocksModule.class }) public class BrambleJavaModule { diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index 72b473e5f..a31b1a1ed 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -2,6 +2,7 @@ package org.briarproject.bramble.plugin.tor; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.event.EventBus; +import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; @@ -22,7 +23,6 @@ import org.junit.runners.Parameterized.Parameters; import java.io.File; import java.util.List; import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.logging.Logger; import javax.inject.Inject; @@ -30,6 +30,7 @@ import javax.net.SocketFactory; import static java.util.Collections.singletonList; import static java.util.concurrent.TimeUnit.SECONDS; +import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory; import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled; @@ -44,14 +45,17 @@ public class BridgeTest extends BrambleTestCase { public static Iterable data() { BrambleJavaIntegrationTestComponent component = DaggerBrambleJavaIntegrationTestComponent.builder().build(); + component.injectBrambleCoreEagerSingletons(); return component.getCircumventionProvider().getBridges(false); } private final static long TIMEOUT = SECONDS.toMillis(30); - private final static Logger LOG = - Logger.getLogger(BridgeTest.class.getName()); + private final static Logger LOG = getLogger(BridgeTest.class.getName()); + @Inject + @IoExecutor + Executor ioExecutor; @Inject NetworkManager networkManager; @Inject @@ -86,9 +90,9 @@ public class BridgeTest extends BrambleTestCase { BrambleJavaIntegrationTestComponent component = DaggerBrambleJavaIntegrationTestComponent.builder().build(); + component.injectBrambleCoreEagerSingletons(); component.inject(this); - Executor ioExecutor = Executors.newCachedThreadPool(); LocationUtils locationUtils = () -> "US"; SocketFactory torSocketFactory = SocketFactory.getDefault(); @@ -146,5 +150,4 @@ public class BridgeTest extends BrambleTestCase { plugin.stop(); } } - } diff --git a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java index e16e71284..777dbe8b8 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java @@ -1,13 +1,10 @@ package org.briarproject.bramble.test; +import org.briarproject.bramble.BrambleCoreEagerSingletons; +import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.BrambleJavaModule; -import org.briarproject.bramble.battery.DefaultBatteryManagerModule; -import org.briarproject.bramble.event.DefaultEventExecutorModule; -import org.briarproject.bramble.event.EventModule; -import org.briarproject.bramble.plugin.PluginModule; import org.briarproject.bramble.plugin.tor.BridgeTest; import org.briarproject.bramble.plugin.tor.CircumventionProvider; -import org.briarproject.bramble.system.SystemModule; import javax.inject.Singleton; @@ -15,15 +12,12 @@ import dagger.Component; @Singleton @Component(modules = { - BrambleJavaModule.class, - TestLifecycleModule.class, - DefaultBatteryManagerModule.class, - DefaultEventExecutorModule.class, - EventModule.class, - PluginModule.class, // needed for BackoffFactory - SystemModule.class, + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class, + BrambleJavaModule.class }) -public interface BrambleJavaIntegrationTestComponent { +public interface BrambleJavaIntegrationTestComponent + extends BrambleCoreEagerSingletons { void inject(BridgeTest init); diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java index feff9a197..780dd5525 100644 --- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java @@ -2,7 +2,7 @@ package org.briarproject.briar.blog; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogCommentHeader; import org.briarproject.briar.api.blog.BlogManager; @@ -65,19 +65,23 @@ public class BlogManagerIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java index 7bcefce13..f669cf8cf 100644 --- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java @@ -3,22 +3,13 @@ package org.briarproject.briar.feed; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.bramble.test.TestUtils; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPostHeader; import org.briarproject.briar.api.feed.Feed; import org.briarproject.briar.api.feed.FeedManager; -import org.briarproject.briar.blog.BlogModule; import org.briarproject.briar.test.BriarTestCase; import org.junit.After; import org.junit.Before; @@ -45,10 +36,10 @@ public class FeedManagerIntegrationTest extends BriarTestCase { assertTrue(testDir.mkdirs()); FeedManagerIntegrationTestComponent component = DaggerFeedManagerIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(testFile)) - .build(); + .testDatabaseConfigModule( + new TestDatabaseConfigModule(testFile)).build(); + component.injectFeedManagerEagerSingletons(); component.inject(this); - injectEagerSingletons(component); IdentityManager identityManager = component.getIdentityManager(); Identity identity = identityManager.createIdentity("feedTest"); @@ -118,19 +109,4 @@ public class FeedManagerIntegrationTest extends BriarTestCase { lifecycleManager.waitForShutdown(); TestUtils.deleteTestDirectory(testDir); } - - protected void injectEagerSingletons( - FeedManagerIntegrationTestComponent component) { - component.inject(new BlogModule.EagerSingletons()); - component.inject(new ContactModule.EagerSingletons()); - component.inject(new CryptoExecutorModule.EagerSingletons()); - component.inject(new FeedModule.EagerSingletons()); - component.inject(new IdentityModule.EagerSingletons()); - component.inject(new LifecycleModule.EagerSingletons()); - component.inject(new SystemModule.EagerSingletons()); - component.inject(new TransportModule.EagerSingletons()); - component.inject(new ValidationModule.EagerSingletons()); - component.inject(new VersioningModule.EagerSingletons()); - } - } diff --git a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java index aefdf9360..279e8e25e 100644 --- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java @@ -1,26 +1,11 @@ package org.briarproject.briar.feed; +import org.briarproject.bramble.BrambleCoreEagerSingletons; +import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.client.ClientModule; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.crypto.CryptoModule; -import org.briarproject.bramble.data.DataModule; -import org.briarproject.bramble.db.DatabaseModule; -import org.briarproject.bramble.event.DefaultEventExecutorModule; -import org.briarproject.bramble.event.EventModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.sync.SyncModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestDatabaseModule; -import org.briarproject.bramble.test.TestPluginConfigModule; -import org.briarproject.bramble.test.TestSecureRandomModule; +import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.bramble.test.TestSocksModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.feed.FeedManager; import org.briarproject.briar.blog.BlogModule; @@ -33,53 +18,28 @@ import dagger.Component; @Singleton @Component(modules = { - TestDatabaseModule.class, - TestPluginConfigModule.class, - TestSecureRandomModule.class, - TestSocksModule.class, - TestDnsModule.class, - BriarClientModule.class, - ClientModule.class, - ContactModule.class, - CryptoModule.class, - CryptoExecutorModule.class, + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class, BlogModule.class, + BriarClientModule.class, FeedModule.class, - DataModule.class, - DatabaseModule.class, - DefaultEventExecutorModule.class, - EventModule.class, - IdentityModule.class, - LifecycleModule.class, - SyncModule.class, - SystemModule.class, - TransportModule.class, - ValidationModule.class, - VersioningModule.class + TestDnsModule.class, + TestSocksModule.class, }) -interface FeedManagerIntegrationTestComponent { +interface FeedManagerIntegrationTestComponent + extends BrambleCoreEagerSingletons { void inject(FeedManagerIntegrationTest testCase); void inject(BlogModule.EagerSingletons init); - void inject(ContactModule.EagerSingletons init); - - void inject(CryptoExecutorModule.EagerSingletons init); - void inject(FeedModule.EagerSingletons init); - void inject(IdentityModule.EagerSingletons init); - - void inject(LifecycleModule.EagerSingletons init); - - void inject(SystemModule.EagerSingletons init); - - void inject(TransportModule.EagerSingletons init); - - void inject(ValidationModule.EagerSingletons init); - - void inject(VersioningModule.EagerSingletons init); + default void injectFeedManagerEagerSingletons() { + injectBrambleCoreEagerSingletons(); + inject(new BlogModule.EagerSingletons()); + inject(new FeedModule.EagerSingletons()); + } IdentityManager getIdentityManager(); diff --git a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java index 179e4282e..50cc3eea1 100644 --- a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java @@ -1,7 +1,7 @@ package org.briarproject.briar.forum; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumManager; import org.briarproject.briar.api.forum.ForumPost; @@ -56,19 +56,23 @@ public class ForumManagerTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } private ForumPost createForumPost(GroupId groupId, diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java index e05a9ab0e..912a5f90d 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java @@ -54,6 +54,7 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase { public IntroductionCryptoIntegrationTest() { IntroductionIntegrationTestComponent component = DaggerIntroductionIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); crypto = new IntroductionCryptoImpl(cryptoComponent, clientHelper); @@ -148,5 +149,4 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase { byte[] bobMac = crypto.activateMac(bobMacKey); crypto.verifyActivateMac(bobMac, bobMacKey); } - } diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index 6cf552c03..4842511a0 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -22,7 +22,7 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.client.ProtocolStateException; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.conversation.ConversationMessageHeader; @@ -106,19 +106,23 @@ public class IntroductionIntegrationTest protected void createComponents() { IntroductionIntegrationTestComponent component = DaggerIntroductionIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerIntroductionIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerIntroductionIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerIntroductionIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java index 815da25ea..cb0051089 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java @@ -1,25 +1,7 @@ package org.briarproject.briar.introduction; -import org.briarproject.bramble.client.ClientModule; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.crypto.CryptoModule; -import org.briarproject.bramble.data.DataModule; -import org.briarproject.bramble.db.DatabaseModule; -import org.briarproject.bramble.event.DefaultEventExecutorModule; -import org.briarproject.bramble.event.EventModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.properties.PropertiesModule; -import org.briarproject.bramble.record.RecordModule; -import org.briarproject.bramble.sync.SyncModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestDatabaseModule; -import org.briarproject.bramble.test.TestPluginConfigModule; -import org.briarproject.bramble.test.TestSecureRandomModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; +import org.briarproject.bramble.BrambleCoreModule; +import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.briar.blog.BlogModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.forum.ForumModule; @@ -35,34 +17,16 @@ import dagger.Component; @Singleton @Component(modules = { - TestDatabaseModule.class, - TestPluginConfigModule.class, - TestSecureRandomModule.class, + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class, BlogModule.class, BriarClientModule.class, - ClientModule.class, - ContactModule.class, - CryptoModule.class, - CryptoExecutorModule.class, - DataModule.class, - DatabaseModule.class, - DefaultEventExecutorModule.class, - EventModule.class, ForumModule.class, GroupInvitationModule.class, - IdentityModule.class, IntroductionModule.class, - LifecycleModule.class, MessagingModule.class, PrivateGroupModule.class, - PropertiesModule.class, - RecordModule.class, - SharingModule.class, - SyncModule.class, - SystemModule.class, - TransportModule.class, - ValidationModule.class, - VersioningModule.class + SharingModule.class }) interface IntroductionIntegrationTestComponent extends BriarIntegrationTestComponent { diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java index a6d93a6b9..9a730956c 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java @@ -74,6 +74,7 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase { public MessageEncoderParserIntegrationTest() { IntroductionIntegrationTestComponent component = DaggerIntroductionIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); messageEncoder = new MessageEncoderImpl(clientHelper, messageFactory); @@ -245,5 +246,4 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase { assertEquals(previousMsgId, am.getPreviousMessageId()); assertEquals(sessionId, am.getSessionId()); } - } diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java index ae31dcf06..c1ac51d94 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java @@ -83,6 +83,7 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase { public SessionEncoderParserIntegrationTest() { IntroductionIntegrationTestComponent component = DaggerIntroductionIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); sessionEncoder = new SessionEncoderImpl(clientHelper); @@ -338,5 +339,4 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase { assertEquals(i1.lastLocalMessageId, i2.lastLocalMessageId); assertEquals(i1.lastRemoteMessageId, i2.lastRemoteMessageId); } - } diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java index d0b6ea1de..1d53b0907 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java @@ -6,18 +6,10 @@ import org.briarproject.bramble.api.identity.AuthorFactory; import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; import org.briarproject.briar.api.forum.ForumPost; import org.briarproject.briar.api.forum.ForumPostFactory; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; -import org.briarproject.briar.forum.ForumModule; import org.briarproject.briar.test.BriarTestCase; import org.junit.Test; @@ -47,8 +39,8 @@ public class MessageSizeIntegrationTest extends BriarTestCase { public MessageSizeIntegrationTest() { MessageSizeIntegrationTestComponent component = DaggerMessageSizeIntegrationTestComponent.builder().build(); + component.injectMessageSizeEagerSingletons(); component.inject(this); - injectEagerSingletons(component); } @Test @@ -85,17 +77,4 @@ public class MessageSizeIntegrationTest extends BriarTestCase { + MAX_FORUM_POST_TEXT_LENGTH); assertTrue(length <= MAX_RECORD_PAYLOAD_BYTES); } - - private static void injectEagerSingletons( - MessageSizeIntegrationTestComponent component) { - component.inject(new ContactModule.EagerSingletons()); - component.inject(new CryptoExecutorModule.EagerSingletons()); - component.inject(new ForumModule.EagerSingletons()); - component.inject(new IdentityModule.EagerSingletons()); - component.inject(new MessagingModule.EagerSingletons()); - component.inject(new SystemModule.EagerSingletons()); - component.inject(new TransportModule.EagerSingletons()); - component.inject(new ValidationModule.EagerSingletons()); - component.inject(new VersioningModule.EagerSingletons()); - } } diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java index 833aed5e2..9c2cbd953 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java @@ -1,23 +1,8 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.client.ClientModule; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.crypto.CryptoModule; -import org.briarproject.bramble.data.DataModule; -import org.briarproject.bramble.db.DatabaseModule; -import org.briarproject.bramble.event.DefaultEventExecutorModule; -import org.briarproject.bramble.event.EventModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.sync.SyncModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestDatabaseModule; -import org.briarproject.bramble.test.TestLifecycleModule; -import org.briarproject.bramble.test.TestPluginConfigModule; -import org.briarproject.bramble.test.TestSecureRandomModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; +import org.briarproject.bramble.BrambleCoreEagerSingletons; +import org.briarproject.bramble.BrambleCoreModule; +import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.forum.ForumModule; @@ -27,47 +12,24 @@ import dagger.Component; @Singleton @Component(modules = { - TestDatabaseModule.class, - TestLifecycleModule.class, - TestPluginConfigModule.class, - TestSecureRandomModule.class, + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class, BriarClientModule.class, - ClientModule.class, - ContactModule.class, - CryptoModule.class, - CryptoExecutorModule.class, - DataModule.class, - DatabaseModule.class, - DefaultEventExecutorModule.class, - EventModule.class, ForumModule.class, - IdentityModule.class, - MessagingModule.class, - SyncModule.class, - SystemModule.class, - TransportModule.class, - ValidationModule.class, - VersioningModule.class + MessagingModule.class }) -interface MessageSizeIntegrationTestComponent { +interface MessageSizeIntegrationTestComponent + extends BrambleCoreEagerSingletons { void inject(MessageSizeIntegrationTest testCase); - void inject(ContactModule.EagerSingletons init); - - void inject(CryptoExecutorModule.EagerSingletons init); - void inject(ForumModule.EagerSingletons init); - void inject(IdentityModule.EagerSingletons init); - void inject(MessagingModule.EagerSingletons init); - void inject(SystemModule.EagerSingletons init); - - void inject(TransportModule.EagerSingletons init); - - void inject(ValidationModule.EagerSingletons init); - - void inject(VersioningModule.EagerSingletons init); + default void injectMessageSizeEagerSingletons() { + injectBrambleCoreEagerSingletons(); + inject(new ForumModule.EagerSingletons()); + inject(new MessagingModule.EagerSingletons()); + } } diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java index fb4206db8..9f3719676 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java @@ -19,14 +19,7 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriter; import org.briarproject.bramble.api.transport.StreamWriterFactory; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestDatabaseModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; @@ -71,11 +64,13 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { public void setUp() { assertTrue(testDir.mkdirs()); alice = DaggerSimplexMessagingIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(aliceDir)).build(); - injectEagerSingletons(alice); + .testDatabaseConfigModule( + new TestDatabaseConfigModule(aliceDir)).build(); + alice.injectSimplexMessagingEagerSingletons(); bob = DaggerSimplexMessagingIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(bobDir)).build(); - injectEagerSingletons(bob); + .testDatabaseConfigModule(new TestDatabaseConfigModule(bobDir)) + .build(); + bob.injectSimplexMessagingEagerSingletons(); } @Test @@ -204,18 +199,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { deleteTestDirectory(testDir); } - private static void injectEagerSingletons( - SimplexMessagingIntegrationTestComponent component) { - component.inject(new ContactModule.EagerSingletons()); - component.inject(new IdentityModule.EagerSingletons()); - component.inject(new LifecycleModule.EagerSingletons()); - component.inject(new MessagingModule.EagerSingletons()); - component.inject(new SystemModule.EagerSingletons()); - component.inject(new TransportModule.EagerSingletons()); - component.inject(new ValidationModule.EagerSingletons()); - component.inject(new VersioningModule.EagerSingletons()); - } - @NotNullByDefault private static class MessageDeliveryListener implements EventListener { diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java index efba3db0b..ed43f4bef 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java @@ -1,5 +1,7 @@ package org.briarproject.briar.messaging; +import org.briarproject.bramble.BrambleCoreEagerSingletons; +import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; @@ -8,25 +10,7 @@ import org.briarproject.bramble.api.sync.SyncSessionFactory; import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; -import org.briarproject.bramble.client.ClientModule; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoModule; -import org.briarproject.bramble.data.DataModule; -import org.briarproject.bramble.db.DatabaseModule; -import org.briarproject.bramble.event.DefaultEventExecutorModule; -import org.briarproject.bramble.event.EventModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.record.RecordModule; -import org.briarproject.bramble.sync.SyncModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; -import org.briarproject.bramble.test.TestCryptoExecutorModule; -import org.briarproject.bramble.test.TestDatabaseModule; -import org.briarproject.bramble.test.TestPluginConfigModule; -import org.briarproject.bramble.test.TestSecureRandomModule; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; +import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.client.BriarClientModule; @@ -37,45 +21,20 @@ import dagger.Component; @Singleton @Component(modules = { - TestCryptoExecutorModule.class, - TestDatabaseModule.class, - TestPluginConfigModule.class, - TestSecureRandomModule.class, + BrambleCoreIntegrationTestModule.class, + BrambleCoreModule.class, BriarClientModule.class, - ClientModule.class, - ContactModule.class, - CryptoModule.class, - DataModule.class, - DatabaseModule.class, - DefaultEventExecutorModule.class, - EventModule.class, - IdentityModule.class, - LifecycleModule.class, - MessagingModule.class, - RecordModule.class, - SyncModule.class, - SystemModule.class, - TransportModule.class, - ValidationModule.class, - VersioningModule.class + MessagingModule.class }) -interface SimplexMessagingIntegrationTestComponent { - - void inject(ContactModule.EagerSingletons init); - - void inject(IdentityModule.EagerSingletons init); - - void inject(LifecycleModule.EagerSingletons init); +interface SimplexMessagingIntegrationTestComponent + extends BrambleCoreEagerSingletons { void inject(MessagingModule.EagerSingletons init); - void inject(SystemModule.EagerSingletons init); - - void inject(TransportModule.EagerSingletons init); - - void inject(ValidationModule.EagerSingletons init); - - void inject(VersioningModule.EagerSingletons init); + default void injectSimplexMessagingEagerSingletons() { + injectBrambleCoreEagerSingletons(); + inject(new MessagingModule.EagerSingletons()); + } LifecycleManager getLifecycleManager(); diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java index 99aa1fdff..5cf28e6ef 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java @@ -6,7 +6,7 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.privategroup.GroupMember; import org.briarproject.briar.api.privategroup.GroupMessage; import org.briarproject.briar.api.privategroup.GroupMessageHeader; @@ -70,19 +70,23 @@ public class PrivateGroupIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java index 0e33a9a91..bef51dabb 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.client.MessageTracker.GroupCount; import org.briarproject.briar.api.privategroup.GroupMember; import org.briarproject.briar.api.privategroup.GroupMessage; @@ -59,19 +59,23 @@ public class PrivateGroupManagerIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java index 783a7e2c2..23bd95af3 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java @@ -2,7 +2,7 @@ package org.briarproject.briar.privategroup.invitation; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.sync.Group; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.client.ProtocolStateException; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.privategroup.GroupMessage; @@ -58,19 +58,23 @@ public class GroupInvitationIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java index a7cea84bd..f27adf583 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java @@ -9,7 +9,7 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.BlogInvitationRequest; @@ -82,19 +82,23 @@ public class BlogSharingIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } @Test diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java index 987a78d20..c57f03fdc 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java @@ -11,7 +11,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestDatabaseConfigModule; import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.ConversationResponse; import org.briarproject.briar.api.forum.Forum; @@ -86,19 +86,23 @@ public class ForumSharingIntegrationTest protected void createComponents() { BriarIntegrationTestComponent component = DaggerBriarIntegrationTestComponent.builder().build(); + component.injectBriarEagerSingletons(); component.inject(this); c0 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t0Dir)).build(); - injectEagerSingletons(c0); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t0Dir)) + .build(); + c0.injectBriarEagerSingletons(); c1 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t1Dir)).build(); - injectEagerSingletons(c1); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t1Dir)) + .build(); + c1.injectBriarEagerSingletons(); c2 = DaggerBriarIntegrationTestComponent.builder() - .testDatabaseModule(new TestDatabaseModule(t2Dir)).build(); - injectEagerSingletons(c2); + .testDatabaseConfigModule(new TestDatabaseConfigModule(t2Dir)) + .build(); + c2.injectBriarEagerSingletons(); } private void addForumForSharer() throws DbException { diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java index 742987779..8d79f4c34 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java @@ -28,16 +28,7 @@ import org.briarproject.bramble.api.sync.SyncSessionFactory; import org.briarproject.bramble.api.sync.event.MessageStateChangedEvent; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.transport.StreamWriter; -import org.briarproject.bramble.contact.ContactModule; -import org.briarproject.bramble.crypto.CryptoExecutorModule; -import org.briarproject.bramble.identity.IdentityModule; -import org.briarproject.bramble.lifecycle.LifecycleModule; -import org.briarproject.bramble.properties.PropertiesModule; -import org.briarproject.bramble.sync.validation.ValidationModule; -import org.briarproject.bramble.system.SystemModule; import org.briarproject.bramble.test.TestUtils; -import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.bramble.versioning.VersioningModule; import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.client.MessageTracker; @@ -46,13 +37,6 @@ import org.briarproject.briar.api.forum.ForumPostFactory; import org.briarproject.briar.api.privategroup.GroupMessageFactory; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory; -import org.briarproject.briar.blog.BlogModule; -import org.briarproject.briar.forum.ForumModule; -import org.briarproject.briar.introduction.IntroductionModule; -import org.briarproject.briar.messaging.MessagingModule; -import org.briarproject.briar.privategroup.PrivateGroupModule; -import org.briarproject.briar.privategroup.invitation.GroupInvitationModule; -import org.briarproject.briar.sharing.SharingModule; import org.junit.After; import org.junit.Before; @@ -183,26 +167,6 @@ public abstract class BriarIntegrationTest init); void inject(BlogModule.EagerSingletons init); - void inject(ContactModule.EagerSingletons init); - - void inject(CryptoExecutorModule.EagerSingletons init); - void inject(ForumModule.EagerSingletons init); void inject(GroupInvitationModule.EagerSingletons init); - void inject(IdentityModule.EagerSingletons init); - void inject(IntroductionModule.EagerSingletons init); - void inject(LifecycleModule.EagerSingletons init); - void inject(MessagingModule.EagerSingletons init); void inject(PrivateGroupModule.EagerSingletons init); - void inject(PropertiesModule.EagerSingletons init); - void inject(SharingModule.EagerSingletons init); - void inject(SystemModule.EagerSingletons init); - - void inject(TransportModule.EagerSingletons init); - - void inject(ValidationModule.EagerSingletons init); - - void inject(VersioningModule.EagerSingletons init); + default void injectBriarEagerSingletons() { + injectBrambleCoreEagerSingletons(); + inject(new BlogModule.EagerSingletons()); + inject(new ForumModule.EagerSingletons()); + inject(new GroupInvitationModule.EagerSingletons()); + inject(new IntroductionModule.EagerSingletons()); + inject(new MessagingModule.EagerSingletons()); + inject(new PrivateGroupModule.EagerSingletons()); + inject(new SharingModule.EagerSingletons()); + } LifecycleManager getLifecycleManager(); diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt index 0d3c42983..3d6c7fe12 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt @@ -21,6 +21,7 @@ import javax.inject.Singleton ) @Singleton internal interface BriarHeadlessApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons { + fun getRouter(): Router fun getSecureRandom(): SecureRandom diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt index 53ce493d3..1a4c2a4b0 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt @@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import dagger.Module import dagger.Provides import org.briarproject.bramble.api.battery.BatteryManager -import org.briarproject.bramble.api.crypto.CryptoComponent -import org.briarproject.bramble.api.crypto.PublicKey import org.briarproject.bramble.api.db.DatabaseConfig import org.briarproject.bramble.api.event.EventBus import org.briarproject.bramble.api.lifecycle.IoExecutor @@ -14,9 +12,6 @@ import org.briarproject.bramble.api.plugin.BackoffFactory import org.briarproject.bramble.api.plugin.PluginConfig import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory -import org.briarproject.bramble.api.reporting.DevConfig -import org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS -import org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX import org.briarproject.bramble.api.system.Clock import org.briarproject.bramble.api.system.LocationUtils import org.briarproject.bramble.api.system.ResourceProvider @@ -26,17 +21,16 @@ import org.briarproject.bramble.network.JavaNetworkModule import org.briarproject.bramble.plugin.tor.CircumventionModule import org.briarproject.bramble.plugin.tor.CircumventionProvider import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory +import org.briarproject.bramble.socks.SocksModule import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.bramble.util.OsUtils.isLinux import org.briarproject.bramble.util.OsUtils.isMac -import org.briarproject.bramble.util.StringUtils.fromHexString import org.briarproject.briar.headless.blogs.HeadlessBlogModule import org.briarproject.briar.headless.contact.HeadlessContactModule import org.briarproject.briar.headless.event.HeadlessEventModule import org.briarproject.briar.headless.forums.HeadlessForumModule import org.briarproject.briar.headless.messaging.HeadlessMessagingModule import java.io.File -import java.security.GeneralSecurityException import java.util.Collections.emptyList import java.util.concurrent.Executor import javax.inject.Singleton @@ -49,6 +43,7 @@ import javax.net.SocketFactory CircumventionModule::class, DefaultBatteryManagerModule::class, DefaultEventExecutorModule::class, + SocksModule::class, HeadlessBlogModule::class, HeadlessContactModule::class, HeadlessEventModule::class, @@ -95,23 +90,6 @@ internal class HeadlessModule(private val appDir: File) { } } - @Provides - @Singleton - internal fun provideDevConfig(crypto: CryptoComponent): DevConfig { - return object : DevConfig { - override fun getDevPublicKey(): PublicKey { - try { - return crypto.messageKeyParser.parsePublicKey(fromHexString(DEV_PUBLIC_KEY_HEX)) - } catch (e: GeneralSecurityException) { - throw RuntimeException(e) - } - } - - override fun getDevOnionAddress(): String = DEV_ONION_ADDRESS - override fun getReportDir(): File = File(appDir, "reportDir") - } - } - @Provides @Singleton internal fun provideObjectMapper() = ObjectMapper() diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt index 3bf488150..9454f4514 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt @@ -24,6 +24,7 @@ import javax.inject.Singleton ) @Singleton internal interface BriarHeadlessTestApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons { + fun getRouter(): Router fun getCryptoComponent(): CryptoComponent diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt index 256a80c76..c8f2b7d21 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt @@ -3,14 +3,13 @@ package org.briarproject.briar.headless import com.fasterxml.jackson.databind.ObjectMapper import dagger.Module import dagger.Provides -import org.briarproject.bramble.api.crypto.PublicKey import org.briarproject.bramble.api.db.DatabaseConfig import org.briarproject.bramble.api.plugin.PluginConfig import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory -import org.briarproject.bramble.api.reporting.DevConfig import org.briarproject.bramble.network.JavaNetworkModule import org.briarproject.bramble.plugin.tor.CircumventionModule +import org.briarproject.bramble.socks.SocksModule import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.briar.headless.blogs.HeadlessBlogModule import org.briarproject.briar.headless.contact.HeadlessContactModule @@ -26,6 +25,7 @@ import javax.inject.Singleton JavaNetworkModule::class, JavaSystemModule::class, CircumventionModule::class, + SocksModule::class, HeadlessBlogModule::class, HeadlessContactModule::class, HeadlessEventModule::class, @@ -57,14 +57,6 @@ internal class HeadlessTestModule(private val appDir: File) { } } - @Provides - @Singleton - internal fun provideDevConfig(): DevConfig = object : DevConfig { - override fun getDevPublicKey(): PublicKey = throw NotImplementedError() - override fun getDevOnionAddress(): String = throw NotImplementedError() - override fun getReportDir(): File = throw NotImplementedError() - } - @Provides @Singleton internal fun provideObjectMapper() = ObjectMapper()