Use BrambleCoreModule in integration tests.

2026-02-13 19:29:06 +01:00 · 2019-05-31 13:38:59 +01:00
parent 7bf86d9c53
commit 100e17b242
22 changed files with 149 additions and 479 deletions
--- 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);
 }
--- 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());
 	}
 }
--- 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);
--- 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,
@@ -63,7 +59,6 @@ public class BrambleCoreModule {
 		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());
--- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java
@@ -1,5 +1,6 @@
 package org.briarproject.bramble.sync;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.TransportCrypto;
@@ -72,6 +73,7 @@ public class SyncIntegrationTest extends BrambleTestCase {

 		SyncIntegrationTestComponent component =
 				DaggerSyncIntegrationTestComponent.builder().build();
+		BrambleCoreModule.initEagerSingletons(component);
 		component.inject(this);

 		contactId = getContactId();
--- 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);
 }
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java
+++ 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 {
+}
--- 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 {

--- 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
@@ -1,5 +1,6 @@
 package org.briarproject.bramble.plugin.tor;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
@@ -9,21 +10,10 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
-import org.briarproject.bramble.contact.ContactModule;
-import org.briarproject.bramble.crypto.CryptoExecutorModule;
-import org.briarproject.bramble.db.DatabaseExecutorModule;
-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.sync.validation.ValidationModule;
-import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.test.BrambleJavaIntegrationTestComponent;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.DaggerBrambleJavaIntegrationTestComponent;
-import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.util.OsUtils;
-import org.briarproject.bramble.versioning.VersioningModule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +46,7 @@ public class BridgeTest extends BrambleTestCase {
 	public static Iterable<String> data() {
 		BrambleJavaIntegrationTestComponent component =
 				DaggerBrambleJavaIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		BrambleCoreModule.initEagerSingletons(component);
 		return component.getCircumventionProvider().getBridges(false);
 	}

@@ -101,7 +91,7 @@ public class BridgeTest extends BrambleTestCase {

 		BrambleJavaIntegrationTestComponent component =
 				DaggerBrambleJavaIntegrationTestComponent.builder().build();
-		injectEagerSingletons(component);
+		BrambleCoreModule.initEagerSingletons(component);
 		component.inject(this);

 		LocationUtils locationUtils = () -> "US";
@@ -161,19 +151,4 @@ public class BridgeTest extends BrambleTestCase {
 			plugin.stop();
 		}
 	}
-
-	private static void injectEagerSingletons(
-			BrambleJavaIntegrationTestComponent component) {
-		component.inject(new ContactModule.EagerSingletons());
-		component.inject(new CryptoExecutorModule.EagerSingletons());
-		component.inject(new DatabaseExecutorModule.EagerSingletons());
-		component.inject(new IdentityModule.EagerSingletons());
-		component.inject(new LifecycleModule.EagerSingletons());
-		component.inject(new PluginModule.EagerSingletons());
-		component.inject(new PropertiesModule.EagerSingletons());
-		component.inject(new SystemModule.EagerSingletons());
-		component.inject(new TransportModule.EagerSingletons());
-		component.inject(new ValidationModule.EagerSingletons());
-		component.inject(new VersioningModule.EagerSingletons());
-	}
 }
--- 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,29 +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.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.DatabaseExecutorModule;
-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.plugin.PluginModule;
 import org.briarproject.bramble.plugin.tor.BridgeTest;
 import org.briarproject.bramble.plugin.tor.CircumventionProvider;
-import org.briarproject.bramble.properties.PropertiesModule;
-import org.briarproject.bramble.record.RecordModule;
-import org.briarproject.bramble.settings.SettingsModule;
-import org.briarproject.bramble.sync.SyncModule;
-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 javax.inject.Singleton;

@@ -31,57 +12,14 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
-		BrambleJavaModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoExecutorModule.class,
-		CryptoModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.class,
-		DatabaseModule.class,
-		DefaultBatteryManagerModule.class,
-		DefaultEventExecutorModule.class,
-		EventModule.class,
-		IdentityModule.class,
-		LifecycleModule.class,
-		RecordModule.class,
-		PluginModule.class,
-		PropertiesModule.class,
-		TransportModule.class,
-		SettingsModule.class,
-		SyncModule.class,
-		SystemModule.class,
-		ValidationModule.class,
-		VersioningModule.class
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
+		BrambleJavaModule.class
 })
-public interface BrambleJavaIntegrationTestComponent {
+public interface BrambleJavaIntegrationTestComponent
+		extends BrambleCoreEagerSingletons {

 	void inject(BridgeTest init);

-	void inject(ContactModule.EagerSingletons init);
-
-	void inject(CryptoExecutorModule.EagerSingletons init);
-
-	void inject(DatabaseExecutorModule.EagerSingletons init);
-
-	void inject(IdentityModule.EagerSingletons init);
-
-	void inject(LifecycleModule.EagerSingletons init);
-
-	void inject(PluginModule.EagerSingletons init);
-
-	void inject(PropertiesModule.EagerSingletons init);
-
-	void inject(SystemModule.EagerSingletons init);
-
-	void inject(TransportModule.EagerSingletons init);
-
-	void inject(ValidationModule.EagerSingletons init);
-
-	void inject(VersioningModule.EagerSingletons init);
-
 	CircumventionProvider getCircumventionProvider();
 }
--- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTest.java
@@ -1,19 +1,11 @@
 package org.briarproject.briar.feed;

+import org.briarproject.bramble.BrambleCoreModule;
 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.db.DatabaseExecutorModule;
-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.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;
@@ -122,17 +114,9 @@ public class FeedManagerIntegrationTest extends BriarTestCase {

 	protected void injectEagerSingletons(
 			FeedManagerIntegrationTestComponent component) {
+		BrambleCoreModule.initEagerSingletons(component);
 		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ContactModule.EagerSingletons());
-		component.inject(new CryptoExecutorModule.EagerSingletons());
-		component.inject(new DatabaseExecutorModule.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());
 	}

 }
--- 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,27 +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.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-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;
@@ -34,57 +18,23 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestDnsModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
-		TestSocksModule.class,
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoModule.class,
-		CryptoExecutorModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.class,
-		DatabaseModule.class,
-		DefaultEventExecutorModule.class,
-		EventModule.class,
 		FeedModule.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(DatabaseExecutorModule.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);
-
 	IdentityManager getIdentityManager();

 	LifecycleManager getLifecycleManager();
--- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionCryptoIntegrationTest.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.introduction;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
@@ -11,6 +12,12 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.blog.BlogModule;
+import org.briarproject.briar.forum.ForumModule;
+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.Test;

 import java.util.Map;
@@ -54,6 +61,7 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase {
 	public IntroductionCryptoIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
+		injectEagerSingletons(component);
 		component.inject(this);
 		crypto = new IntroductionCryptoImpl(cryptoComponent, clientHelper);

@@ -149,4 +157,15 @@ public class IntroductionCryptoIntegrationTest extends BrambleTestCase {
 		crypto.verifyActivateMac(bobMac, bobMacKey);
 	}

+	private static void injectEagerSingletons(
+			IntroductionIntegrationTestComponent component) {
+		BrambleCoreModule.initEagerSingletons(component);
+		component.inject(new BlogModule.EagerSingletons());
+		component.inject(new ForumModule.EagerSingletons());
+		component.inject(new GroupInvitationModule.EagerSingletons());
+		component.inject(new IntroductionModule.EagerSingletons());
+		component.inject(new MessagingModule.EagerSingletons());
+		component.inject(new PrivateGroupModule.EagerSingletons());
+		component.inject(new SharingModule.EagerSingletons());
+	}
 }
--- 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,26 +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.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-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;
@@ -36,35 +17,16 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoModule.class,
-		CryptoExecutorModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.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 {
--- a/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.introduction;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.PublicKey;
@@ -17,6 +18,12 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.blog.BlogModule;
+import org.briarproject.briar.forum.ForumModule;
+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.Test;

 import java.util.Map;
@@ -74,6 +81,7 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase {
 	public MessageEncoderParserIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
+		injectEagerSingletons(component);
 		component.inject(this);

 		messageEncoder = new MessageEncoderImpl(clientHelper, messageFactory);
@@ -246,4 +254,15 @@ public class MessageEncoderParserIntegrationTest extends BrambleTestCase {
 		assertEquals(sessionId, am.getSessionId());
 	}

+	private static void injectEagerSingletons(
+			IntroductionIntegrationTestComponent component) {
+		BrambleCoreModule.initEagerSingletons(component);
+		component.inject(new BlogModule.EagerSingletons());
+		component.inject(new ForumModule.EagerSingletons());
+		component.inject(new GroupInvitationModule.EagerSingletons());
+		component.inject(new IntroductionModule.EagerSingletons());
+		component.inject(new MessagingModule.EagerSingletons());
+		component.inject(new PrivateGroupModule.EagerSingletons());
+		component.inject(new SharingModule.EagerSingletons());
+	}
 }
--- a/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/introduction/SessionEncoderParserIntegrationTest.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.introduction;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.PrivateKey;
@@ -15,7 +16,13 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.blog.BlogModule;
+import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.introduction.IntroducerSession.Introducee;
+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.Test;

 import java.util.HashMap;
@@ -83,6 +90,7 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase {
 	public SessionEncoderParserIntegrationTest() {
 		IntroductionIntegrationTestComponent component =
 				DaggerIntroductionIntegrationTestComponent.builder().build();
+		injectEagerSingletons(component);
 		component.inject(this);

 		sessionEncoder = new SessionEncoderImpl(clientHelper);
@@ -339,4 +347,15 @@ public class SessionEncoderParserIntegrationTest extends BrambleTestCase {
 		assertEquals(i1.lastRemoteMessageId, i2.lastRemoteMessageId);
 	}

+	private static void injectEagerSingletons(
+			IntroductionIntegrationTestComponent component) {
+		BrambleCoreModule.initEagerSingletons(component);
+		component.inject(new BlogModule.EagerSingletons());
+		component.inject(new ForumModule.EagerSingletons());
+		component.inject(new GroupInvitationModule.EagerSingletons());
+		component.inject(new IntroductionModule.EagerSingletons());
+		component.inject(new MessagingModule.EagerSingletons());
+		component.inject(new PrivateGroupModule.EagerSingletons());
+		component.inject(new SharingModule.EagerSingletons());
+	}
 }
--- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java
@@ -1,20 +1,12 @@
 package org.briarproject.briar.messaging;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 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.db.DatabaseExecutorModule;
-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.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;
@@ -90,16 +82,8 @@ public class MessageSizeIntegrationTest extends BriarTestCase {

 	private static void injectEagerSingletons(
 			MessageSizeIntegrationTestComponent component) {
-		component.inject(new ContactModule.EagerSingletons());
-		component.inject(new CryptoExecutorModule.EagerSingletons());
-		component.inject(new DatabaseExecutorModule.EagerSingletons());
+		BrambleCoreModule.initEagerSingletons(component);
 		component.inject(new ForumModule.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());
 	}
 }
--- 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,24 +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.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-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;

@@ -28,52 +12,18 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
 		BriarClientModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoModule.class,
-		CryptoExecutorModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.class,
-		DatabaseModule.class,
-		DefaultEventExecutorModule.class,
-		EventModule.class,
 		ForumModule.class,
-		IdentityModule.class,
-		LifecycleModule.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(DatabaseExecutorModule.EagerSingletons init);
-
 	void inject(ForumModule.EagerSingletons init);

-	void inject(IdentityModule.EagerSingletons init);
-
-	void inject(LifecycleModule.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);
 }
--- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.messaging;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
@@ -19,16 +20,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.crypto.CryptoExecutorModule;
-import org.briarproject.bramble.db.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-import org.briarproject.bramble.transport.TransportModule;
-import org.briarproject.bramble.versioning.VersioningModule;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
@@ -210,16 +202,8 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {

 	private static void injectEagerSingletons(
 			SimplexMessagingIntegrationTestComponent component) {
-		component.inject(new ContactModule.EagerSingletons());
-		component.inject(new CryptoExecutorModule.EagerSingletons());
-		component.inject(new DatabaseExecutorModule.EagerSingletons());
-		component.inject(new IdentityModule.EagerSingletons());
-		component.inject(new LifecycleModule.EagerSingletons());
+		BrambleCoreModule.initEagerSingletons(component);
 		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
--- 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,26 +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.CryptoExecutorModule;
-import org.briarproject.bramble.crypto.CryptoModule;
-import org.briarproject.bramble.data.DataModule;
-import org.briarproject.bramble.db.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-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;
@@ -38,51 +21,16 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
 		BriarClientModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoExecutorModule.class,
-		CryptoModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.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(CryptoExecutorModule.EagerSingletons init);
-
-	void inject(ContactModule.EagerSingletons init);
-
-	void inject(DatabaseExecutorModule.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);
-
 	LifecycleManager getLifecycleManager();

 	IdentityManager getIdentityManager();
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
@@ -2,6 +2,7 @@ package org.briarproject.briar.test;

 import net.jodah.concurrentunit.Waiter;

+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.client.ContactGroupFactory;
@@ -28,17 +29,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.db.DatabaseExecutorModule;
-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;
@@ -186,23 +177,14 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone

 	protected void injectEagerSingletons(
 			BriarIntegrationTestComponent component) {
+		BrambleCoreModule.initEagerSingletons(component);
 		component.inject(new BlogModule.EagerSingletons());
-		component.inject(new ContactModule.EagerSingletons());
-		component.inject(new CryptoExecutorModule.EagerSingletons());
-		component.inject(new DatabaseExecutorModule.EagerSingletons());
 		component.inject(new ForumModule.EagerSingletons());
 		component.inject(new GroupInvitationModule.EagerSingletons());
-		component.inject(new IdentityModule.EagerSingletons());
 		component.inject(new IntroductionModule.EagerSingletons());
-		component.inject(new LifecycleModule.EagerSingletons());
 		component.inject(new MessagingModule.EagerSingletons());
 		component.inject(new PrivateGroupModule.EagerSingletons());
-		component.inject(new PropertiesModule.EagerSingletons());
 		component.inject(new SharingModule.EagerSingletons());
-		component.inject(new SystemModule.EagerSingletons());
-		component.inject(new TransportModule.EagerSingletons());
-		component.inject(new ValidationModule.EagerSingletons());
-		component.inject(new VersioningModule.EagerSingletons());
 	}

 	private void startLifecycles() throws InterruptedException {
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
@@ -1,5 +1,7 @@
 package org.briarproject.briar.test;

+import org.briarproject.bramble.BrambleCoreEagerSingletons;
+import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DatabaseComponent;
@@ -9,27 +11,7 @@ import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.sync.SyncSessionFactory;
-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.DatabaseExecutorModule;
-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.TestDatabaseConfigModule;
-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.blog.BlogFactory;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogSharingManager;
@@ -54,74 +36,36 @@ import dagger.Component;

@Singleton
@Component(modules = {
-		TestDatabaseConfigModule.class,
-		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
+		BrambleCoreIntegrationTestModule.class,
+		BrambleCoreModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
-		ClientModule.class,
-		ContactModule.class,
-		CryptoModule.class,
-		CryptoExecutorModule.class,
-		DataModule.class,
-		DatabaseExecutorModule.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
 })
-public interface BriarIntegrationTestComponent {
+public interface BriarIntegrationTestComponent
+		extends BrambleCoreEagerSingletons {

 	void inject(BriarIntegrationTest<BriarIntegrationTestComponent> init);

 	void inject(BlogModule.EagerSingletons init);

-	void inject(ContactModule.EagerSingletons init);
-
-	void inject(CryptoExecutorModule.EagerSingletons init);
-
-	void inject(DatabaseExecutorModule.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);
-
 	LifecycleManager getLifecycleManager();

 	EventBus getEventBus();