From cc6041e90c16fc83dd3a1ab3f49210a46e007f77 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 3 Aug 2018 11:42:01 -0300
Subject: [PATCH] Rename Component and Screenshot Tests
---
briar-android/fastlane/Screengrabfile | 4 ++--
.../briar/android/BriarTestComponentApplication.java | 2 +-
.../{TestComponent.java => BriarUiTestComponent.java} | 10 +++++-----
.../briar/android/login/PasswordActivityTest.java | 4 ++--
...ivityTest.java => SetupActivityScreenshotTest.java} | 6 +++---
.../briar/android/navdrawer/NavDrawerActivityTest.java | 4 ++--
...tyTest.java => SettingsActivityScreenshotTest.java} | 6 +++---
.../briar/android/test/ScreenshotTest.java | 6 +++---
8 files changed, 21 insertions(+), 21 deletions(-)
rename briar-android/src/androidTest/java/org/briarproject/briar/android/{TestComponent.java => BriarUiTestComponent.java} (68%)
rename briar-android/src/androidTest/java/org/briarproject/briar/android/login/{SetupActivityTest.java => SetupActivityScreenshotTest.java} (95%)
rename briar-android/src/androidTest/java/org/briarproject/briar/android/settings/{SettingsActivityTest.java => SettingsActivityScreenshotTest.java} (91%)
diff --git a/briar-android/fastlane/Screengrabfile b/briar-android/fastlane/Screengrabfile
index 3afd283cd1..bacf6905bc 100644
--- a/briar-android/fastlane/Screengrabfile
+++ b/briar-android/fastlane/Screengrabfile
@@ -1,8 +1,8 @@
app_package_name "org.briarproject.briar.android.screenshot.debug"
locales ['en-US']
use_tests_in_classes([
- 'org.briarproject.briar.android.login.SetupActivityTest',
- 'org.briarproject.briar.android.settings.SettingsActivityTest',
+ 'org.briarproject.briar.android.login.SetupActivityScreenshotTest',
+ 'org.briarproject.briar.android.settings.SettingsActivityScreenshotTest',
])
app_apk_path "build/outputs/apk/screenshot/debug/briar-android-screenshot-debug.apk"
tests_apk_path "build/outputs/apk/androidTest/screenshot/debug/briar-android-screenshot-debug-androidTest.apk"
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
index 6634d5bfcf..156620b1de 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
@@ -7,7 +7,7 @@ public class BriarTestComponentApplication extends BriarApplicationImpl {
@Override
protected AndroidComponent createApplicationComponent() {
- AndroidComponent component = DaggerTestComponent.builder()
+ AndroidComponent component = DaggerBriarUiTestComponent.builder()
.appModule(new AppModule(this)).build();
// We need to load the eager singletons directly after making the
// dependency graphs
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
similarity index 68%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
index 240eb6f14d..af1cba5f01 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
@@ -5,9 +5,9 @@ import org.briarproject.bramble.BrambleCoreModule;
import org.briarproject.bramble.account.BriarAccountModule;
import org.briarproject.briar.BriarCoreModule;
import org.briarproject.briar.android.login.PasswordActivityTest;
-import org.briarproject.briar.android.login.SetupActivityTest;
+import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
-import org.briarproject.briar.android.settings.SettingsActivityTest;
+import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
import javax.inject.Singleton;
@@ -21,11 +21,11 @@ import dagger.Component;
BriarAccountModule.class,
BrambleCoreModule.class
})
-public interface TestComponent extends AndroidComponent {
+public interface BriarUiTestComponent extends AndroidComponent {
- void inject(SetupActivityTest test);
+ void inject(SetupActivityScreenshotTest test);
void inject(PasswordActivityTest test);
void inject(NavDrawerActivityTest test);
- void inject(SettingsActivityTest test);
+ void inject(SettingsActivityScreenshotTest test);
}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
index 0f7ce89b97..5d9f025d43 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.android.login;
import android.support.test.runner.AndroidJUnit4;
import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Ignore;
import org.junit.Rule;
@@ -28,7 +28,7 @@ public class PasswordActivityTest extends ScreenshotTest {
new CleanAccountTestRule<>(PasswordActivity.class);
@Override
- protected void inject(TestComponent component) {
+ protected void inject(BriarUiTestComponent component) {
component.inject(this);
}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
similarity index 95%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
index 922cad6553..475ae87a19 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
@@ -7,7 +7,7 @@ import android.support.test.uiautomator.UiObject;
import android.support.test.uiautomator.UiSelector;
import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule;
import org.junit.Test;
@@ -33,7 +33,7 @@ import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
@RunWith(AndroidJUnit4.class)
-public class SetupActivityTest extends ScreenshotTest {
+public class SetupActivityScreenshotTest extends ScreenshotTest {
@Rule
public IntentsTestRule<SetupActivity> testRule =
@@ -46,7 +46,7 @@ public class SetupActivityTest extends ScreenshotTest {
};
@Override
- protected void inject(TestComponent component) {
+ protected void inject(BriarUiTestComponent component) {
component.inject(this);
}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
index 395ed8c48f..e92ae66930 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
@@ -5,7 +5,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
import org.briarproject.briar.android.settings.SettingsActivity;
import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule;
@@ -30,7 +30,7 @@ public class NavDrawerActivityTest extends ScreenshotTest {
new CleanAccountTestRule<>(NavDrawerActivity.class);
@Override
- protected void inject(TestComponent component) {
+ protected void inject(BriarUiTestComponent component) {
component.inject(this);
}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
similarity index 91%
rename from briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java
rename to briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
index b5c32f46f2..192680bd70 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
@@ -6,7 +6,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
import org.briarproject.briar.R;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule;
@@ -22,14 +22,14 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
@RunWith(AndroidJUnit4.class)
-public class SettingsActivityTest extends ScreenshotTest {
+public class SettingsActivityScreenshotTest extends ScreenshotTest {
@Rule
public CleanAccountTestRule<SettingsActivity> testRule =
new CleanAccountTestRule<>(SettingsActivity.class);
@Override
- protected void inject(TestComponent component) {
+ protected void inject(BriarUiTestComponent component) {
component.inject(this);
}
diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
index 77ed5faac4..355dd77631 100644
--- a/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
+++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
@@ -7,7 +7,7 @@ import android.util.Log;
import org.briarproject.bramble.api.account.AccountManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.briar.android.BriarTestComponentApplication;
-import org.briarproject.briar.android.TestComponent;
+import org.briarproject.briar.android.BriarUiTestComponent;
import org.junit.ClassRule;
import javax.inject.Inject;
@@ -38,10 +38,10 @@ public abstract class ScreenshotTest {
BriarTestComponentApplication app =
(BriarTestComponentApplication) getTargetContext()
.getApplicationContext();
- inject((TestComponent) app.getApplicationComponent());
+ inject((BriarUiTestComponent) app.getApplicationComponent());
}
- protected abstract void inject(TestComponent component);
+ protected abstract void inject(BriarUiTestComponent component);
protected void screenshot(String name) {
try {
--
GitLab