From 108b886f43feeb861807deddfcb1ab241330e242 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Thu, 19 Jan 2023 18:47:14 +0100
Subject: improve screenshot tests, run in different languages, test more
 Fragments/Activities

---
 .../androidTest/java/utils/CustomInteractions.java | 81 ++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 app/src/androidTest/java/utils/CustomInteractions.java

(limited to 'app/src/androidTest/java/utils/CustomInteractions.java')

diff --git a/app/src/androidTest/java/utils/CustomInteractions.java b/app/src/androidTest/java/utils/CustomInteractions.java
new file mode 100644
index 00000000..896e8d9b
--- /dev/null
+++ b/app/src/androidTest/java/utils/CustomInteractions.java
@@ -0,0 +1,81 @@
+package utils;
+
+import androidx.annotation.Nullable;
+import androidx.test.espresso.DataInteraction;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.ViewAssertion;
+import androidx.test.espresso.ViewInteraction;
+
+public class CustomInteractions {
+
+    public static @Nullable
+    ViewInteraction tryResolve(ViewInteraction viewInteraction, int maxTries) {
+        return tryResolve(viewInteraction, null, maxTries);
+    }
+
+    public static @Nullable
+    ViewInteraction tryResolve(ViewInteraction viewInteraction, ViewAssertion assertion) {
+        return tryResolve(viewInteraction, assertion, 10);
+    }
+
+    public static @Nullable ViewInteraction tryResolve(ViewInteraction viewInteraction, ViewAssertion assertion, int maxTries) {
+        ViewInteraction resolvedViewInteraction = null;
+        int attempt = 0;
+        boolean hasFound = false;
+        while (!hasFound && attempt < maxTries) {
+            try {
+                resolvedViewInteraction = viewInteraction;
+                if (assertion != null) {
+                    resolvedViewInteraction.check(assertion);
+                }
+                hasFound = true;
+            } catch (NoMatchingViewException exception) {
+                System.out.println("NoMatchingViewException attempt: " + attempt);
+                attempt++;
+                if (attempt == maxTries) {
+                    throw exception;
+                }
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    break;
+                }
+            }
+        }
+        return resolvedViewInteraction;
+    }
+
+    public static @Nullable
+    DataInteraction tryResolve(DataInteraction dataInteraction, ViewAssertion assertion, int maxTries) {
+        DataInteraction resolvedDataInteraction = null;
+        int attempt = 0;
+        boolean hasFound = false;
+        while (!hasFound && attempt < maxTries) {
+            try {
+                resolvedDataInteraction = dataInteraction;
+                if (assertion != null) {
+                    resolvedDataInteraction.check(assertion);
+                }
+                hasFound = true;
+            } catch (Exception exception) {
+                // TODO: specify expected exception
+                attempt++;
+                if (attempt == maxTries) {
+                    throw exception;
+                }
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    break;
+                }
+            }
+        }
+        return resolvedDataInteraction;
+    }
+    public static @Nullable
+    DataInteraction tryResolve(DataInteraction dataInteraction, int maxTries) {
+        return tryResolve(dataInteraction, null, maxTries);
+    }
+}
-- 
cgit v1.2.3


From 7d0a1f8d8057faa74035de0cee262a46c6fbbe00 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Mon, 23 Jan 2023 19:47:56 +0100
Subject: 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

---
 app/src/androidTest/java/utils/CustomInteractions.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/androidTest/java/utils/CustomInteractions.java')

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;
-- 
cgit v1.2.3