Fixes part of #935: Optimised test cases for HDPI devices ( Packages M-P)

app/src/sharedTest/java/org/oppia/app/options/OptionsFragmentTest.kt

@@ -14,6 +14,7 @@ import androidx.test.espresso.action.GeneralClickAction
 import androidx.test.espresso.action.Press
 import androidx.test.espresso.action.Tap
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.DrawerMatchers
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
@@ -335,6 +336,7 @@ class OptionsFragmentTest {
         )
       onView(isRoot()).perform(orientationLandscape())
       onView(withContentDescription(R.string.go_to_previous_page)).perform(click())
+      swipeUp()
       onView(atPositionOnView(R.id.options_recyclerview, 2, R.id.audio_language_text_view)).check(
         matches(withText("Chinese"))
       )

app/src/sharedTest/java/org/oppia/app/profile/AdminPinActivityTest.kt

@@ -78,7 +78,7 @@ class AdminPinActivityTest {
         typeText("12345"),
         closeSoftKeyboard()
       )
-      onView(withId(R.id.submit_button)).perform(click())
+      onView(withId(R.id.submit_button)).perform(scrollTo()).perform(click())
       intended(hasComponent(AddProfileActivity::class.java.name))
     }
   }
@@ -96,7 +96,7 @@ class AdminPinActivityTest {
           typeText("12345"),
           closeSoftKeyboard()
         )
-        onView(withId(R.id.submit_button)).perform(click())
+        onView(withId(R.id.submit_button)).perform(scrollTo()).perform(click())
         intended(hasComponent(AdministratorControlsActivity::class.java.name))
       }
   }
@@ -140,7 +140,7 @@ class AdminPinActivityTest {
         typeText("1234"),
         closeSoftKeyboard()
       )
-      onView(withId(R.id.submit_button)).perform(click())
+      onView(withId(R.id.submit_button)).perform(scrollTo()).perform(click())
       onView(allOf(withId(R.id.error_text), isDescendantOfA(withId(R.id.input_confirm_pin)))).check(
         matches(
           withText(
@@ -162,7 +162,7 @@ class AdminPinActivityTest {
         typeText("1234"),
         closeSoftKeyboard()
       )
-      onView(withId(R.id.submit_button)).perform(click())
+      onView(withId(R.id.submit_button)).perform(scrollTo()).perform(click())
       onView(allOf(withId(R.id.input), isDescendantOfA(withId(R.id.input_confirm_pin)))).perform(
         typeText("5"),
         closeSoftKeyboard()
@@ -310,7 +310,7 @@ class AdminPinActivityTest {
         typeText("54321"),
         closeSoftKeyboard()
       )
-      onView(withId(R.id.submit_button)).perform(click())
+      onView(withId(R.id.submit_button)).perform(scrollTo()).perform(click())
       onView(isRoot()).perform(orientationLandscape())
       onView(
         allOf(

app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt

@@ -1,7 +1,10 @@
 package org.oppia.app.profile
 
+import android.app.Activity
+import android.app.ActivityManager
 import android.app.Application
 import android.content.Context
+import android.content.Context.ACTIVITY_SERVICE
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
@@ -19,6 +22,10 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
+import androidx.test.runner.lifecycle.Stage
 import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
@@ -49,6 +56,9 @@ import javax.inject.Inject
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
+private const val TIMEOUT = 1000L
+private const val CONDITION_CHECK_INTERVAL = 100L
+
 @RunWith(AndroidJUnit4::class)
 class PinPasswordActivityTest {
 
@@ -103,7 +113,9 @@ class PinPasswordActivityTest {
         adminId
       )
     ).use {
-      onView(withId(R.id.input_pin)).perform(typeText("12345"))
+      closeSoftKeyboard()
+      onView(withId(R.id.input_pin)).perform(typeText("12345"), closeSoftKeyboard())
+      waitUntilActivityVisible<HomeActivity>()
       intended(hasComponent(HomeActivity::class.java.name))
     }
   }
@@ -118,6 +130,7 @@ class PinPasswordActivityTest {
       )
     ).use {
       onView(withId(R.id.input_pin)).perform(typeText("123"))
+      waitUntilActivityVisible<HomeActivity>()
       intended(hasComponent(HomeActivity::class.java.name))
     }
   }
@@ -132,7 +145,8 @@ class PinPasswordActivityTest {
         adminId
       )
     ).use {
-      onView(withId(R.id.input_pin)).perform(typeText("54321"), closeSoftKeyboard())
+      closeSoftKeyboard()
+      onView(withId(R.id.input_pin)).perform(closeSoftKeyboard()).perform(typeText("54321"), closeSoftKeyboard())
       onView(withText(context.getString(R.string.pin_password_incorrect_pin))).check(matches(isDisplayed()))
     }
   }
@@ -283,6 +297,7 @@ class PinPasswordActivityTest {
       onView(withText(context.getString(R.string.admin_settings_submit))).perform(click())
       onView(withText(context.getString(R.string.pin_password_close))).perform(click())
       onView(withId(R.id.input_pin)).perform(typeText("321"))
+      waitUntilActivityVisible<HomeActivity>()
       intended(hasComponent(HomeActivity::class.java.name))
     }
   }
@@ -443,6 +458,8 @@ class PinPasswordActivityTest {
         adminId
       )
     ).use {
+      closeSoftKeyboard()
+      closeSoftKeyboard()
       onView(withId(R.id.input_pin)).perform(typeText("54321"), closeSoftKeyboard())
       onView(isRoot()).perform(orientationLandscape())
       onView(withText(context.getString(R.string.pin_password_incorrect_pin))).check(matches(isDisplayed()))
@@ -520,6 +537,7 @@ class PinPasswordActivityTest {
         adminId
       )
     ).use {
+      closeSoftKeyboard()
       onView(withId(R.id.input_pin)).perform(typeText(""), closeSoftKeyboard())
       onView(withId(R.id.show_pin)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
@@ -528,6 +546,35 @@ class PinPasswordActivityTest {
     }
   }
 
+  private fun getCurrentActivity(): Activity? {
+    var currentActivity: Activity? = null
+    getInstrumentation().runOnMainSync {
+      run {
+        currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(
+          Stage.RESUMED
+        ).elementAtOrNull(0)
+      }
+    }
+    return currentActivity
+  }
+
+  private inline fun <reified T : Activity> isVisible(): Boolean {
+    val am =
+      InstrumentationRegistry.getInstrumentation().targetContext.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+    val visibleActivityName = this.getCurrentActivity()!!::class.java.name
+    return visibleActivityName == T::class.java.name
+  }
+
+  private inline fun <reified T : Activity> waitUntilActivityVisible() {
+    val startTime = System.currentTimeMillis()
+    while (!isVisible<T>()) {
+      Thread.sleep(CONDITION_CHECK_INTERVAL)
+      if (System.currentTimeMillis() - startTime >= TIMEOUT) {
+        throw AssertionError("Activity ${T::class.java.simpleName} not visible after $TIMEOUT milliseconds")
+      }
+    }
+  }
+
   @Qualifier annotation class TestDispatcher
 
   // TODO(#89): Move this to a common test application component.

app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt

@@ -1,7 +1,10 @@
 package org.oppia.app.profile
 
+import android.app.Activity
+import android.app.ActivityManager
 import android.app.Application
 import android.content.Context
+import android.content.Context.ACTIVITY_SERVICE
 import android.content.Intent
 import android.content.res.Resources
 import android.widget.TextView
@@ -26,6 +29,10 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
+import androidx.test.runner.lifecycle.Stage
 import com.google.common.truth.Truth.assertThat
 import dagger.BindsInstance
 import dagger.Component
@@ -61,6 +68,9 @@ import javax.inject.Inject
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
+private const val TIMEOUT = 1000L
+private const val CONDITION_CHECK_INTERVAL = 100L
+
 @RunWith(AndroidJUnit4::class)
 class ProfileChooserFragmentTest {
 
@@ -323,6 +333,7 @@ class ProfileChooserFragmentTest {
     )
     launch<ProfileActivity>(createProfileActivityIntent()).use {
       onView(atPosition(R.id.profile_recycler_view, 1)).perform(click())
+      waitUntilActivityVisible<AdminPinActivity>()
       intended(hasComponent(AdminPinActivity::class.java.name))
     }
   }
@@ -408,6 +419,35 @@ class ProfileChooserFragmentTest {
     }
   }
 
+  private fun getCurrentActivity(): Activity? {
+    var currentActivity: Activity? = null
+    getInstrumentation().runOnMainSync {
+      run {
+        currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(
+          Stage.RESUMED
+        ).elementAtOrNull(0)
+      }
+    }
+    return currentActivity
+  }
+
+  private inline fun <reified T : Activity> isVisible(): Boolean {
+    val am =
+      InstrumentationRegistry.getInstrumentation().targetContext.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+    val visibleActivityName = this.getCurrentActivity()!!::class.java.name
+    return visibleActivityName == T::class.java.name
+  }
+
+  private inline fun <reified T : Activity> waitUntilActivityVisible() {
+    val startTime = System.currentTimeMillis()
+    while (!isVisible<T>()) {
+      Thread.sleep(CONDITION_CHECK_INTERVAL)
+      if (System.currentTimeMillis() - startTime >= TIMEOUT) {
+        throw AssertionError("Activity ${T::class.java.simpleName} not visible after $TIMEOUT milliseconds")
+      }
+    }
+  }
+
   private fun createProfileActivityIntent(): Intent {
     return ProfileActivity.createProfileActivity(ApplicationProvider.getApplicationContext())
   }