[WIP] Adding Espresso test for orientation change (commons-app#2814)

vanshikaarora · maskaravivek · commit 4578600c1ea4 · 2019-04-02T09:04:05.000+05:30
* first commit

* initial commit

* added UI test for more activities

* added more tests

* improved code quality

* reverted code
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/AchievementsActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/AchievementsActivityTest.kt
@@ -16,7 +16,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@MediumTest
 @RunWith(AndroidJUnit4::class)
 class AchievementsActivityTest {
     @get:Rule
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/CategoryImagesActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/CategoryImagesActivityTest.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons
+
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import fr.free.nrw.commons.category.CategoryImagesActivity
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CategoryImagesActivityTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(CategoryImagesActivity::class.java)
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/ExploreActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/ExploreActivityTest.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons
+
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import fr.free.nrw.commons.explore.categories.ExploreActivity
+
+@RunWith(AndroidJUnit4::class)
+class ExploreActivityTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(ExploreActivity::class.java)
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt
@@ -11,7 +11,6 @@ import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.matcher.IntentMatchers.isInternal
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
 import fr.free.nrw.commons.auth.LoginActivity
@@ -23,8 +22,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
-@MediumTest
 @RunWith(AndroidJUnit4::class)
 class LoginActivityTest {
     @get:Rule
@@ -53,4 +50,9 @@ class LoginActivityTest {
                 .perform(ViewActions.click())
         Intents.intended(CoreMatchers.allOf(IntentMatchers.hasAction(Intent.ACTION_VIEW), IntentMatchers.hasData(BuildConfig.FORGOT_PASSWORD_URL)));
     }
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
 }
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons
+
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import fr.free.nrw.commons.contributions.MainActivity
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/NavigationBaseActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/NavigationBaseActivityTest.kt
@@ -47,4 +47,9 @@ class NavigationBaseActivityTest {
         UITestHelper.sleep(500)
         onView(withId(R.id.navigation_view)).perform(NavigationViewActions.navigateTo(menuItemId))
     }
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
 }
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons
+
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import fr.free.nrw.commons.explore.SearchActivity
+
+@RunWith(AndroidJUnit4::class)
+class SearchActivityTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(SearchActivity::class.java)
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt
@@ -150,4 +150,9 @@ class SettingsActivityTest {
                 .inAdapterView(withId(android.R.id.list))
                 .check(matches(not(isEnabled())))
     }
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
 }
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/SignupTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SignupTest.kt
@@ -8,7 +8,6 @@ import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
 import fr.free.nrw.commons.auth.LoginActivity
@@ -18,7 +17,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@MediumTest
 @RunWith(AndroidJUnit4::class)
 class SignupTest {
     @get:Rule
@@ -43,4 +41,9 @@ class SignupTest {
         intended(hasComponent(SignupActivity::class.java.name))
         Intents.release()
     }
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
 }
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt b/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt
@@ -1,10 +1,13 @@
 package fr.free.nrw.commons
 
+import android.app.Activity
+import android.content.pm.ActivityInfo
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.rule.ActivityTestRule
 import fr.free.nrw.commons.utils.StringUtils
 import timber.log.Timber
 
@@ -57,5 +60,11 @@ class UITestHelper {
                 throw NotImplementedError("Configure your beta account's password")
             } else return password
         }
+        fun <T: Activity> changeOrientation(activityRule: ActivityTestRule<T>){
+            activityRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            assert(activityRule.activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+            activityRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            assert(activityRule.activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
+        }
     }
 }
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/UploadActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/UploadActivityTest.kt
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons
+
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import fr.free.nrw.commons.upload.UploadActivity
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class UploadActivityTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(UploadActivity::class.java)
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt
@@ -98,4 +98,9 @@ class WelcomeActivityTest {
                     assert(activityRule.activity.isDestroyed)
                 }}
     }
+
+    @Test
+    fun orientationChange() {
+        UITestHelper.changeOrientation(activityRule)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,9 @@ class NavigationBaseActivityTest {`
`47`	`47`	`UITestHelper.sleep(500)`
`48`	`48`	`onView(withId(R.id.navigation_view)).perform(NavigationViewActions.navigateTo(menuItemId))`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ @Test`
	`52`	`+ fun orientationChange() {`
	`53`	`+ UITestHelper.changeOrientation(activityRule)`
	`54`	`+ }`
`50`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,4 +150,9 @@ class SettingsActivityTest {`
`150`	`150`	`.inAdapterView(withId(android.R.id.list))`
`151`	`151`	`.check(matches(not(isEnabled())))`
`152`	`152`	`}`
	`153`	`+`
	`154`	`+ @Test`
	`155`	`+ fun orientationChange() {`
	`156`	`+ UITestHelper.changeOrientation(activityRule)`
	`157`	`+ }`
`153`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,9 @@ class WelcomeActivityTest {`
`98`	`98`	`assert(activityRule.activity.isDestroyed)`
`99`	`99`	`}}`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+ @Test`
	`103`	`+ fun orientationChange() {`
	`104`	`+ UITestHelper.changeOrientation(activityRule)`
	`105`	`+ }`
`101`	`106`	`}`