From 785cd2a3e5d8bb5499fed484c03e283c2eaa5469 Mon Sep 17 00:00:00 2001
From: evgeny <khokhlov.e.n@gmail.com>
Date: Thu, 3 Oct 2024 12:25:18 +0100
Subject: [PATCH] feat: introduced retry rules for flaky android push tests

---
 .github/workflows/emulate.yml                 |  4 +-
 android/build.gradle.kts                      |  2 +-
 .../java/io/ably/lib/test/RetryTestRule.java  | 49 +++++++++++++++++++
 .../lib/test/android/AndroidPushTest.java     |  6 +++
 gradle/libs.versions.toml                     |  2 +-
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 android/src/androidTest/java/io/ably/lib/test/RetryTestRule.java

diff --git a/.github/workflows/emulate.yml b/.github/workflows/emulate.yml
index 10a3ad2d5..e065c15ad 100644
--- a/.github/workflows/emulate.yml
+++ b/.github/workflows/emulate.yml
@@ -35,7 +35,9 @@ jobs:
           api-level: ${{ matrix.android-api-level }}
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: ./gradlew :android:connectedAndroidTest
+          script: |
+            ./gradlew :android:connectedAndroidTest
+            adb logcat -d
 
       - uses: actions/upload-artifact@v3
         if: always()
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index a63917f6d..7a625b2f0 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -35,7 +35,7 @@ android {
         abortOnError = false
     }
 
-    testOptions.targetSdk = 30
+    testOptions.targetSdk = 34
 
     sourceSets {
         getByName("main") {
diff --git a/android/src/androidTest/java/io/ably/lib/test/RetryTestRule.java b/android/src/androidTest/java/io/ably/lib/test/RetryTestRule.java
new file mode 100644
index 000000000..6584ae3b0
--- /dev/null
+++ b/android/src/androidTest/java/io/ably/lib/test/RetryTestRule.java
@@ -0,0 +1,49 @@
+package io.ably.lib.test;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+
+public class RetryTestRule implements TestRule {
+
+    private final int timesToRunTestCount;
+
+    /**
+     * If `times` is 0, then we should run the test once.
+     */
+    public RetryTestRule(int times) {
+        this.timesToRunTestCount = times + 1;
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return statement(base, description);
+    }
+
+    private Statement statement(Statement base, Description description) {
+        return new Statement() {
+
+            @Override
+            public void evaluate() throws Throwable {
+                Throwable latestException = null;
+
+                for (int runCount = 0; runCount < timesToRunTestCount; runCount++) {
+                    try {
+                        base.evaluate();
+                        return;
+                    } catch (Throwable t) {
+                        latestException = t;
+                        System.err.printf("%s: test failed on run: `%d`. Will run a maximum of `%d` times.%n", description.getDisplayName(), runCount, timesToRunTestCount);
+                        t.printStackTrace();
+                    }
+                }
+
+                if (latestException != null) {
+                    System.err.printf("%s: giving up after `%d` failures%n", description.getDisplayName(), timesToRunTestCount);
+                    throw latestException;
+                }
+            }
+        };
+    }
+}
diff --git a/android/src/androidTest/java/io/ably/lib/test/android/AndroidPushTest.java b/android/src/androidTest/java/io/ably/lib/test/android/AndroidPushTest.java
index 3ecd0407c..190b1b505 100644
--- a/android/src/androidTest/java/io/ably/lib/test/android/AndroidPushTest.java
+++ b/android/src/androidTest/java/io/ably/lib/test/android/AndroidPushTest.java
@@ -41,6 +41,7 @@
 import io.ably.lib.rest.Auth;
 import io.ably.lib.rest.Channel;
 import io.ably.lib.rest.DeviceDetails;
+import io.ably.lib.test.RetryTestRule;
 import io.ably.lib.test.common.Helpers;
 import io.ably.lib.test.common.Helpers.AsyncWaiter;
 import io.ably.lib.test.common.Helpers.CompletionWaiter;
@@ -59,7 +60,9 @@
 import java9.util.stream.StreamSupport;
 
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -86,6 +89,9 @@
 public class AndroidPushTest {
     private static final int TIMEOUT_SECONDS = 30;
 
+    @Rule
+    public RetryTestRule retryRule = new RetryTestRule(2);
+
     private class TestActivation {
         private Helpers.RawHttpTracker httpTracker;
         private AblyRest rest;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 542072c78..baa16e88f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ concurrentunit = "0.4.2"
 slf4j = "1.7.30"
 build-config = "5.4.0"
 firebase-messaging = "22.0.0"
-android-test = "0.5"
+android-test = "1.0.2"
 dexmaker = "1.4"
 android-retrostreams = "1.7.4"
 maven-publish = "0.29.0"