From 354ace598e7d83485fd7b290e6ddf9eaf72c6f1f Mon Sep 17 00:00:00 2001 From: Yuri Lev Date: Fri, 29 Jan 2021 22:35:20 +0200 Subject: [PATCH 1/4] Use the `verifyHomeRecyclerViewHasGridColumnCount` helper in one applicable test where it isn't used yet. --- .../java/org/oppia/android/app/home/HomeActivityTest.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt index 7c72a90b908..1dec960be58 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt @@ -636,10 +636,8 @@ class HomeActivityTest { launch(createHomeActivityIntent(internalProfileId)).use { testCoroutineDispatchers.runCurrent() scrollToPosition(position = 3) - onView(withId(R.id.home_recycler_view)).check( - // The "All Topics" section currently should display the four test topics in two rows. - hasGridColumnCount(2) - ) + // The "All Topics" section currently should display the four test topics in two rows. + verifyHomeRecyclerViewHasGridColumnCount(columnCount = 2) } } From a6f75da0f9f28529a86377f7dafa51002e5b15bf Mon Sep 17 00:00:00 2001 From: Yuri Lev Date: Fri, 29 Jan 2021 22:55:35 +0200 Subject: [PATCH 2/4] Fix typo. --- .../java/org/oppia/android/app/home/HomeActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt index 1dec960be58..3a7995cd257 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt @@ -673,7 +673,7 @@ class HomeActivityTest { @Config(qualifiers = "land") @Test - fun testHomeActivity_noTopicsStarted_mobileLandspaceDisplaysTopicsIn3Columns() { + fun testHomeActivity_noTopicsStarted_mobileLandscapeDisplaysTopicsIn3Columns() { // Only new users will have no progress for any topics. profileTestHelper.logIntoNewUser() launch(createHomeActivityIntent(internalProfileId)).use { From 20d13731ba50312044bd12ced6549c7213837fa7 Mon Sep 17 00:00:00 2001 From: Yuri Lev Date: Fri, 29 Jan 2021 22:58:56 +0200 Subject: [PATCH 3/4] Remove incorrect/confusing comment. What is actually being verified is the number of columns. In this instance, it's true that there are also two rows, but none of the similar tests check the number of rows, so I assume the reference was unintentional. --- .../java/org/oppia/android/app/home/HomeActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt index 3a7995cd257..afae6620c45 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt @@ -636,7 +636,6 @@ class HomeActivityTest { launch(createHomeActivityIntent(internalProfileId)).use { testCoroutineDispatchers.runCurrent() scrollToPosition(position = 3) - // The "All Topics" section currently should display the four test topics in two rows. verifyHomeRecyclerViewHasGridColumnCount(columnCount = 2) } } From 37a79986fafebab72ff93bf5dd4d5cd107f38e99 Mon Sep 17 00:00:00 2001 From: Yuri Lev Date: Mon, 1 Feb 2021 20:07:36 +0200 Subject: [PATCH 4/4] Empty commit to retrigger CI tests.