Testing slideshow deletion for remote files

Signed-off-by: Philipp Hasper <vcs@hasper.info>

Author: PhilLab

app/src/androidTest/java/com/nextcloud/test/FileRemovedIdlingResource.kt

@@ -0,0 +1,50 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+package com.nextcloud.test
+
+import androidx.test.espresso.IdlingResource
+import com.owncloud.android.datamodel.FileDataStorageManager
+import java.util.concurrent.atomic.AtomicLong
+
+/**
+ * IdlingResource that can be reused to watch the removal of different file ids sequentially.
+ *
+ * Use setFileId(fileId) before triggering the deletion. The resource will call the Espresso callback
+ * once the file no longer exists. Call unregister from IdlingRegistry in @After.
+ */
+class FileRemovedIdlingResource(private val storageManager: FileDataStorageManager) : IdlingResource {
+    private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+    // 0 or negative means "no file set"
+    private val currentFileId = AtomicLong(-1L)
+
+    override fun getName(): String = "${this::class.java.simpleName}"
+
+    override fun isIdleNow(): Boolean {
+        val id = currentFileId.get()
+        // If no file set, consider idle. If file set, idle only if it doesn't exist.
+        val idle = (id <= 0L) || !storageManager.fileExists(id)
+        if (idle && id > 0L) {
+            // if we detect it's already removed, notify and clear
+            resourceCallback?.onTransitionToIdle()
+            currentFileId.set(-1L)
+        }
+        return idle
+    }
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+        this.resourceCallback = callback
+    }
+
+    /**
+     * Start watching the given fileId. Call this right before performing the UI action that triggers deletion.
+     * If fileId <= 0 initial value is treated as "no-op".
+     */
+    fun setFileId(fileId: Long) {
+        currentFileId.set(fileId)
+    }
+}

app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt

@@ -22,18 +22,29 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.nextcloud.test.ConnectivityServiceOfflineMock
+import com.nextcloud.test.FileRemovedIdlingResource
 import com.nextcloud.test.LoopFailureHandler
 import com.owncloud.android.AbstractOnServerIT
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.db.OCUpload
+import com.owncloud.android.files.services.NameCollisionPolicy
 import org.hamcrest.Matchers.allOf
+import org.junit.After
+import org.junit.Before
 import org.junit.Test
 import java.io.File
 
 class PreviewImageActivityIT : AbstractOnServerIT() {
+    companion object {
+        private const val REMOTE_FOLDER: String = "/PreviewImageActivityIT/"
+    }
+
     lateinit var testFiles: List<OCFile>
 
-    fun createMockedImageFiles(count: Int, localOnly: Boolean) {
+    var fileRemovedIdlingResource = FileRemovedIdlingResource(storageManager)
+
+    fun createLocalMockedImageFiles(count: Int) {
         val srcPngFile = getFile("imageFile.png")
         testFiles = (0 until count).map { i ->
             val pngFile = File(srcPngFile.parent ?: ".", "image$i.png")
@@ -44,13 +55,40 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
                 mimeType = "image/png"
                 modificationTimestamp = 1000000
                 permissions = "D" // OCFile.PERMISSION_CAN_DELETE_OR_LEAVE_SHARE. Required for deletion button to show
-                remoteId = if (localOnly) null else "abc-mocked-remote-id" // mocking the file to be on the server
             }.also {
                 storageManager.saveNewFile(it)
             }
         }
     }
 
+    /**
+     * Create image files and upload them to the connected server.
+     *
+     * This function relies on the images not existing beforehand, as AbstractOnServerIT#deleteAllFilesOnServer()
+     * should clean up. If it does fail, likely because that clean up didn't work and there are leftovers from
+     * a previous run
+     * @param count Number of files to create
+     * @param folder Parent folder to which to upload. Must start and end with a slash
+     */
+    fun createAndUploadImageFiles(count: Int, folder: String = REMOTE_FOLDER) {
+        val srcPngFile = getFile("imageFile.png")
+        testFiles = (0 until count).map { i ->
+            val pngFile = File(srcPngFile.parent ?: ".", "image$i.png")
+            srcPngFile.copyTo(pngFile, overwrite = true)
+
+            val ocUpload = OCUpload(
+                pngFile.absolutePath,
+                folder + pngFile.name,
+                account.name
+            ).apply {
+                nameCollisionPolicy = NameCollisionPolicy.OVERWRITE
+            }
+            uploadOCUpload(ocUpload)
+
+            fileDataStorageManager.getFileByDecryptedRemotePath(folder + pngFile.name)!!
+        }
+    }
+
     fun veryImageThenDelete(index: Int) {
         val currentFileName = testFiles[index].fileName
         Espresso.setFailureHandler(
@@ -92,14 +130,27 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
             .check(matches(withText(R.string.file_delete)))
             .perform(ViewActions.click())
 
+        // Register the idling resource to wait for successful deletion
+        fileRemovedIdlingResource.setFileId(testFiles[index].fileId)
+
         Espresso.setFailureHandler(DefaultFailureHandler(targetContext))
     }
 
+    @Before
+    fun bringUp() {
+        IdlingRegistry.getInstance().register(fileRemovedIdlingResource)
+    }
+
+    @After
+    fun tearDown() {
+        IdlingRegistry.getInstance().unregister(fileRemovedIdlingResource)
+    }
+
     @Test
     fun deleteFromSlideshow_localOnly_online() {
         // Prepare local test data
         val imageCount = 10
-        createMockedImageFiles(imageCount, localOnly = true)
+        createLocalMockedImageFiles(imageCount)
 
         // Launch the activity with the first image
         val intent = PreviewImageActivity.previewFileIntent(targetContext, user, testFiles[0])
@@ -116,7 +167,7 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
     fun deleteFromSlideshow_localOnly_offline() {
         // Prepare local test data
         val imageCount = 10
-        createMockedImageFiles(imageCount, localOnly = true)
+        createLocalMockedImageFiles(imageCount)
 
         // Launch the activity with the first image
         val intent = PreviewImageActivity.previewFileIntent(targetContext, user, testFiles[0])
@@ -131,4 +182,21 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
             }
         }
     }
+
+    @Test
+    fun deleteFromSlideshow_remote_online() {
+        // Prepare local test data
+        val imageCount = 10
+        createAndUploadImageFiles(imageCount)
+
+        // Launch the activity with the first image
+        val intent = PreviewImageActivity.previewFileIntent(targetContext, user, testFiles[0])
+        launchActivity<PreviewImageActivity>(intent).use {
+            onView(isRoot()).check(matches(isDisplayed()))
+
+            for (i in 0 until imageCount) {
+                veryImageThenDelete(i)
+            }
+        }
+    }
 }