Fix tests

Author: maskaravivek

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

@@ -9,8 +9,12 @@ import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.rule.ActivityTestRule
 import org.apache.commons.lang3.StringUtils
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
 import timber.log.Timber
 
+
 class UITestHelper {
     companion object {
         fun skipWelcome() {
@@ -34,7 +38,7 @@ class UITestHelper {
                 closeSoftKeyboard()
                 onView(ViewMatchers.withId(R.id.login_button))
                         .perform(ViewActions.click())
-                sleep(5000)
+                sleep(10000)
             } catch (ignored: NoMatchingViewException) {
             }
 
@@ -68,5 +72,22 @@ class UITestHelper {
             activityRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
             assert(activityRule.activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
         }
+
+        fun <T> first(matcher: Matcher<T>): Matcher<T>? {
+            return object : BaseMatcher<T>() {
+                var isFirst = true
+                override fun matches(item: Any): Boolean {
+                    if (isFirst && matcher.matches(item)) {
+                        isFirst = false
+                        return true
+                    }
+                    return false
+                }
+
+                override fun describeTo(description: Description) {
+                    description.appendText("should return first matching item")
+                }
+            }
+        }
     }
 }

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

@@ -8,6 +8,7 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Environment
 import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.action.ViewActions.click
@@ -116,7 +117,7 @@ class UploadTest {
         UITestHelper.sleep(3000)
 
         try {
-            onView(allOf(isDisplayed(), withParent(withId(R.id.rv_categories))))
+            onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))
                     .perform(click())
         } catch (ignored: NoMatchingViewException) {
         }
@@ -173,18 +174,18 @@ class UploadTest {
         onView(allOf(isDisplayed(), withId(R.id.btn_next)))
                 .perform(click())
 
-        UITestHelper.sleep(5000)
+        UITestHelper.sleep(10000)
         dismissWarning("Yes")
 
         UITestHelper.sleep(3000)
 
         onView(allOf(isDisplayed(), withId(R.id.et_search)))
-                .perform(replaceText("Uploaded with Mobile/Android Tests"))
+                .perform(replaceText("Test"))
 
         UITestHelper.sleep(3000)
 
         try {
-            onView(allOf(isDisplayed(), withParent(withId(R.id.rv_categories))))
+            onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))
                     .perform(click())
         } catch (ignored: NoMatchingViewException) {
         }
@@ -261,7 +262,7 @@ class UploadTest {
         UITestHelper.sleep(3000)
 
         try {
-            onView(allOf(isDisplayed(), withParent(withId(R.id.rv_categories))))
+            onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))
                     .perform(click())
         } catch (ignored: NoMatchingViewException) {
         }