chore(e2e): Move setup from CI to gradle task for easier local run

Signed-off-by: Stefan Niedermann <[email protected]>

Author: stefan-niedermann

.github/workflows/e2e.yml

@@ -77,13 +77,7 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          # FIXME Execution of connectedDebugAndroidTest fails
-          # TODO latest.apk should be cached when matrix testing is used
           script: |
-            adb shell pm uninstall -k --user 0 com.nextcloud.android.beta || true
-            wget -q https://download.nextcloud.com/android/dev/latest.apk
-            adb install latest.apk
-            adb shell pm grant com.nextcloud.android.beta android.permission.READ_EXTERNAL_STORAGE
             adb logcat -c || true
             adb logcat -s "E2E" -v color &
             adb logcat *:I -v color &

build.gradle

@@ -15,6 +15,10 @@ buildscript {
     }
 }
 
+plugins {
+    id "de.undercouch.download" version "5.4.0"
+}
+
 allprojects {
     repositories {
         google()

sample/build.gradle

@@ -1,3 +1,8 @@
+import com.android.ddmlib.AndroidDebugBridge
+import com.android.ddmlib.NullOutputReceiver
+
+import java.util.concurrent.TimeUnit
+
 apply plugin: 'com.android.application'
 
 android {
@@ -28,6 +33,34 @@ android {
     }
 }
 
+task downloadNextcloudApk(type: Download) {
+    src 'https://download.nextcloud.com/android/dev/latest.apk'
+    dest new File(buildDir, 'latest.apk')
+    overwrite true
+}
+
+task setupNextcloudEnvironment(dependsOn: downloadNextcloudApk) {
+    def bridge = AndroidDebugBridge.createBridge(android.adbExecutable.path, false, 10, TimeUnit.SECONDS)
+    doLast {
+        bridge.devices.each { device ->
+            println "Uninstall Nextcloud apk from ${device.name}"
+            device.uninstallPackage("com.nextcloud.android.beta")
+
+            println "Install Nextcloud apk on ${device.name}"
+            device.installPackage(new File(buildDir, 'latest.apk').getAbsolutePath(), true)
+
+            println "Grant permissions to Nextcloud"
+            device.executeShellCommand("pm grant com.nextcloud.android.beta android.permission.READ_EXTERNAL_STORAGE", NullOutputReceiver.receiver, 3, TimeUnit.SECONDS)
+        }
+    }
+}
+
+tasks.whenTaskAdded { taskItem ->
+    if (taskItem.name.contains("connected") && taskItem.name.endsWith("AndroidTest")) {
+        taskItem.dependsOn setupNextcloudEnvironment
+    }
+}
+
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.22"))

sample/src/androidTest/java/com/nextcloud/android/sso/sample/E2ETest.java

@@ -1,7 +1,6 @@
 package com.nextcloud.android.sso.sample;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.uiautomator.Until.findObject;
 import static androidx.test.uiautomator.Until.hasObject;
 
 import android.content.Intent;
@@ -45,7 +44,7 @@ public void before() {
     }
 
     @Test
-    public void test_00_configureNextcloudAccount() throws UiObjectNotFoundException {
+    public void test_00_configureNextcloudAccount() throws UiObjectNotFoundException, InterruptedException {
         Log.i(TAG, "Configure Nextcloud account");
         launch(APP_NEXTCLOUD);
 
@@ -66,8 +65,10 @@ public void test_00_configureNextcloudAccount() throws UiObjectNotFoundException
         mDevice.pressEnter();
         Log.d(TAG, "Enter pressed.");
 
+        final var webView = mDevice.findObject(new UiSelector().instance(0).className(WebView.class));
         Log.d(TAG, "Waiting for WebView…");
-        mDevice.wait(findObject(By.clazz(WebView.class)), TIMEOUT);
+//        mDevice.wait(findObject(By.clazz(WebView.class)), TIMEOUT);
+        webView.waitForExists(TIMEOUT);
         Log.d(TAG, "WebView exists.");
 
         final var webViewLoginButton = mDevice.findObject(new UiSelector()
@@ -76,6 +77,13 @@ public void test_00_configureNextcloudAccount() throws UiObjectNotFoundException
         Log.d(TAG, "Waiting for WebView Login Button…");
         webViewLoginButton.waitForExists(TIMEOUT);
         Log.d(TAG, "WebView Login Button exists. Clicking on it…");
+
+        // TODO Find better way to scroll the Login button to the visible area
+        // Log.d(TAG, "Scroll to bottom of WebView…");
+        // mDevice.findObject(By.clazz(WebView.class)).swipe(Direction.UP, 1f);
+        // Log.d(TAG, "Finished scrolling");
+        webViewLoginButton.dragTo(0,0, 40);
+
         webViewLoginButton.click();
 
         final var usernameInput = mDevice.findObject(new UiSelector()
@@ -95,21 +103,32 @@ public void test_00_configureNextcloudAccount() throws UiObjectNotFoundException
         Log.d(TAG, "Password Input exists. Setting text…");
         passwordInput.setText(SERVER_PASSWORD);
 
+        // mDevice.pressEnter();
         final var webViewSubmitButton = mDevice.findObject(new UiSelector()
-                .instance(0)
+                .instance(1) // First button is password visibility toggle
                 .className(Button.class));
         Log.d(TAG, "Waiting for WebView Submit Button…");
         webViewSubmitButton.waitForExists(TIMEOUT);
         Log.d(TAG, "WebView Submit Button exists. Clicking on it…");
         webViewSubmitButton.click();
 
+        webViewSubmitButton.waitUntilGone(TIMEOUT);
+
         final var webViewGrantAccessButton = mDevice.findObject(new UiSelector()
                 .instance(0)
                 .className(Button.class));
         Log.d(TAG, "Waiting for WebView Grant Access Button…");
         webViewGrantAccessButton.waitForExists(TIMEOUT);
         Log.d(TAG, "WebView Grant Access Button exists. Clicking on it…");
         webViewGrantAccessButton.click();
+
+        webView.waitUntilGone(TIMEOUT);
+
+        mDevice.waitForIdle(TIMEOUT);
+
+        Log.d(TAG, "Wait for Nextcloud files app…");
+        Thread.sleep(3_000);
+        Log.d(TAG, "Finishing setup…");
     }
 
     @Test