Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Rename Component and Screenshot Tests

Browse Source
This commit is contained in:
Torsten Grote
2018-08-03 11:42:01 -03:00
parent 3ff6462899
commit cc6041e90c
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/fastlane/Screengrabfile
View File

@@ -1,8 +1,8 @@
app_package_name "org.briarproject.briar.android.screenshot.debug" app_package_name "org.briarproject.briar.android.screenshot.debug"
locales ['en-US'] locales ['en-US']
use_tests_in_classes([ use_tests_in_classes([
'org.briarproject.briar.android.login.SetupActivityTest', 'org.briarproject.briar.android.login.SetupActivityScreenshotTest',
'org.briarproject.briar.android.settings.SettingsActivityTest', 'org.briarproject.briar.android.settings.SettingsActivityScreenshotTest',
]) ])
app_apk_path "build/outputs/apk/screenshot/debug/briar-android-screenshot-debug.apk" 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" tests_apk_path "build/outputs/apk/androidTest/screenshot/debug/briar-android-screenshot-debug-androidTest.apk"

2
briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java
View File

@@ -7,7 +7,7 @@ public class BriarTestComponentApplication extends BriarApplicationImpl {
@Override @Override
protected AndroidComponent createApplicationComponent() { protected AndroidComponent createApplicationComponent() {
AndroidComponent component = DaggerTestComponent.builder() AndroidComponent component = DaggerBriarUiTestComponent.builder()
.appModule(new AppModule(this)).build(); .appModule(new AppModule(this)).build();
// We need to load the eager singletons directly after making the // We need to load the eager singletons directly after making the
// dependency graphs // dependency graphs

10
briar-android/src/androidTest/java/org/briarproject/briar/android/TestComponent.java → briar-android/src/androidTest/java/org/briarproject/briar/android/BriarUiTestComponent.java
View File

@@ -5,9 +5,9 @@ import org.briarproject.bramble.BrambleCoreModule;
import org.briarproject.bramble.account.BriarAccountModule; import org.briarproject.bramble.account.BriarAccountModule;
import org.briarproject.briar.BriarCoreModule; import org.briarproject.briar.BriarCoreModule;
import org.briarproject.briar.android.login.PasswordActivityTest; 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.navdrawer.NavDrawerActivityTest;
import org.briarproject.briar.android.settings.SettingsActivityTest; import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -21,11 +21,11 @@ import dagger.Component;
BriarAccountModule.class, BriarAccountModule.class,
BrambleCoreModule.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(PasswordActivityTest test);
void inject(NavDrawerActivityTest test); void inject(NavDrawerActivityTest test);
void inject(SettingsActivityTest test); void inject(SettingsActivityScreenshotTest test);
} }

4
briar-android/src/androidTest/java/org/briarproject/briar/android/login/PasswordActivityTest.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.briar.android.login;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import org.briarproject.briar.R; 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.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
@@ -28,7 +28,7 @@ public class PasswordActivityTest extends ScreenshotTest {
new CleanAccountTestRule<>(PasswordActivity.class); new CleanAccountTestRule<>(PasswordActivity.class);
@Override @Override
protected void inject(TestComponent component) { protected void inject(BriarUiTestComponent component) {
component.inject(this); component.inject(this);
} }

6
briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityTest.java → briar-android/src/androidTest/java/org/briarproject/briar/android/login/SetupActivityScreenshotTest.java
View File

@@ -7,7 +7,7 @@ import android.support.test.uiautomator.UiObject;
import android.support.test.uiautomator.UiSelector; import android.support.test.uiautomator.UiSelector;
import org.briarproject.briar.R; 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.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -33,7 +33,7 @@ import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SetupActivityTest extends ScreenshotTest { public class SetupActivityScreenshotTest extends ScreenshotTest {
@Rule @Rule
public IntentsTestRule<SetupActivity> testRule = public IntentsTestRule<SetupActivity> testRule =
@@ -46,7 +46,7 @@ public class SetupActivityTest extends ScreenshotTest {
}; };
@Override @Override
protected void inject(TestComponent component) { protected void inject(BriarUiTestComponent component) {
component.inject(this); component.inject(this);
} }

4
briar-android/src/androidTest/java/org/briarproject/briar/android/navdrawer/NavDrawerActivityTest.java
View File

@@ -5,7 +5,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity; import android.view.Gravity;
import org.briarproject.briar.R; 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.settings.SettingsActivity;
import org.briarproject.briar.android.test.ScreenshotTest; import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule; import org.junit.Rule;
@@ -30,7 +30,7 @@ public class NavDrawerActivityTest extends ScreenshotTest {
new CleanAccountTestRule<>(NavDrawerActivity.class); new CleanAccountTestRule<>(NavDrawerActivity.class);
@Override @Override
protected void inject(TestComponent component) { protected void inject(BriarUiTestComponent component) {
component.inject(this); component.inject(this);
} }

6
briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityTest.java → briar-android/src/androidTest/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java
View File

@@ -6,7 +6,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity; import android.view.Gravity;
import org.briarproject.briar.R; 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.navdrawer.NavDrawerActivity;
import org.briarproject.briar.android.test.ScreenshotTest; import org.briarproject.briar.android.test.ScreenshotTest;
import org.junit.Rule; 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; import static android.support.test.espresso.matcher.ViewMatchers.withText;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SettingsActivityTest extends ScreenshotTest { public class SettingsActivityScreenshotTest extends ScreenshotTest {
@Rule @Rule
public CleanAccountTestRule<SettingsActivity> testRule = public CleanAccountTestRule<SettingsActivity> testRule =
new CleanAccountTestRule<>(SettingsActivity.class); new CleanAccountTestRule<>(SettingsActivity.class);
@Override @Override
protected void inject(TestComponent component) { protected void inject(BriarUiTestComponent component) {
component.inject(this); component.inject(this);
} }

6
briar-android/src/androidTest/java/org/briarproject/briar/android/test/ScreenshotTest.java
View File

@@ -7,7 +7,7 @@ import android.util.Log;
import org.briarproject.bramble.api.account.AccountManager; import org.briarproject.bramble.api.account.AccountManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.briar.android.BriarTestComponentApplication; import org.briarproject.briar.android.BriarTestComponentApplication;
import org.briarproject.briar.android.TestComponent; import org.briarproject.briar.android.BriarUiTestComponent;
import org.junit.ClassRule; import org.junit.ClassRule;
import javax.inject.Inject; import javax.inject.Inject;
@@ -38,10 +38,10 @@ public abstract class ScreenshotTest {
BriarTestComponentApplication app = BriarTestComponentApplication app =
(BriarTestComponentApplication) getTargetContext() (BriarTestComponentApplication) getTargetContext()
.getApplicationContext(); .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) { protected void screenshot(String name) {
try { try {