Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix SettingsActivityScreenshotTest

Browse Source
This commit is contained in:
Torsten Grote
2021-04-14 11:43:31 -03:00
parent f185860213
commit 2fc0fd17a2
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import androidx.recyclerview.widget.RecyclerView;
import androidx.test.espresso.contrib.DrawerActions; import androidx.test.espresso.contrib.DrawerActions;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -20,17 +19,13 @@ import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.contrib.DrawerMatchers.isClosed; import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
import static androidx.test.espresso.contrib.RecyclerViewActions.scrollTo;
import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.isEnabled; import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
import static androidx.test.espresso.matcher.ViewMatchers.withChild; import static androidx.test.espresso.matcher.ViewMatchers.withChild;
import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText; import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.briarproject.briar.android.ViewActions.waitUntilMatches; import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
import static org.briarproject.briar.android.util.UiUtils.hasScreenLock; import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@@ -50,6 +45,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
onView(withText(R.string.settings_button)) onView(withText(R.string.settings_button))
.check(matches(isDisplayed())); .check(matches(isDisplayed()));
onView(withText(R.string.display_settings_title))
.perform(waitUntilMatches(isDisplayed()))
.perform(click(), click());
screenshot("manual_dark_theme_settings", testRule.getActivity()); screenshot("manual_dark_theme_settings", testRule.getActivity());
// switch to dark theme // switch to dark theme
@@ -68,6 +67,9 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
onView(withText(R.string.settings_button)) onView(withText(R.string.settings_button))
.check(matches(isDisplayed())) .check(matches(isDisplayed()))
.perform(click()); .perform(click());
onView(withText(R.string.display_settings_title))
.check(matches(isDisplayed()))
.perform(click());
onView(withText(R.string.pref_theme_title)) onView(withText(R.string.pref_theme_title))
.check(matches(isDisplayed())) .check(matches(isDisplayed()))
.perform(click()); .perform(click());
@@ -80,20 +82,15 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
public void appLock() { public void appLock() {
assumeTrue("device has no screen lock", assumeTrue("device has no screen lock",
hasScreenLock(getApplicationContext())); hasScreenLock(getApplicationContext()));
// scroll down
onView(withClassName(is(RecyclerView.class.getName())))
.perform(scrollTo(hasDescendant(
// scroll down a bit more to have settings in the middle
withText(R.string.panic_setting))));
// wait for settings to get loaded and enabled onView(withText(R.string.security_settings_title))
onView(withText(R.string.tor_mobile_data_title)) .perform(waitUntilMatches(isDisplayed()))
.perform(waitUntilMatches(isEnabled())); .perform(click(), click());
// ensure app lock is displayed and enabled // ensure app lock is displayed and enabled
onView(withText(R.string.pref_lock_title)) onView(withText(R.string.pref_lock_title))
.check(matches(isDisplayed())) .check(matches(isDisplayed()))
.check(matches(isEnabled())) .perform(waitUntilMatches(isEnabled()))
.perform(click()); .perform(click());
onView(withChild(withText(R.string.pref_lock_timeout_title))) onView(withChild(withText(R.string.pref_lock_timeout_title)))
.check(matches(isDisplayed())) .check(matches(isDisplayed()))
@@ -108,11 +105,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
@Test @Test
public void torSettings() { public void torSettings() {
// scroll down // click network/connections settings
onView(withClassName(is(RecyclerView.class.getName()))) onView(withText(R.string.network_settings_title))
.perform(scrollTo(hasDescendant( .perform(waitUntilMatches(isDisplayed()))
// scroll down a bit more to have settings in the middle .perform(click(), click());
withText(R.string.pref_lock_timeout_title))));
// wait for settings to get loaded and enabled // wait for settings to get loaded and enabled
onView(withText(R.string.tor_network_setting)) onView(withText(R.string.tor_network_setting))