diff options
author | cyberta <cyberta@riseup.net> | 2023-01-23 19:47:56 +0100 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2023-01-23 19:47:56 +0100 |
commit | 7d0a1f8d8057faa74035de0cee262a46c6fbbe00 (patch) | |
tree | beb7ae926be396c9faff6978677d74c466d3e20f /app | |
parent | a800ef1e82c25207a842c197190b614e43739051 (diff) |
setup fastlane to create screenshots for Bitmask and custom branded clients, refactor Tests accordingly and create a script and environment variables to run fastlane screenshotting without thinking
Diffstat (limited to 'app')
-rw-r--r-- | app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderBaseTest.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/base/VpnStartTest.java) | 31 | ||||
-rw-r--r-- | app/src/androidTest/java/utils/CustomInteractions.java | 1 | ||||
-rw-r--r-- | app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java | 49 | ||||
-rw-r--r-- | app/src/androidTestCustom/java/se/leap/bitmaskclient/suite/ScreenshotTest.java | 17 | ||||
-rw-r--r-- | app/src/androidTestNormal/java/se/leap/bitmaskclient/base/BitmaskTest.java | 42 | ||||
-rw-r--r-- | app/src/androidTestNormal/java/se/leap/bitmaskclient/base/ProviderSetupTest.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderSetupTest.java) | 0 | ||||
-rw-r--r-- | app/src/androidTestNormal/java/se/leap/bitmaskclient/suite/ScreenshotTest.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/suite/ScreenshotTest.java) | 4 |
7 files changed, 117 insertions, 27 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/base/VpnStartTest.java b/app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderBaseTest.java index 6c99b90e..bbfcdc8b 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/base/VpnStartTest.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderBaseTest.java @@ -1,6 +1,5 @@ package se.leap.bitmaskclient.base; - import static android.content.Context.MODE_PRIVATE; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static androidx.test.espresso.Espresso.onData; @@ -48,7 +47,7 @@ import tools.fastlane.screengrab.locale.LocaleTestRule; @LargeTest @RunWith(AndroidJUnit4.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class VpnStartTest { +public abstract class ProviderBaseTest { @ClassRule public static final LocaleTestRule localeTestRule = new LocaleTestRule(); @@ -65,7 +64,7 @@ public class VpnStartTest { } @Test - public void test01_vpnStartTest() { + public void test01_vpnStartTest() throws InterruptedException { boolean configurationNeeded = configureProviderIfNeeded(); ViewInteraction mainButtonStop; @@ -77,12 +76,7 @@ public class VpnStartTest { ); mainButton.perform(click()); - tryResolve( - onView(allOf( - withId(R.id.button), - withTagValue(is("button_circle_cancel")))), - matches(isDisplayed()), - 2); + Thread.sleep(50); Screengrab.screenshot("VPN_connecting"); mainButtonStop = tryResolve( @@ -97,8 +91,8 @@ public class VpnStartTest { Screengrab.screenshot("VPN_connecting"); mainButtonStop = tryResolve( onView(allOf( - withId(R.id.button), - withTagValue(is("button_circle_stop")))), + withId(R.id.button), + withTagValue(is("button_circle_stop")))), matches(isDisplayed()), 20); Screengrab.screenshot("VPN_connected"); @@ -159,18 +153,5 @@ public class VpnStartTest { Screengrab.screenshot("App_Exclusion_Fragment"); } - public boolean configureProviderIfNeeded() { - try { - DataInteraction linearLayout = tryResolve(onData(hasToString(containsString("riseup.net"))) - .inAdapterView(withId(R.id.provider_list)), - 2); - linearLayout.perform(click()); - return true; - } catch (NoMatchingViewException e) { - // it might be that the provider was already configured, so we print the stack - // trace here and try to continue - e.printStackTrace(); - } - return false; - } + public abstract boolean configureProviderIfNeeded(); } diff --git a/app/src/androidTest/java/utils/CustomInteractions.java b/app/src/androidTest/java/utils/CustomInteractions.java index 896e8d9b..9e3a8f9d 100644 --- a/app/src/androidTest/java/utils/CustomInteractions.java +++ b/app/src/androidTest/java/utils/CustomInteractions.java @@ -31,6 +31,7 @@ public class CustomInteractions { hasFound = true; } catch (NoMatchingViewException exception) { System.out.println("NoMatchingViewException attempt: " + attempt); + exception.printStackTrace(); attempt++; if (attempt == maxTries) { throw exception; diff --git a/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java b/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java new file mode 100644 index 00000000..1a0814b6 --- /dev/null +++ b/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java @@ -0,0 +1,49 @@ +package se.leap.bitmaskclient.base; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.isDialog; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static utils.CustomInteractions.tryResolve; + +import androidx.test.espresso.ViewInteraction; + +import org.junit.Test; + +import se.leap.bitmaskclient.R; +import tools.fastlane.screengrab.Screengrab; + +public class CustomProviderTest extends ProviderBaseTest { + + @Test + @Override + public void test01_vpnStartTest() throws InterruptedException { + ViewInteraction mainButtonStop; + mainButtonStop = tryResolve( + onView(withId(R.id.main_button)), + matches(isDisplayed()), + 30); + Screengrab.screenshot("VPN_connected"); + + mainButtonStop.perform(click()); + Screengrab.screenshot("VPN_ask_disconnect"); + + ViewInteraction alertDialogOKbutton = tryResolve(onView(withText(android.R.string.yes)) + .inRoot(isDialog()), + matches(isDisplayed())); + alertDialogOKbutton.perform(click()); + Screengrab.screenshot("VPN_disconnected"); + + mainButtonStop.perform(click()); + Thread.sleep(50); + Screengrab.screenshot("VPN_connecting"); + } + + @Override + public boolean configureProviderIfNeeded() { + return false; + } +}
\ No newline at end of file diff --git a/app/src/androidTestCustom/java/se/leap/bitmaskclient/suite/ScreenshotTest.java b/app/src/androidTestCustom/java/se/leap/bitmaskclient/suite/ScreenshotTest.java new file mode 100644 index 00000000..a19b0ffd --- /dev/null +++ b/app/src/androidTestCustom/java/se/leap/bitmaskclient/suite/ScreenshotTest.java @@ -0,0 +1,17 @@ +package se.leap.bitmaskclient.suite; + + +import androidx.test.filters.LargeTest; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +import se.leap.bitmaskclient.base.CustomProviderTest; + +@LargeTest +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CustomProviderTest.class +}) +public class ScreenshotTest { +} diff --git a/app/src/androidTestNormal/java/se/leap/bitmaskclient/base/BitmaskTest.java b/app/src/androidTestNormal/java/se/leap/bitmaskclient/base/BitmaskTest.java new file mode 100644 index 00000000..aa437c74 --- /dev/null +++ b/app/src/androidTestNormal/java/se/leap/bitmaskclient/base/BitmaskTest.java @@ -0,0 +1,42 @@ +package se.leap.bitmaskclient.base; + + +import static androidx.test.espresso.Espresso.onData; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasToString; +import static utils.CustomInteractions.tryResolve; + +import androidx.test.espresso.DataInteraction; +import androidx.test.espresso.NoMatchingViewException; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.LargeTest; + +import org.junit.FixMethodOrder; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; + +import se.leap.bitmaskclient.R; + +@LargeTest +@RunWith(AndroidJUnit4.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class BitmaskTest extends ProviderBaseTest { + + @Override + public boolean configureProviderIfNeeded() { + try { + DataInteraction linearLayout = tryResolve(onData(hasToString(containsString("riseup.net"))) + .inAdapterView(withId(R.id.provider_list)), + 2); + linearLayout.perform(click()); + return true; + } catch (NoMatchingViewException e) { + // it might be that the provider was already configured, so we print the stack + // trace here and try to continue + e.printStackTrace(); + } + return false; + } +} diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderSetupTest.java b/app/src/androidTestNormal/java/se/leap/bitmaskclient/base/ProviderSetupTest.java index 23db8582..23db8582 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/base/ProviderSetupTest.java +++ b/app/src/androidTestNormal/java/se/leap/bitmaskclient/base/ProviderSetupTest.java diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/suite/ScreenshotTest.java b/app/src/androidTestNormal/java/se/leap/bitmaskclient/suite/ScreenshotTest.java index 186a50d1..5fa45a95 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/suite/ScreenshotTest.java +++ b/app/src/androidTestNormal/java/se/leap/bitmaskclient/suite/ScreenshotTest.java @@ -7,13 +7,13 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import se.leap.bitmaskclient.base.ProviderSetupTest; -import se.leap.bitmaskclient.base.VpnStartTest; +import se.leap.bitmaskclient.base.BitmaskTest; @LargeTest @RunWith(Suite.class) @Suite.SuiteClasses({ ProviderSetupTest.class, - VpnStartTest.class, + BitmaskTest.class, }) public class ScreenshotTest { } |