From 1893bbb8429f8361107c923684e8b69c0868e063 Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Wed, 31 Mar 2021 03:12:44 +0530 Subject: [PATCH 1/7] Fix #2536: Shift RecylerViewMatcher --- app/BUILD.bazel | 1 - .../AdministratorControlsActivityTest.kt | 34 ++++++++----------- .../CompletedStoryListActivityTest.kt | 2 +- .../android/app/faq/FAQListFragmentTest.kt | 4 +-- .../android/app/help/HelpFragmentTest.kt | 4 +-- .../android/app/home/HomeActivityTest.kt | 10 +++--- .../app/home/RecentlyPlayedFragmentTest.kt | 4 +-- .../OngoingTopicListActivityTest.kt | 2 +- .../app/options/OptionsFragmentTest.kt | 2 +- .../app/player/state/StateFragmentTest.kt | 2 +- .../app/profile/ProfileChooserFragmentTest.kt | 4 +-- .../ProfileProgressFragmentTest.kt | 2 +- .../app/recyclerview/BindableAdapterTest.kt | 2 +- .../profile/ProfileListFragmentTest.kt | 4 +-- .../android/app/story/StoryFragmentTest.kt | 6 ++-- .../app/testing/DragDropTestActivityTest.kt | 2 +- .../testing/TopicTestActivityForStoryTest.kt | 4 +-- .../android/app/topic/TopicFragmentTest.kt | 2 +- .../topic/lessons/TopicLessonsFragmentTest.kt | 4 +-- .../practice/TopicPracticeFragmentTest.kt | 2 +- .../QuestionPlayerActivityTest.kt | 2 +- .../revision/TopicRevisionFragmentTest.kt | 4 +-- .../WalkthroughFinalFragmentTest.kt | 2 +- .../WalkthroughTopicListFragmentTest.kt | 2 +- .../player/state/StateFragmentLocalTest.kt | 2 +- .../oppia/android/app/testing/HomeSpanTest.kt | 2 +- .../app/testing/RecentlyPlayedSpanTest.kt | 2 +- .../options/AppLanguageFragmentTest.kt | 2 +- .../options/AudioLanguageFragmentTest.kt | 2 +- .../testing/options/OptionsFragmentTest.kt | 2 +- .../options/ReadingTextSizeFragmentTest.kt | 2 +- .../state/StateFragmentAccessibilityTest.kt | 2 +- testing/BUILD.bazel | 1 + testing/build.gradle | 1 + .../android/testing}/RecyclerViewMatcher.kt | 19 ++++++++++- 35 files changed, 78 insertions(+), 66 deletions(-) rename {app/src/sharedTest/java/org/oppia/android/app/recyclerview => testing/src/main/java/org/oppia/android/testing}/RecyclerViewMatcher.kt (90%) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 7994cf00299..86957bab861 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -652,7 +652,6 @@ kt_android_library( testonly = True, srcs = [ "src/sharedTest/java/org/oppia/android/app/parser/RichTextViewMatcher.kt", - "src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt", "src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt", "src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt", "src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt", diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt index d67416a874f..cc3dfd0c5da 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt @@ -53,7 +53,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule import org.oppia.android.app.profile.ProfileChooserActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.settings.profile.ProfileListActivity import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -75,6 +74,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.verifyItemDisplayedOnRecyclerView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule @@ -138,7 +139,8 @@ class AdministratorControlsActivityTest { ) ).use { testCoroutineDispatchers.runCurrent() - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 0, targetView = R.id.general_text_view ) @@ -147,7 +149,8 @@ class AdministratorControlsActivityTest { targetViewId = R.id.edit_account_text_view, stringIdToMatch = R.string.administrator_controls_edit_account ) - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 1, targetView = R.id.profile_management_text_view ) @@ -172,12 +175,14 @@ class AdministratorControlsActivityTest { targetViewId = R.id.download_permissions_text_view, stringIdToMatch = R.string.administrator_controls_download_permissions_label ) - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 2, targetView = R.id.topic_update_on_wifi_constraint_layout ) scrollToPosition(position = 2) - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 2, targetView = R.id.auto_update_topic_constraint_layout ) @@ -193,7 +198,8 @@ class AdministratorControlsActivityTest { ).use { testCoroutineDispatchers.runCurrent() scrollToPosition(position = 3) - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 3, targetView = R.id.app_information_text_view ) @@ -202,7 +208,8 @@ class AdministratorControlsActivityTest { targetViewId = R.id.app_version_text_view, stringIdToMatch = R.string.administrator_controls_app_version ) - verifyItemDisplayedOnAdministratorControlListItem( + verifyItemDisplayedOnRecyclerView( + recyclerView = R.id.administrator_controls_list, itemPosition = 4, targetView = R.id.account_actions_text_view ) @@ -502,19 +509,6 @@ class AdministratorControlsActivityTest { return view.getParent() } - private fun verifyItemDisplayedOnAdministratorControlListItem( - itemPosition: Int, - targetView: Int - ) { - onView( - atPositionOnView( - recyclerViewId = R.id.administrator_controls_list, - position = itemPosition, - targetViewId = targetView - ) - ).check(matches(isDisplayed())) - } - private fun verifyTextOnAdministratorListItemAtPosition( itemPosition: Int, targetViewId: Int, diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt index f63b20606c7..676cda940d9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt @@ -39,7 +39,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -62,6 +61,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt index af43ee99ffe..98739531f40 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt @@ -36,8 +36,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.help.faq.FAQListActivity import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -57,6 +55,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestDispatcherModule import org.oppia.android.testing.TestLogReportingModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt index 12c3cbd4460..8e96c4f8d0f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt @@ -41,8 +41,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.help.faq.FAQListActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -63,6 +61,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestCoroutineDispatchers 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 c13be57adbc..77ed88849a9 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 @@ -49,11 +49,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule import org.oppia.android.app.profile.ProfileChooserActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridColumnCount -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -77,6 +72,11 @@ import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridColumnCount +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt index 6c75025a6a4..bbe685f0bde 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt @@ -47,8 +47,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -72,6 +70,8 @@ import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt index 8f0d3ebcc65..ac0c1d23864 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt @@ -35,7 +35,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -57,6 +56,7 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt index 72ed3425c1b..b405ac45ca4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt @@ -40,7 +40,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -60,6 +59,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt index df3f48dd9b0..1b663287d4b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewT import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION import org.oppia.android.app.player.state.testing.StateFragmentTestActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.ChildViewCoordinatesProvider import org.oppia.android.app.utility.CustomGeneralLocation @@ -115,6 +114,7 @@ import org.oppia.android.testing.CoroutineExecutorService import org.oppia.android.testing.EditTextInputAction import org.oppia.android.testing.IsOnRobolectric import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt index 7cf3623ed80..9f8445cefc2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt @@ -40,8 +40,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -62,6 +60,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index 7a7d03921b5..73f8d48459d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -54,7 +54,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -77,6 +76,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt index 02d0475ea98..e085320b8f0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt @@ -42,7 +42,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelModule import org.oppia.android.app.recyclerview.BindableAdapter.MultiTypeBuilder import org.oppia.android.app.recyclerview.BindableAdapter.SingleTypeBuilder -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.testing.BINDABLE_TEST_FRAGMENT_TAG @@ -74,6 +73,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt index a200c753e01..96df23fe478 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt @@ -33,8 +33,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -54,6 +52,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt index 2e75ee25374..3e4d9a257c2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt @@ -61,9 +61,6 @@ import org.oppia.android.app.customview.LessonThumbnailImageView import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.anyOrNull @@ -89,6 +86,9 @@ import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_STORY_ID_1 import org.oppia.android.domain.topic.TEST_TOPIC_ID_1 +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt index 6af8a054154..75ce10b1792 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.recyclerview.DragAndDropItemFacilitator import org.oppia.android.app.recyclerview.OnDragEndedListener import org.oppia.android.app.recyclerview.OnItemDragListener -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.ChildViewCoordinatesProvider import org.oppia.android.app.utility.CustomGeneralLocation @@ -50,6 +49,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestDispatcherModule import org.oppia.android.testing.TestLogReportingModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index 907659a8649..6878745ebab 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -28,8 +28,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicTab import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle @@ -50,6 +48,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt index 45b578a02aa..ac4de1371d1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt @@ -37,7 +37,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -60,6 +59,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index 995672d7df9..81507c79326 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -43,8 +43,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.story.StoryActivity import org.oppia.android.app.topic.TopicActivity @@ -71,6 +69,8 @@ import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index f156b304979..3e7c9da7ee1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -37,7 +37,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab @@ -61,6 +60,7 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index 8c742fc2ef0..383d8f8ddf8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -52,7 +52,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FEEDBACK import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -76,6 +75,7 @@ import org.oppia.android.domain.topic.FRACTIONS_SKILL_ID_0 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.testing.CoroutineExecutorService import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index 56442fa3e11..27fdb6c97c3 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -36,8 +36,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab @@ -62,6 +60,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt index 8396614b363..da05c356934 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt @@ -33,7 +33,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.ProgressMatcher.Companion.withProgress @@ -54,6 +53,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt index 12f2afa1166..6cc787e4545 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt @@ -32,7 +32,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -53,6 +52,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt index 9b7ab5b1ede..1534bf2ba29 100644 --- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt @@ -65,7 +65,6 @@ import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewT import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON import org.oppia.android.app.player.state.testing.StateFragmentTestActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationPortrait @@ -93,6 +92,7 @@ import org.oppia.android.testing.CoroutineExecutorService import org.oppia.android.testing.EditTextInputAction import org.oppia.android.testing.KonfettiViewMatcher.Companion.hasActiveConfetti import org.oppia.android.testing.KonfettiViewMatcher.Companion.hasExpectedNumberOfActiveSystems +import org.oppia.android.testing.RecyclerViewMatcher import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt index f84afa968df..1eeb7fac26a 100644 --- a/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt @@ -23,7 +23,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.home.HomeActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.domain.classify.InteractionsModule @@ -43,6 +42,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestDispatcherModule import org.oppia.android.testing.TestLogReportingModule diff --git a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt index c5a28926841..154be2c0bf8 100644 --- a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt @@ -25,7 +25,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.domain.classify.InteractionsModule @@ -45,6 +44,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt index cf96194d27d..26aa7ce1884 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt @@ -33,7 +33,6 @@ import org.oppia.android.app.options.APP_LANGUAGE import org.oppia.android.app.options.AppLanguageActivity import org.oppia.android.app.options.OptionsActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -53,6 +52,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/options/AudioLanguageFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/AudioLanguageFragmentTest.kt index 259b807fd09..ab0c650ce2e 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/AudioLanguageFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/AudioLanguageFragmentTest.kt @@ -33,7 +33,6 @@ import org.oppia.android.app.options.AUDIO_LANGUAGE import org.oppia.android.app.options.AudioLanguageActivity import org.oppia.android.app.options.OptionsActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -53,6 +52,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt index 83a9829ebbd..8a93f0c4c17 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt @@ -37,7 +37,6 @@ import org.oppia.android.app.options.READING_TEXT_SIZE import org.oppia.android.app.options.ReadingTextSizeActivity import org.oppia.android.app.options.ReadingTextSizeFragment import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.domain.classify.InteractionsModule import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule @@ -56,6 +55,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt index 2dc264d9703..a118c3cc471 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt @@ -41,7 +41,6 @@ import org.oppia.android.app.options.OptionsActivity import org.oppia.android.app.options.READING_TEXT_SIZE import org.oppia.android.app.options.ReadingTextSizeActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -61,6 +60,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt index 3e9a0ca9b80..fbda7122609 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.StateFragment import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule import org.oppia.android.app.player.state.testing.StateFragmentTestActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.domain.classify.InteractionsModule @@ -50,6 +49,7 @@ import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_4 import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.RecyclerViewMatcher import org.oppia.android.testing.RobolectricModule import org.oppia.android.testing.TestCoroutineDispatchers import org.oppia.android.testing.TestDispatcherModule diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index 08cd8a3a48a..ab9550bde83 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -19,6 +19,7 @@ kt_android_library( ":dagger", "//domain", "//third_party:androidx_lifecycle_lifecycle-livedata-ktx", + "//third_party:androidx_recyclerview_recyclerview", "//third_party:androidx_test_espresso_espresso-contrib", "//third_party:androidx_test_espresso_espresso-core", "//third_party:androidx_test_espresso_espresso-intents", diff --git a/testing/build.gradle b/testing/build.gradle index 288cfb530c8..0559e6af597 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -51,6 +51,7 @@ dependencies { implementation( 'androidx.annotation:annotation:1.1.0', 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03', + 'androidx.recyclerview:recyclerview:1.0.0', 'androidx.test.espresso:espresso-core:3.2.0', 'androidx.test:runner:1.2.0', 'com.google.dagger:dagger:2.24', diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt similarity index 90% rename from app/src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt rename to testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt index 2b4f16f78e4..a9f6764a930 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt +++ b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt @@ -1,12 +1,15 @@ -package org.oppia.android.app.recyclerview +package org.oppia.android.testing import android.content.res.Resources import android.view.View import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView +import androidx.test.espresso.Espresso.onView import androidx.test.espresso.NoMatchingViewException import androidx.test.espresso.ViewAssertion +import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.assertThat +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.Description import org.hamcrest.Matcher @@ -65,6 +68,20 @@ class RecyclerViewMatcher { } } + fun verifyItemDisplayedOnRecyclerView( + recyclerView: Int, + itemPosition: Int, + targetView: Int + ) { + onView( + atPositionOnView( + recyclerViewId = recyclerView, + position = itemPosition, + targetViewId = targetView + ) + ).check(matches(isDisplayed())) + } + /** Returns item count ViewAssertion for a recycler view. */ fun hasItemCount(count: Int): ViewAssertion { return RecyclerViewItemCountAssertion(count) From c9b66325f8f213c8d19a6ca9408739b0faadcffe Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Wed, 31 Mar 2021 03:14:59 +0530 Subject: [PATCH 2/7] nit fixes --- .../AdministratorControlsActivityTest.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt index cc3dfd0c5da..7b7d09d9018 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt @@ -140,7 +140,7 @@ class AdministratorControlsActivityTest { ).use { testCoroutineDispatchers.runCurrent() verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 0, targetView = R.id.general_text_view ) @@ -150,7 +150,7 @@ class AdministratorControlsActivityTest { stringIdToMatch = R.string.administrator_controls_edit_account ) verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 1, targetView = R.id.profile_management_text_view ) @@ -176,13 +176,13 @@ class AdministratorControlsActivityTest { stringIdToMatch = R.string.administrator_controls_download_permissions_label ) verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 2, targetView = R.id.topic_update_on_wifi_constraint_layout ) scrollToPosition(position = 2) verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 2, targetView = R.id.auto_update_topic_constraint_layout ) @@ -199,7 +199,7 @@ class AdministratorControlsActivityTest { testCoroutineDispatchers.runCurrent() scrollToPosition(position = 3) verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 3, targetView = R.id.app_information_text_view ) @@ -209,7 +209,7 @@ class AdministratorControlsActivityTest { stringIdToMatch = R.string.administrator_controls_app_version ) verifyItemDisplayedOnRecyclerView( - recyclerView = R.id.administrator_controls_list, + recyclerView = R.id.administrator_controls_list, itemPosition = 4, targetView = R.id.account_actions_text_view ) From b21d2d5e0df3c609a7f6f96f93e40b24ca3525e1 Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Wed, 7 Apr 2021 01:02:58 +0530 Subject: [PATCH 3/7] Add recycler view dependency to testing/build.gradle --- testing/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/build.gradle b/testing/build.gradle index ce90da0adce..aeea4b98359 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -51,6 +51,7 @@ dependencies { implementation( 'androidx.annotation:annotation:1.1.0', 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03', + 'androidx.recyclerview:recyclerview:1.0.0', "androidx.test:core:1.0.0", 'androidx.test.espresso:espresso-core:3.2.0', 'androidx.test:runner:1.2.0', From 7b1c1e6e955c7439d149109c471ec3eeb485cd99 Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Wed, 7 Apr 2021 12:25:25 +0530 Subject: [PATCH 4/7] Add KDoc --- .../java/org/oppia/android/testing/RecyclerViewMatcher.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt index a9f6764a930..6af82c9626f 100644 --- a/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt +++ b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt @@ -68,6 +68,10 @@ class RecyclerViewMatcher { } } + /** + * This function verifies item displayed for a specific view + * within the item inside RecyclerView from a specified position. + */ fun verifyItemDisplayedOnRecyclerView( recyclerView: Int, itemPosition: Int, From e14315edc711e24d8aec906b76862496cbd95aee Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Thu, 15 Apr 2021 21:10:13 +0530 Subject: [PATCH 5/7] Refactor imports --- .../AdministratorControlsActivityTest.kt | 2 +- .../CompletedStoryListActivityTest.kt | 2 +- .../org/oppia/android/app/faq/FAQListFragmentTest.kt | 4 ++-- .../org/oppia/android/app/help/HelpFragmentTest.kt | 4 ++-- .../org/oppia/android/app/home/HomeActivityTest.kt | 10 +++++----- .../android/app/home/RecentlyPlayedFragmentTest.kt | 4 ++-- .../ongoingtopiclist/OngoingTopicListActivityTest.kt | 2 +- .../oppia/android/app/options/OptionsFragmentTest.kt | 2 +- .../android/app/player/state/StateFragmentTest.kt | 2 +- .../android/app/profile/ProfileChooserFragmentTest.kt | 4 ++-- .../app/profileprogress/ProfileProgressFragmentTest.kt | 2 +- .../android/app/recyclerview/BindableAdapterTest.kt | 2 +- .../app/settings/profile/ProfileListFragmentTest.kt | 4 ++-- .../org/oppia/android/app/story/StoryFragmentTest.kt | 6 +++--- .../android/app/testing/DragDropTestActivityTest.kt | 2 +- .../app/testing/TopicTestActivityForStoryTest.kt | 4 ++-- .../org/oppia/android/app/topic/TopicFragmentTest.kt | 2 +- .../app/topic/lessons/TopicLessonsFragmentTest.kt | 4 ++-- .../app/topic/practice/TopicPracticeFragmentTest.kt | 2 +- .../topic/questionplayer/QuestionPlayerActivityTest.kt | 2 +- .../app/topic/revision/TopicRevisionFragmentTest.kt | 4 ++-- .../app/walkthrough/WalkthroughFinalFragmentTest.kt | 2 +- .../walkthrough/WalkthroughTopicListFragmentTest.kt | 2 +- 23 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt index 88f8fe468fa..4da443cc5ab 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt @@ -53,7 +53,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule import org.oppia.android.app.profile.ProfileChooserActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.settings.profile.ProfileListActivity import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -75,6 +74,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt index 3a313b28428..a0a111a917f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt @@ -39,7 +39,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -62,6 +61,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.story.StoryProgressTestHelper diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt index 164063bbc92..f914e5e354d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt @@ -36,8 +36,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.help.faq.FAQListActivity import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -57,6 +55,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt index 8e0da4cc005..7bfc8ee77fd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt @@ -41,8 +41,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.help.faq.FAQListActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -63,6 +61,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.TestPlatform 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 83db5ba95d2..517e95a4cad 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 @@ -49,11 +49,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule import org.oppia.android.app.profile.ProfileChooserActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridColumnCount -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -77,6 +72,11 @@ import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridColumnCount +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.TestPlatform diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt index 4fab8a62d08..5459cf860e8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt @@ -47,8 +47,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -72,6 +70,8 @@ import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasGridItemCount import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt index 78955618c2b..5054d025fde 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt @@ -38,7 +38,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -60,6 +59,7 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.story.StoryProgressTestHelper diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt index 89ab4cc9b45..622b27e2c00 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt @@ -40,7 +40,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -60,6 +59,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt index e2ed9261664..bfcde85e8c6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt @@ -78,7 +78,6 @@ import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewT import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION import org.oppia.android.app.player.state.testing.StateFragmentTestActivity -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.ChildViewCoordinatesProvider import org.oppia.android.app.utility.CustomGeneralLocation @@ -113,6 +112,7 @@ import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import org.oppia.android.testing.EditTextInputAction import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.TestPlatform diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt index bf81421b089..460b43e3180 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt @@ -40,8 +40,6 @@ import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -62,6 +60,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index c05ed9ac93d..9a6972ed5b4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -54,7 +54,7 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt index 37099c5e3f1..79db1c96259 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt @@ -42,7 +42,7 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelModule import org.oppia.android.app.recyclerview.BindableAdapter.MultiTypeBuilder import org.oppia.android.app.recyclerview.BindableAdapter.SingleTypeBuilder -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.testing.BINDABLE_TEST_FRAGMENT_TAG diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt index 00d71956450..9c62d3810f0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt @@ -33,8 +33,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt index cee72af1a5e..f2b88cec2ce 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt @@ -61,9 +61,9 @@ import org.oppia.android.app.customview.LessonThumbnailImageView import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasItemCount +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.anyOrNull diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt index 47afe2b3ad7..58a2cd5bf07 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.recyclerview.DragAndDropItemFacilitator import org.oppia.android.app.recyclerview.OnDragEndedListener import org.oppia.android.app.recyclerview.OnItemDragListener -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.ChildViewCoordinatesProvider import org.oppia.android.app.utility.CustomGeneralLocation @@ -50,6 +49,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestDispatcherModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index 6a6acff81e0..a81b7b7da94 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -28,8 +28,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicTab import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt index 143c4725f7f..7dd74721e4a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt @@ -37,7 +37,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -60,6 +59,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index 163aa5f20e5..fb5d092156d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -43,8 +43,8 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.story.StoryActivity import org.oppia.android.app.topic.TopicActivity diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index 9ca998a8709..8231fc67001 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -37,7 +37,7 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index 841dba4d98c..6934936205e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -55,7 +55,7 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FEEDBACK import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index 1f36830d73d..14bbf7eebf3 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -36,8 +36,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt index b687d64bcb6..e2051fca603 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt @@ -33,7 +33,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.ProgressMatcher.Companion.withProgress @@ -54,6 +53,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt index d23f4614395..0b71df51c70 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt @@ -32,7 +32,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -53,6 +52,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule From 3a62520abd6dea8591b89a867e3eb12e04ba0fa5 Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Thu, 15 Apr 2021 21:24:32 +0530 Subject: [PATCH 6/7] Refactor imports --- .../app/profileprogress/ProfileProgressFragmentTest.kt | 2 +- .../oppia/android/app/recyclerview/BindableAdapterTest.kt | 2 +- .../android/app/settings/profile/ProfileListFragmentTest.kt | 4 ++-- .../java/org/oppia/android/app/story/StoryFragmentTest.kt | 6 +++--- .../android/app/testing/TopicTestActivityForStoryTest.kt | 4 ++-- .../android/app/topic/lessons/TopicLessonsFragmentTest.kt | 4 ++-- .../android/app/topic/practice/TopicPracticeFragmentTest.kt | 2 +- .../app/topic/questionplayer/QuestionPlayerActivityTest.kt | 2 +- .../android/app/topic/revision/TopicRevisionFragmentTest.kt | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index 9a6972ed5b4..2fda9d6194f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -54,7 +54,6 @@ import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.ProfileId import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape @@ -77,6 +76,7 @@ import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_STORY_ID_0 import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt index 79db1c96259..90b5b11442f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt @@ -42,7 +42,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelModule import org.oppia.android.app.recyclerview.BindableAdapter.MultiTypeBuilder import org.oppia.android.app.recyclerview.BindableAdapter.SingleTypeBuilder -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.app.shim.IntentFactoryShimModule import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.testing.BINDABLE_TEST_FRAGMENT_TAG @@ -74,6 +73,7 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.assertThrows import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt index 9c62d3810f0..0030fbd49bc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt @@ -33,8 +33,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -54,6 +52,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt index f2b88cec2ce..de4d0a08b8e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt @@ -61,9 +61,6 @@ import org.oppia.android.app.customview.LessonThumbnailImageView import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.app.utility.anyOrNull @@ -89,6 +86,9 @@ import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.TEST_STORY_ID_1 import org.oppia.android.domain.topic.TEST_TOPIC_ID_1 +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.testing.RecyclerViewMatcher.Companion.hasItemCount import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.profile.ProfileTestHelper import org.oppia.android.testing.robolectric.RobolectricModule diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index a81b7b7da94..9af3d6c0c09 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -28,8 +28,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicTab import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle @@ -50,6 +48,8 @@ import org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerModule import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfigurationModule import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index fb5d092156d..df147e4c146 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -43,8 +43,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.story.StoryActivity import org.oppia.android.app.topic.TopicActivity @@ -71,6 +69,8 @@ import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.story.StoryProgressTestHelper diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index 8231fc67001..a533b641380 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -37,7 +37,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab @@ -61,6 +60,7 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule import org.oppia.android.testing.threading.TestCoroutineDispatchers diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index 6934936205e..81db732bf41 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -55,7 +55,6 @@ import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfi import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FEEDBACK import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.oppia.android.domain.classify.InteractionsModule @@ -78,6 +77,7 @@ import org.oppia.android.domain.question.QuestionTrainingSeed import org.oppia.android.domain.topic.FRACTIONS_SKILL_ID_0 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule import org.oppia.android.testing.OppiaTestRule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.TestPlatform diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index 14bbf7eebf3..b0463e5f995 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -36,8 +36,6 @@ import org.oppia.android.app.application.ApplicationInjectorProvider import org.oppia.android.app.application.ApplicationModule import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition -import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.app.shim.ViewBindingShimModule import org.oppia.android.app.topic.TopicActivity import org.oppia.android.app.topic.TopicTab @@ -62,6 +60,8 @@ import org.oppia.android.domain.oppialogger.loguploader.WorkManagerConfiguration import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.testing.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.android.testing.TestImageLoaderModule import org.oppia.android.testing.TestLogReportingModule import org.oppia.android.testing.robolectric.RobolectricModule From 094270c35a7eb76f903a364929cb30ee77930a50 Mon Sep 17 00:00:00 2001 From: Sparsh1212 Date: Thu, 15 Apr 2021 21:37:09 +0530 Subject: [PATCH 7/7] work on suggestions --- .../org/oppia/android/testing/RecyclerViewMatcher.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt index 6af82c9626f..17e2e20279d 100644 --- a/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt +++ b/testing/src/main/java/org/oppia/android/testing/RecyclerViewMatcher.kt @@ -69,19 +69,19 @@ class RecyclerViewMatcher { } /** - * This function verifies item displayed for a specific view + * Verifies that the item is displayed for a specific view * within the item inside RecyclerView from a specified position. */ fun verifyItemDisplayedOnRecyclerView( - recyclerView: Int, + recyclerViewId: Int, itemPosition: Int, - targetView: Int + targetViewId: Int ) { onView( atPositionOnView( - recyclerViewId = recyclerView, + recyclerViewId = recyclerViewId, position = itemPosition, - targetViewId = targetView + targetViewId = targetViewId ) ).check(matches(isDisplayed())) }