Merge branch '832-fix-bridge-test' into 'master'

Fix Tor bridge integration test

See merge request briar/briar!875

bramble-android/src/androidTest/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -3,14 +3,15 @@ package org.briarproject.bramble.plugin.tor;
 import android.content.Context;
 import android.support.test.runner.AndroidJUnit4;
 
-import org.briarproject.bramble.DaggerIntegrationTestComponent;
-import org.briarproject.bramble.IntegrationTestComponent;
 import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 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.test.BrambleAndroidIntegrationTestComponent;
 import org.briarproject.bramble.test.BrambleTestCase;
+import org.briarproject.bramble.test.DaggerBrambleAndroidIntegrationTestComponent;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,6 +42,8 @@ public class BridgeTest extends BrambleTestCase {
 	private final static Logger LOG =
 			Logger.getLogger(BridgeTest.class.getSimpleName());
 
+	@Inject
+	NetworkManager networkManager;
 	@Inject
 	EventBus eventBus;
 	@Inject
@@ -77,8 +80,8 @@ public class BridgeTest extends BrambleTestCase {
 
 	@Before
 	public void setUp() {
-		IntegrationTestComponent component =
-				DaggerIntegrationTestComponent.builder().build();
+		BrambleAndroidIntegrationTestComponent component =
+				DaggerBrambleAndroidIntegrationTestComponent.builder().build();
 		component.inject(this);
 
 		Executor ioExecutor = Executors.newCachedThreadPool();
@@ -87,7 +90,7 @@ public class BridgeTest extends BrambleTestCase {
 		SocketFactory torSocketFactory = SocketFactory.getDefault();
 
 		factory = new TorPluginFactory(ioExecutor, scheduler, appContext,
-				locationUtils, eventBus, torSocketFactory,
+				networkManager, locationUtils, eventBus, torSocketFactory,
 				backoffFactory, circumventionProvider, clock);
 	}
 

bramble-android/src/androidTest/java/org/briarproject/bramble/test/ApplicationModule.java

+package org.briarproject.bramble.test;
+
+import android.app.Application;
+import android.support.test.InstrumentationRegistry;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+class ApplicationModule {
+
+	@Provides
+	@Singleton
+	Application provideApplication() {
+		return (Application) InstrumentationRegistry.getTargetContext()
+						.getApplicationContext();
+	}
+}

bramble-android/src/androidTest/java/org/briarproject/bramble/IntegrationTestComponent.java → bramble-android/src/androidTest/java/org/briarproject/bramble/test/BrambleAndroidIntegrationTestComponent.java

-package org.briarproject.bramble;
+package org.briarproject.bramble.test;
 
+import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.event.EventModule;
 import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.plugin.tor.BridgeTest;
@@ -12,11 +13,13 @@ import dagger.Component;
 @Singleton
 @Component(modules = {
 		BrambleAndroidModule.class,
+		TestLifecycleModule.class,
+		ApplicationModule.class,
 		PluginModule.class,  // needed for BackoffFactory
 		EventModule.class,
 		SystemModule.class,
 })
-public interface IntegrationTestComponent {
+public interface BrambleAndroidIntegrationTestComponent {
 
 	void inject(BridgeTest init);