[WIP] Implemented Espresso tests for upload with multilingual descriptions

app/proguard-rules.txt

@@ -75,3 +75,8 @@
 -keep class org.acra.** { *; }
 -keepattributes SourceFile,LineNumberTable
 -keepattributes *Annotation*
+
+# --- /recycler view ---
+-keep class androidx.recyclerview.widget.RecyclerView  {
+    public androidx.recyclerview.widget.RecyclerView$ViewHolder findViewHolderForPosition(int);
+}

app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt

@@ -13,6 +13,7 @@ import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.Intents.intending
@@ -24,6 +25,8 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.runner.AndroidJUnit4
 import fr.free.nrw.commons.auth.LoginActivity
+import fr.free.nrw.commons.upload.DescriptionsAdapter
+import fr.free.nrw.commons.util.MyViewAction
 import fr.free.nrw.commons.utils.ConfigUtils
 import org.hamcrest.core.AllOf.allOf
 import org.junit.After
@@ -65,19 +68,175 @@ class UploadTest {
         }
         UITestHelper.skipWelcome()
         UITestHelper.loginUser()
-        saveToInternalStorage()
     }
 
     @After
     fun teardown() {
         Intents.release()
     }
 
-    private fun saveToInternalStorage() {
+    @Test
+    fun testUploadWithoutDescription() {
+        if (!ConfigUtils.isBetaFlavour()) {
+            throw Error("This test should only be run in Beta!")
+        }
+
+        setupSingleUpload("image.jpg")
+
+        openGallery()
+
+        // Validate that an intent to get an image is sent
+        intended(allOf(hasAction(Intent.ACTION_GET_CONTENT), hasType("image/*")))
+
+        // Create filename with the current time (to prevent overwrites)
+        val dateFormat = SimpleDateFormat("yyMMdd-hhmmss")
+        val commonsFileName = "MobileTest " + dateFormat.format(Date())
+
+        // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
+        dismissWarningDialog()
+
+        onView(allOf<View>(withId(R.id.description_item_edit_text), withParent(withParent(withId(R.id.image_title_container)))))
+                .perform(replaceText(commonsFileName))
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        dismissWarningDialog()
+        dismissWarningDialog()
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        chooseCategoryAndLicense()
+
+        val fileUrl = "https://commons.wikimedia.beta.wmflabs.org/wiki/File:" +
+                commonsFileName.replace(' ', '_') + ".jpg"
+        Timber.i("File should be uploaded to $fileUrl")
+    }
+
+    @Test
+    fun testUploadWithDescription() {
+        if (!ConfigUtils.isBetaFlavour()) {
+            throw Error("This test should only be run in Beta!")
+        }
+
+        setupSingleUpload("image.jpg")
+
+        openGallery()
+
+        // Validate that an intent to get an image is sent
+        intended(allOf(hasAction(Intent.ACTION_GET_CONTENT), hasType("image/*")))
+
+        // Create filename with the current time (to prevent overwrites)
+        val dateFormat = SimpleDateFormat("yyMMdd-hhmmss")
+        val commonsFileName = "MobileTest " + dateFormat.format(Date())
+
+        // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
+        dismissWarningDialog()
+
+        onView(allOf<View>(withId(R.id.description_item_edit_text), withParent(withParent(withId(R.id.image_title_container)))))
+                .perform(replaceText(commonsFileName))
+
+        onView(withId(R.id.rv_descriptions)).perform(
+                RecyclerViewActions
+                        .actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(1,
+                                MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Test description")))
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        dismissWarningDialog()
+        dismissWarningDialog()
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        chooseCategoryAndLicense()
+
+        val fileUrl = "https://commons.wikimedia.beta.wmflabs.org/wiki/File:" +
+                commonsFileName.replace(' ', '_') + ".jpg"
+        Timber.i("File should be uploaded to $fileUrl")
+    }
+
+    @Test
+    fun testUploadWithMultilingualDescription() {
+        if (!ConfigUtils.isBetaFlavour()) {
+            throw Error("This test should only be run in Beta!")
+        }
+
+        setupSingleUpload("image.jpg")
+
+        openGallery()
+
+        // Validate that an intent to get an image is sent
+        intended(allOf(hasAction(Intent.ACTION_GET_CONTENT), hasType("image/*")))
+
+        // Create filename with the current time (to prevent overwrites)
+        val dateFormat = SimpleDateFormat("yyMMdd-hhmmss")
+        val commonsFileName = "MobileTest " + dateFormat.format(Date())
+
+        // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
+        dismissWarningDialog()
+
+        onView(allOf<View>(withId(R.id.description_item_edit_text), withParent(withParent(withId(R.id.image_title_container)))))
+                .perform(replaceText(commonsFileName))
+
+        onView(withId(R.id.rv_descriptions)).perform(
+                RecyclerViewActions
+                        .actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(1,
+                                MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Test description")))
+
+        onView(withId(R.id.bottom_card_add_desc))
+                .perform(click())
+
+        onView(withId(R.id.rv_descriptions)).perform(
+                RecyclerViewActions
+                        .actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(2,
+                                MyViewAction.selectSpinnerItemInChildViewWithId(R.id.spinner_description_languages, 2)))
+
+        onView(withId(R.id.rv_descriptions)).perform(
+                RecyclerViewActions
+                        .actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(2,
+                                MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Description")))
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        dismissWarningDialog()
+        dismissWarningDialog()
+
+        onView(withId(R.id.bottom_card_next))
+                .perform(click())
+
+        UITestHelper.sleep(1000)
+
+        chooseCategoryAndLicense()
+
+        val fileUrl = "https://commons.wikimedia.beta.wmflabs.org/wiki/File:" +
+                commonsFileName.replace(' ', '_') + ".jpg"
+        Timber.i("File should be uploaded to $fileUrl")
+    }
+
+    private fun setupSingleUpload(imageName: String) {
+        saveToInternalStorage(imageName)
+        singleImageIntent(imageName)
+    }
+
+    private fun saveToInternalStorage(imageName: String) {
         val bitmapImage = randomBitmap
 
         // path to /data/data/yourapp/app_data/imageDir
-        val mypath = File(Environment.getExternalStorageDirectory(), "image.jpg")
+        val mypath = File(Environment.getExternalStorageDirectory(), imageName)
 
         Timber.d("Filepath: %s", mypath.path)
 
@@ -100,15 +259,10 @@ class UploadTest {
         }
     }
 
-    @Test
-    fun uploadTest() {
-        if (!ConfigUtils.isBetaFlavour()) {
-            throw Error("This test should only be run in Beta!")
-        }
-
+    private fun singleImageIntent(imageName: String) {
         // Uri to return by our mock gallery selector
         // Requires file 'image.jpg' to be placed at root of file structure
-        val imageUri = Uri.parse("file://mnt/sdcard/image.jpg")
+        val imageUri = Uri.parse("file://mnt/sdcard/$imageName")
 
         // Build a result to return from the Camera app
         val intent = Intent()
@@ -118,37 +272,18 @@ class UploadTest {
         // Stub out the File picker. When an intent is sent to the File picker, this tells
         // Espresso to respond with the ActivityResult we just created
         intending(allOf(hasAction(Intent.ACTION_GET_CONTENT), hasType("image/*"))).respondWith(result)
+    }
 
-        // Open FAB
-        onView(allOf<View>(withId(R.id.fab_plus), isDisplayed()))
-                .perform(click())
-
-        // Click gallery
-        onView(allOf<View>(withId(R.id.fab_gallery), isDisplayed()))
-                .perform(click())
-
-        // Validate that an intent to get an image is sent
-        intended(allOf(hasAction(Intent.ACTION_GET_CONTENT), hasType("image/*")))
-
-        // Create filename with the current time (to prevent overwrites)
-        val dateFormat = SimpleDateFormat("yyMMdd-hhmmss")
-        val commonsFileName = "MobileTest " + dateFormat.format(Date())
-
-        // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
+    private fun dismissWarningDialog() {
         try {
             onView(withText("Yes"))
                     .check(matches(isDisplayed()))
                     .perform(click())
-        } catch (ignored: NoMatchingViewException) {}
-
-        onView(allOf<View>(withId(R.id.description_item_edit_text), withParent(withParent(withId(R.id.image_title_container)))))
-                .perform(replaceText(commonsFileName))
-
-        onView(withId(R.id.bottom_card_next))
-                .perform(click())
-
-        UITestHelper.sleep(1000)
+        } catch (ignored: NoMatchingViewException) {
+        }
+    }
 
+    private fun chooseCategoryAndLicense() {
         onView(withId(R.id.category_search))
                 .perform(replaceText("Uploaded with Mobile/Android Tests"))
 
@@ -166,9 +301,15 @@ class UploadTest {
                 .perform(click())
 
         UITestHelper.sleep(10000)
+    }
 
-        val fileUrl = "https://commons.wikimedia.beta.wmflabs.org/wiki/File:" +
-                commonsFileName.replace(' ', '_') + ".jpg"
-        Timber.i("File should be uploaded to $fileUrl")
+    private fun openGallery() {
+        // Open FAB
+        onView(allOf<View>(withId(R.id.fab_plus), isDisplayed()))
+                .perform(click())
+
+        // Click gallery
+        onView(allOf<View>(withId(R.id.fab_gallery), isDisplayed()))
+                .perform(click())
     }
 }

app/src/androidTest/java/fr/free/nrw/commons/util/MyViewAction.kt

@@ -0,0 +1,47 @@
+package fr.free.nrw.commons.util
+
+import android.view.View
+import android.widget.EditText
+import androidx.appcompat.widget.AppCompatSpinner
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Matcher
+
+class MyViewAction {
+    companion object {
+        fun typeTextInChildViewWithId(id: Int, textToBeTyped: String): ViewAction {
+            return object : ViewAction {
+                override fun getConstraints(): Matcher<View>? {
+                    return null
+                }
+
+                override fun getDescription(): String {
+                    return "Click on a child view with specified id."
+                }
+
+                override fun perform(uiController: UiController, view: View) {
+                    val v = view.findViewById<View>(id) as EditText
+                    v.setText(textToBeTyped)
+                }
+            }
+        }
+
+        fun selectSpinnerItemInChildViewWithId(id: Int, position: Int): ViewAction {
+            return object : ViewAction {
+                override fun getConstraints(): Matcher<View>? {
+                    return null
+                }
+
+                override fun getDescription(): String {
+                    return "Click on a child view with specified id."
+                }
+
+                override fun perform(uiController: UiController, view: View) {
+                    val v = view.findViewById<View>(id) as AppCompatSpinner
+                    v.setSelection(position)
+                }
+            }
+        }
+
+    }
+}

app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java

@@ -29,7 +29,7 @@
 import io.reactivex.subjects.Subject;
 import timber.log.Timber;
 
-class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapter.ViewHolder> {
+public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapter.ViewHolder> {
 
     private Title title;
     private List<Description> descriptions;

app/src/main/java/fr/free/nrw/commons/widget/HeightLimitedRecyclerView.java

@@ -2,11 +2,12 @@
 
 import android.app.Activity;
 import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Ilgaz Er on 8/7/2018.
  */