From 3bb148b2d0e4ca0416d9707732c756503be5f384 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 23 Oct 2023 13:50:27 +0100 Subject: [PATCH] Factor out code for skipping onboarding. --- .../briarproject/briar/android/UiTest.java | 25 +++++++++++-------- .../briar/android/ScreenshotTest.java | 13 +++------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java index fd9a12acc..586d83079 100644 --- a/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java +++ b/briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java @@ -56,6 +56,19 @@ public abstract class UiTest { getApplicationContext().startActivity(i); } + protected void disableOnboarding() { + try { + Settings settings = new Settings(); + settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false); + settings.putBoolean(SHOW_ONBOARDING_IMAGE, false); + settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false); + settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false); + settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE); + } catch (DbException e) { + throw new AssertionError(e); + } + } + @NotNullByDefault protected class CleanAccountTestRule extends IntentsTestRule { @@ -77,17 +90,7 @@ public abstract class UiTest { } catch (InterruptedException e) { throw new AssertionError(e); } - try { - Settings settings = new Settings(); - settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false); - settings.putBoolean(SHOW_ONBOARDING_IMAGE, false); - settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false); - settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false); - settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE); - } catch (DbException e) { - throw new AssertionError(e); - } + disableOnboarding(); } } - } diff --git a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java index 99798ae5b..00f7b5089 100644 --- a/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java +++ b/briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/ScreenshotTest.java @@ -23,13 +23,13 @@ public abstract class ScreenshotTest extends UiTest { public static final LocaleTestRule localeTestRule = new LocaleTestRule(); @Inject - protected TestDataCreator testDataCreator; + TestDataCreator testDataCreator; @Inject - protected ConnectionRegistry connectionRegistry; + ConnectionRegistry connectionRegistry; @Inject - protected Clock clock; + Clock clock; - protected void screenshot(String name, ActivityScenarioRule rule) { + void screenshot(String name, ActivityScenarioRule rule) { rule.getScenario().onActivity(activity -> screenshot(name, activity)); } @@ -47,9 +47,4 @@ public abstract class ScreenshotTest extends UiTest { Log.w("Screengrab", "Permission to write screenshot is missing."); } } - - protected long getMinutesAgo(int minutes) { - return clock.currentTimeMillis() - minutes * 60 * 1000; - } - }