Split up UI and Screenshot tests

Closes #1377

briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestRunner.java

@@ -1,11 +1,9 @@
-package org.briarproject.briar.android.test;
+package org.briarproject.briar.android;
 
 import android.app.Application;
 import android.content.Context;
 import android.support.test.runner.AndroidJUnitRunner;
 
-import org.briarproject.briar.android.BriarTestComponentApplication;
-
 public class BriarTestRunner extends AndroidJUnitRunner {
 
 	@Override
@@ -13,8 +11,8 @@ public class BriarTestRunner extends AndroidJUnitRunner {
 			Context context)
 			throws InstantiationException, IllegalAccessException,
 			ClassNotFoundException {
-		return super.newApplication(cl, BriarTestComponentApplication.class.getName(),
-				context);
+		return super.newApplication(cl,
+				BriarTestComponentApplication.class.getName(), context);
 	}
 
 }

briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java

@@ -1,35 +1,20 @@
-package org.briarproject.briar.android.test;
+package org.briarproject.briar.android;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.util.Log;
 
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.ConnectionRegistry;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.BriarService;
-import org.briarproject.briar.android.BriarTestComponentApplication;
-import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.api.test.TestDataCreator;
-import org.junit.ClassRule;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import tools.fastlane.screengrab.Screengrab;
-import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
-import tools.fastlane.screengrab.locale.LocaleTestRule;
-
 import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static tools.fastlane.screengrab.Screengrab.setDefaultScreenshotStrategy;
 
-public abstract class ScreenshotTest {
-
-	@ClassRule
-	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
+@SuppressWarnings("WeakerAccess")
+public abstract class UiTest {
 
 	protected static final String USERNAME = "Alice";
 	protected static final String PASSWORD = "123456";
@@ -38,16 +23,8 @@ public abstract class ScreenshotTest {
 	protected AccountManager accountManager;
 	@Inject
 	protected LifecycleManager lifecycleManager;
-	@Inject
-	protected TestDataCreator testDataCreator;
-	@Inject
-	protected ConnectionRegistry connectionRegistry;
-	@Inject
-	protected Clock clock;
 
-	public ScreenshotTest() {
-		super();
-		setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
+	public UiTest() {
 		BriarTestComponentApplication app =
 				(BriarTestComponentApplication) getTargetContext()
 						.getApplicationContext();
@@ -56,22 +33,6 @@ public abstract class ScreenshotTest {
 
 	protected abstract void inject(BriarUiTestComponent component);
 
-	protected void screenshot(String name) {
-		try {
-			Screengrab.screenshot(name);
-		} catch (RuntimeException e) {
-			if (!e.getMessage().equals("Unable to capture screenshot."))
-				throw e;
-			// The tests should still pass when run from AndroidStudio
-			// without manually granting permissions like fastlane does.
-			Log.w("Screengrab", "Permission to write screenshot is missing.");
-		}
-	}
-
-	protected long getMinutesAgo(int minutes) {
-		return clock.currentTimeMillis() - minutes * 60 * 1000;
-	}
-
 	@NotNullByDefault
 	protected class CleanAccountTestRule<A extends Activity>
 			extends IntentsTestRule<A> {

briar-android/src/androidTest/java/org/briarproject/briar/android/ViewActions.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.test;
+package org.briarproject.briar.android;
 
 import android.app.Activity;
 import android.support.test.espresso.PerformException;

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -0,0 +1,25 @@
+package org.briarproject.briar.android;
+
+import org.briarproject.bramble.BrambleAndroidModule;
+import org.briarproject.bramble.BrambleCoreModule;
+import org.briarproject.bramble.account.BriarAccountModule;
+import org.briarproject.briar.BriarCoreModule;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {
+		AppModule.class,
+		BriarCoreModule.class,
+		BrambleAndroidModule.class,
+		BriarAccountModule.class,
+		BrambleCoreModule.class
+})
+public interface BriarUiTestComponent extends AndroidComponent {
+
+	void inject(NavDrawerActivityTest test);
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java

@@ -6,8 +6,8 @@ import android.view.Gravity;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
+import org.briarproject.briar.android.UiTest;
 import org.briarproject.briar.android.settings.SettingsActivity;
-import org.briarproject.briar.android.test.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,7 +23,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 @RunWith(AndroidJUnit4.class)
-public class NavDrawerActivityTest extends ScreenshotTest {
+public class NavDrawerActivityTest extends UiTest {
 
 	@Rule
 	public CleanAccountTestRule<NavDrawerActivity> testRule =

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -6,7 +6,6 @@ import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.contact.ConversationActivityScreenshotTest;
 import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
-import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
 import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
 
 import javax.inject.Singleton;
@@ -25,7 +24,6 @@ public interface BriarUiTestComponent extends AndroidComponent {
 
 	void inject(ConversationActivityScreenshotTest test);
 	void inject(SetupActivityScreenshotTest test);
-	void inject(NavDrawerActivityTest test);
 	void inject(SettingsActivityScreenshotTest test);
 
 }

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java

@@ -0,0 +1,51 @@
+package org.briarproject.briar.android;
+
+import android.util.Log;
+
+import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.api.test.TestDataCreator;
+import org.junit.ClassRule;
+
+import javax.inject.Inject;
+
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
+import tools.fastlane.screengrab.locale.LocaleTestRule;
+
+import static tools.fastlane.screengrab.Screengrab.setDefaultScreenshotStrategy;
+
+public abstract class ScreenshotTest extends UiTest {
+
+	@ClassRule
+	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
+
+	@Inject
+	protected TestDataCreator testDataCreator;
+	@Inject
+	protected ConnectionRegistry connectionRegistry;
+	@Inject
+	protected Clock clock;
+
+	public ScreenshotTest() {
+		super();
+		setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
+	}
+
+	protected void screenshot(String name) {
+		try {
+			Screengrab.screenshot(name);
+		} catch (RuntimeException e) {
+			if (!e.getMessage().equals("Unable to capture screenshot."))
+				throw e;
+			// The tests should still pass when run from AndroidStudio
+			// without manually granting permissions like fastlane does.
+			Log.w("Screengrab", "Permission to write screenshot is missing.");
+		}
+	}
+
+	protected long getMinutesAgo(int minutes) {
+		return clock.currentTimeMillis() - minutes * 60 * 1000;
+	}
+
+}

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/contact/ConversationActivityScreenshotTest.java

@@ -9,7 +9,7 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.android.test.ScreenshotTest;
+import org.briarproject.briar.android.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,7 +22,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
-import static org.briarproject.briar.android.test.ViewActions.waitUntilMatches;
+import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
 import static org.hamcrest.Matchers.allOf;
 
 @RunWith(AndroidJUnit4.class)

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java

@@ -8,7 +8,7 @@ import android.support.test.uiautomator.UiSelector;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
-import org.briarproject.briar.android.test.ScreenshotTest;
+import org.briarproject.briar.android.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,8 +27,8 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static android.support.test.runner.lifecycle.Stage.PAUSED;
 import static junit.framework.Assert.assertTrue;
-import static org.briarproject.briar.android.test.ViewActions.waitForActivity;
-import static org.briarproject.briar.android.test.ViewActions.waitUntilMatches;
+import static org.briarproject.briar.android.ViewActions.waitForActivity;
+import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
 import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 
 

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java

@@ -9,7 +9,7 @@ import android.view.Gravity;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarUiTestComponent;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
-import org.briarproject.briar.android.test.ScreenshotTest;
+import org.briarproject.briar.android.ScreenshotTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import static android.support.test.espresso.matcher.ViewMatchers.withChild;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.briarproject.briar.android.test.ViewActions.waitUntilMatches;
+import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
 import static org.hamcrest.CoreMatchers.is;
 
 @RunWith(AndroidJUnit4.class)