Test that multi file upload does not offer the renaming UI

To reduce duplication, the file and folders are setup in a @before method,
but this also affects the existing screenshot tests.

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

Author: PhilLab

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -68,7 +68,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
@@ -234,17 +236,19 @@ protected Account[] getAllAccounts() {
         return AccountManager.get(targetContext).getAccounts();
     }
 
-    protected static void createDummyFiles() throws IOException {
+    protected static List<File> createDummyFiles() throws IOException {
         File tempPath = new File(FileStorageUtils.getTemporalPath(account.name));
         if (!tempPath.exists()) {
             assertTrue(tempPath.mkdirs());
         }
 
         assertTrue(tempPath.exists());
 
-        createFile("empty.txt", 0);
-        createFile("nonEmpty.txt", 100);
-        createFile("chunkedFile.txt", 500000);
+        return Arrays.asList(
+            createFile("empty.txt", 0),
+            createFile("nonEmpty.txt", 100),
+            createFile("chunkedFile.txt", 500000)
+        );
     }
 
     protected static File getDummyFile(String name) throws IOException {

app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt

@@ -31,6 +31,7 @@ import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.utils.ScreenshotTest
 import org.hamcrest.Matchers.not
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -42,6 +43,28 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
     @get:Rule
     var storagePermissionRule: TestRule = GrantStoragePermissionRule.grant()
 
+    lateinit var mainFolder: OCFile
+    lateinit var subFolder: OCFile
+    lateinit var existingImageFile: OCFile
+
+    @Before
+    fun setupFolderAndFileStructure() {
+        // Create folders with the necessary permissions and another test file
+        mainFolder = OCFile("/folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+        subFolder = OCFile("${mainFolder.remotePath}sub folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+        existingImageFile = OCFile("${mainFolder.remotePath}Existing Image File.jpg").apply {
+            fileDataStorageManager.saveNewFile(this)
+        }
+    }
+
     @Test
     @ScreenshotTest
     fun open() {
@@ -70,25 +93,18 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
         putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file))
     }
 
+    fun createSendIntent(files: Iterable<File>): Intent =
+        Intent(targetContext, ReceiveExternalFilesActivity::class.java).apply {
+            action = Intent.ACTION_SEND_MULTIPLE
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(files.map { Uri.fromFile(it) }))
+        }
+
     @Test
     fun renameSingleFileUpload() {
         val imageFile = getDummyFile("image.jpg")
         val intent = createSendIntent(imageFile)
 
-        // Create folders with the necessary permissions and another test file
-        val mainFolder = OCFile("/folder/").apply {
-            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
-            setFolder()
-            fileDataStorageManager.saveNewFile(this)
-        }
-        val subFolder = OCFile("${mainFolder.remotePath}sub folder/").apply {
-            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
-            setFolder()
-            fileDataStorageManager.saveNewFile(this)
-        }
-        val otherFile = OCFile("${mainFolder.remotePath}Other Image File.jpg").apply {
-            fileDataStorageManager.saveNewFile(this)
-        }
 
         // Store the folder in preferences, so the activity starts from there.
         @Suppress("DEPRECATION")
@@ -148,8 +164,8 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .check(matches(not(isEnabled())))
             onView(withId(R.id.user_input))
                 .perform(ViewActions.click())
-                .perform(ViewActions.typeTextIntoFocusedView(otherFile.fileName))
-                .check(matches(withText(otherFile.fileName)))
+                .perform(ViewActions.typeTextIntoFocusedView(existingImageFile.fileName))
+                .check(matches(withText(existingImageFile.fileName)))
             onView(withText(R.string.uploader_btn_upload_text))
                 .check(matches(isDisplayed()))
                 .check(matches(not(isEnabled())))
@@ -203,4 +219,29 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .check(matches(withText(imageFile.name)))
         }
     }
+
+    @Test
+    fun noRenameForMultiUpload() {
+        val testFiles = createDummyFiles()
+        val intent = createSendIntent(testFiles)
+
+        // Store the folder in preferences, so the activity starts from there.
+        @Suppress("DEPRECATION")
+        val preferences = AppPreferencesImpl.fromContext(targetContext)
+        preferences.setLastUploadPath(mainFolder.remotePath)
+
+        launchActivity<ReceiveExternalFilesActivity>(intent).use {
+            val expectedMainFolderTitle = (getCurrentActivity() as ToolbarActivity).getActionBarTitle(mainFolder, false)
+            // Verify that the test starts in the expected folder. If this fails, change the setup calls above
+            onView(withId(R.id.toolbar))
+                .check(matches(hasDescendant(withText(expectedMainFolderTitle))))
+
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+
+            onView(withId(R.id.user_input))
+                .check(matches(not(isDisplayed())))
+        }
+    }
 }