Merge remote-tracking branch 'origin/main' into pr-185-extended

# Conflicts:
#	opencloudComLibrary/src/main/java/eu/opencloud/android/lib/resources/files/tus/CreateTusUploadRemoteOperation.kt

Author: guruz

.woodpecker/integration-test.yml

@@ -0,0 +1,58 @@
+variables:
+  - &android_image 'docker.io/mingc/android-build-box:1.29.0'
+
+when:
+  - event: pull_request
+  - event: push
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+labels:
+  platform: android-emulator
+
+steps:
+  - name: run tests
+    image: *android_image
+    commands:
+      - adb connect android-emulator-cuda:5555
+      - adb devices
+      - curl -L -o adbserver-desktop.jar https://github.com/KasperskyLab/Kaspresso/refs/tags/1.6.0/artifacts/adbserver-desktop.jar
+      - java -jar adbserver-desktop.jar &
+      - sleep 3
+      - ./gradlew :opencloudApp:connectedOriginalDebugAndroidTest --console=plain
+
+  - name: instrumented data tests
+    image: *android_image
+    commands:
+      - adb connect android-emulator-cuda:5555
+      - adb devices
+      - sleep 3
+      - ./gradlew :opencloudData:connectedAndroidTest --console=plain
+
+  - name: test results
+    image: *android_image
+    when:
+      - status: [ success, failure ]
+    commands:
+      - |
+        python3 -c "
+        import xml.etree.ElementTree as ET, glob
+        passed = skipped = failed = 0
+        for f in glob.glob('**/TEST-*.xml', recursive=True):
+            root = ET.parse(f).getroot()
+            suites = [root] if root.tag == 'testsuite' else root.findall('testsuite')
+            for suite in suites:
+                for tc in suite.findall('testcase'):
+                    name = f\"{suite.get('name')}.{tc.get('name')}\"
+                    if tc.find('skipped') is not None:
+                        print(f'⏭  {name}'); skipped += 1
+                    elif tc.find('failure') is not None:
+                        print(f'❌ {name}'); failed += 1
+                    else:
+                        print(f'✅ {name}'); passed += 1
+        print()
+        print(f'✅ passed:  {passed}')
+        print(f'❌ failed:  {failed}')
+        print(f'⏭  skipped: {skipped}')
+        print(f'   total:   {passed+failed+skipped}')
+        "

gradle/libs.versions.toml

@@ -30,7 +30,7 @@ floatingactionbutton = "1.10.1"
 glide = "4.15.1"
 glideToVectorYou = "v2.0.0"
 junit4 = "4.13.2"
-kaspresso = "1.6.1"
+kaspresso = "1.6.0"
 koin = "3.3.3"
 kotlin = "1.9.20"
 kotlinxCoroutines = "1.6.4"

opencloudApp/src/androidTest/java/eu/opencloud/android/authentication/LoginActivityTest.kt

@@ -338,6 +338,7 @@ class LoginActivityTest {
     }
 
     @Test
+    @Ignore
     fun checkServerInfo_isSuccess_NotSecure() {
         launchTest()
         serverInfoLiveData.postValue(Event(UIResult.Success(INSECURE_SERVER_INFO_BASIC)))

opencloudApp/src/androidTest/java/eu/opencloud/android/files/SortBottomSheetFragmentTest.kt

@@ -39,6 +39,7 @@ import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
+import org.junit.Ignore
 
 class SortBottomSheetFragmentTest {
 
@@ -56,6 +57,7 @@ class SortBottomSheetFragmentTest {
         fragmentScenario.onFragment { it.sortDialogListener = fragmentListener }
     }
 
+    @Ignore
     @Test
     fun test_initial_view() {
         onView(withId(R.id.title))

opencloudApp/src/integrationTest/.env.example

@@ -0,0 +1,5 @@
+WOODPECKER_SERVER=
+WOODPECKER_AGENT_SECRET=
+WOODPECKER_AGENT_LABELS=platform=android-emulator
+WOODPECKER_MAX_WORKFLOWS=1
+WOODPECKER_LOG_LEVEL=debug

opencloudApp/src/integrationTest/docker-compose.yaml

@@ -0,0 +1,58 @@
+version: "4"
+services:
+  android-emulator-cuda:
+    image: opencloudeu/android-emulator-ci:api-36
+    ports:
+      - 10.8.0.1:5554:5554
+      - 10.8.0.1:5555:5555
+    networks:
+      android-integration-tests:
+    hostname: android-emulator-cuda
+    restart: unless-stopped
+    environment:
+      - DISABLE_ANIMATION=false
+      - DISABLE_HIDDEN_POLICY=true
+      - SKIP_AUTH=false
+      - MEMORY=16384
+      - CORES=6
+    privileged: true
+    tty: true
+    stdin_open: true
+    volumes:
+      - ./keys/adbkey:/root/.android/adbkey:ro
+      - ./keys/adbkey.pub:/root/.android/adbkey.pub:ro
+      - ./android_avd:/data
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
+
+  woodpecker-agent:
+    image: woodpeckerci/woodpecker-agent:v3.14.1
+    command: agent
+    restart: unless-stopped
+    environment:
+      WOODPECKER_SERVER: ${WOODPECKER_SERVER}
+      WOODPECKER_AGENT_SECRET: ${WOODPECKER_AGENT_SECRET}
+      WOODPECKER_AGENT_LABELS: ${WOODPECKER_AGENT_LABELS}
+      WOODPECKER_MAX_WORKFLOWS: ${WOODPECKER_MAX_WORKFLOWS:-1}
+      WOODPECKER_LOG_LEVEL: ${WOODPECKER_LOG_LEVEL}
+      WOODPECKER_GRPC_SECURE: true
+      WOODPECKER_BACKEND: docker
+      WOODPECKER_BACKEND_DOCKER_NETWORK: android-integration-tests
+    networks:
+      android-integration-tests:
+    volumes:
+      - woodpecker-agent-config:/etc/woodpecker
+      - /var/run/docker.sock:/var/run/docker.sock
+
+
+volumes:
+  woodpecker-agent-config:
+
+networks:
+ android-integration-tests:
+   name: android-integration-tests

…/eu/opencloud/android/LoginScreenTest.kt …t/java/eu/opencloud/android/LoginTest.ktopencloudApp/src/integrationTest/java/eu/opencloud/android/LoginScreenTest.kt renamed to opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginScreenTest.kt renamed to opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt

@@ -12,9 +12,8 @@ import screens.LoginScreen
 import screens.MainScreen
 import screens.ManageAccountsDialog
 import screens.StartScreen
-import screens.TrustCertificate
 
-class LoginScreenTest : TestCase(
+class LoginTest : TestCase(
     kaspressoBuilder = Kaspresso.Builder.advanced {
         flakySafetyParams = FlakySafetyParams.custom(
             timeoutMs = 20_000L,
@@ -30,20 +29,20 @@ class LoginScreenTest : TestCase(
     @get:Rule
     val activityRule = ActivityScenarioRule(SplashActivity::class.java)
 
+    @get:Rule
+    val permissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        android.Manifest.permission.READ_EXTERNAL_STORAGE,
+        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+    )
 
     @Test
-    fun loginApp() {
-        before {
-            adbServer.performCmd("adb", listOf("reverse", "tcp:9200", "tcp:9200"))
-        }.after {
-            adbServer.performCmd("adb", listOf("shell", "am", "force-stop", "com.android.chrome"))
-            adbServer.performCmd("adb", listOf("reverse", "--remove", "tcp:9200"))
-        }.run {
+    fun loginAndRemoveAccount() {
+        run {
             step("set opencloud url") {
                 StartScreen {
                     hostUrlInput {
                         isVisible()
-                        typeText("https://localhost:9200")
+                        typeText("https://cloud.rc.opencloud.rocks")
                     }
                     checkServerButton {
                         isVisible()
@@ -52,15 +51,6 @@ class LoginScreenTest : TestCase(
                     }
                 }
             }
-            step("trust certificate") {
-                TrustCertificate {
-                    yesBtn {
-                        isVisible()
-                        isClickable()
-                        click()
-                    }
-                }
-            }
             step("login") {
                 LoginScreen {
                     username.isDisplayed()
@@ -69,11 +59,6 @@ class LoginScreenTest : TestCase(
                     username.typeText("alan")
                     password.typeText("demo")
                     loginButton.click()
-                    keepAccessForeverBtn {
-                        isDisplayed()
-                        isClickable()
-                        click()
-                    }
                 }
             }
             step("check personal space") {

opencloudApp/src/integrationTest/java/screens/LoginScreen.kt

@@ -7,10 +7,8 @@ import com.kaspersky.components.kautomator.screen.UiScreen
 object LoginScreen : UiScreen<LoginScreen>() {
     override val packageName: String = "com.android.chrome"
 
-    // can't find it using withId("com.android.chrome", "username") so using withResourceName()
-    val username = UiEditText { withResourceName("oc-login-username") }
-    val password = UiEditText { withResourceName("oc-login-password") }
-    val loginButton = UiButton { withText("Log in") }
-
-    val keepAccessForeverBtn = UiButton { withText("Allow") }
+    // keycloak login form
+    val username = UiEditText { withResourceName("username") }
+    val password = UiEditText { withResourceName("password") }
+    val loginButton = UiButton { withResourceName("kc-login") }
 }

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/common/network/ChunkFromFileRequestBody.kt

@@ -88,6 +88,7 @@ class ChunkFromFileRequestBody(
             }
         } catch (exception: Exception) {
             Timber.e(exception, "Transferred " + alreadyTransferred + " bytes from a total of " + file.length())
+            throw exception
         }
     }