From b0d2c72fa03cd3722e62ecd8a0b0b83461f9819e Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Sat, 25 Nov 2023 08:17:59 +0530 Subject: [PATCH 01/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index e1cce42d8f3..05f07633c87 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1079,7 +1079,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") + // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() { getApplicationDependencies( internalProfileId, @@ -1097,7 +1097,7 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { - waitForTheView(withText("What is a Ratio?")) + // waitForTheView(withText("What is a Ratio?")) onView(withId(R.id.action_audio_player)).perform(click()) onView( allOf( From 7e092caa9b260cafc8dfbf6bb067a0b99c09b4f9 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Sat, 25 Nov 2023 09:11:39 +0530 Subject: [PATCH 02/68] Fixing tests --- .../player/exploration/ExplorationActivityTest.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 05f07633c87..904e8e608c2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1081,13 +1081,8 @@ class ExplorationActivityTest { @Test // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() { - getApplicationDependencies( - internalProfileId, - RATIOS_TOPIC_ID, - RATIOS_STORY_ID_0, - RATIOS_EXPLORATION_ID_0 - ) - networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) + markAllSpotlightsSeen() + setUpAudio() launch( createExplorationActivityIntent( internalProfileId, @@ -1097,6 +1092,12 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { + explorationDataController.startPlayingNewExploration( + internalProfileId, + RATIOS_TOPIC_ID, + RATIOS_STORY_ID_0, + RATIOS_EXPLORATION_ID_0 + ) // waitForTheView(withText("What is a Ratio?")) onView(withId(R.id.action_audio_player)).perform(click()) onView( From 17de4874267905d28ab3db047fbafe190c01fa62 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Sat, 25 Nov 2023 09:46:53 +0530 Subject: [PATCH 03/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 904e8e608c2..d0e98d6ae3e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1099,7 +1099,7 @@ class ExplorationActivityTest { RATIOS_EXPLORATION_ID_0 ) // waitForTheView(withText("What is a Ratio?")) - onView(withId(R.id.action_audio_player)).perform(click()) + onView(withId(R.id.audio_bar_container)).perform(click()) onView( allOf( withId(R.id.play_pause_audio_icon), From 767dbabdd05fff441c37968979dc81b9df74e1ec Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Sat, 25 Nov 2023 21:49:17 +0530 Subject: [PATCH 04/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d0e98d6ae3e..c3b6ae9dc01 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1099,7 +1099,11 @@ class ExplorationActivityTest { RATIOS_EXPLORATION_ID_0 ) // waitForTheView(withText("What is a Ratio?")) + networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) + testCoroutineDispatchers.runCurrent() onView(withId(R.id.audio_bar_container)).perform(click()) + + testCoroutineDispatchers.runCurrent() onView( allOf( withId(R.id.play_pause_audio_icon), From 68a4d99e92b19a224a4d497c55be9d7e11d778ab Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 08:22:37 +0530 Subject: [PATCH 05/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index c3b6ae9dc01..0a5b25a700d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1098,25 +1098,18 @@ class ExplorationActivityTest { RATIOS_STORY_ID_0, RATIOS_EXPLORATION_ID_0 ) - // waitForTheView(withText("What is a Ratio?")) networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) testCoroutineDispatchers.runCurrent() - onView(withId(R.id.audio_bar_container)).perform(click()) + onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() - onView( - allOf( - withId(R.id.play_pause_audio_icon), - withEffectiveVisibility(Visibility.VISIBLE) - ) - ) - onView(allOf(withId(R.id.audio_language_icon), withEffectiveVisibility(Visibility.VISIBLE))) + onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) + onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) onView(withId(R.id.play_pause_audio_icon)).check( matches( - withDrawable( - R.drawable.ic_pause_circle_filled_white_24dp - ) + withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) ) ) } From 88891119a0aadbb2d23d6b9e479957a97ad31434 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 08:53:34 +0530 Subject: [PATCH 06/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 0a5b25a700d..52ed54cc1c5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1112,6 +1112,8 @@ class ExplorationActivityTest { withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) ) ) + + onView(withText("What is a Ratio?")) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 58daf6927c2527d4f1e984d05a1428b562f22b57 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 09:29:43 +0530 Subject: [PATCH 07/68] Fixed testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 52ed54cc1c5..216f45b7715 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1077,9 +1077,7 @@ class ExplorationActivityTest { explorationDataController.stopPlayingExploration(isCompletion = false) } - // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_audioIcon_audioFragHasDefaultLangAndAutoPlays() { markAllSpotlightsSeen() setUpAudio() From 5a836e2d00fbb7f8f2979cb648fb440320181caa Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 09:50:17 +0530 Subject: [PATCH 08/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 216f45b7715..6d319db6815 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1181,13 +1181,20 @@ class ExplorationActivityTest { @Test @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { - getApplicationDependencies( - internalProfileId, - RATIOS_TOPIC_ID, - RATIOS_STORY_ID_0, - RATIOS_EXPLORATION_ID_0 - ) - networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) + /*{ + onView(withId(R.id.text_input_interaction_view)).perform( + editTextInputAction.appendText("123"), + closeSoftKeyboard() + ) + onView(withId(R.id.submit_answer_button)).perform(click()) + Thread.sleep(1000) + + onView(withId(R.id.play_pause_audio_icon)) + .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) + }*/ + + markAllSpotlightsSeen() + setUpAudio() launch( createExplorationActivityIntent( internalProfileId, @@ -1197,7 +1204,15 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { - waitForTheView(withText("What is a Ratio?")) + explorationDataController.startPlayingNewExploration( + internalProfileId, + RATIOS_TOPIC_ID, + RATIOS_STORY_ID_0, + RATIOS_EXPLORATION_ID_0 + ) + networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) + testCoroutineDispatchers.runCurrent() + // Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) @@ -1206,15 +1221,24 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.action_audio_player)).perform(click()) + + testCoroutineDispatchers.runCurrent() onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() ) - onView(withId(R.id.submit_answer_button)).perform(click()) - Thread.sleep(1000) - onView(withId(R.id.play_pause_audio_icon)) - .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) + /*onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) + onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) + + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) + onView(withId(R.id.play_pause_audio_icon)).check( + matches( + withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) + ) + ) + + onView(withText("What is a Ratio?"))*/ } explorationDataController.stopPlayingExploration(isCompletion = false) } From d3d1c004fdff0713be61301ebfe8fa2b2bd8f543 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 09:50:48 +0530 Subject: [PATCH 09/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 6d319db6815..d63d2c95628 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1179,7 +1179,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") + // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { /*{ onView(withId(R.id.text_input_interaction_view)).perform( From 7e31f00c46d9118662ace2ce66e78d5009205664 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 29 Nov 2023 10:05:14 +0530 Subject: [PATCH 10/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d63d2c95628..4a91c984927 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1220,13 +1220,13 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.action_audio_player)).perform(click()) + /*onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() - ) + )*/ /*onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) From ba9d51c9c9bc0bb54d6e06446077b7f780910ba3 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:19:02 +0530 Subject: [PATCH 11/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4a91c984927..c3ba2549711 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1214,11 +1214,11 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() // Clicks continue until we reach the first interaction. + /*onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click())*/ /*onView(withId(R.id.action_audio_player)).perform(click()) From 6007c0421cabe207949fc5216e5e12f4fbc31925 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:21:52 +0530 Subject: [PATCH 12/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index c3ba2549711..452abf4f914 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,7 +18,6 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder @@ -43,6 +42,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.ActivityTestRule import com.google.common.truth.Truth.assertThat import dagger.Component +import java.io.IOException +import java.util.concurrent.TimeoutException +import javax.inject.Inject +import javax.inject.Singleton import org.hamcrest.BaseMatcher import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.containsString @@ -166,10 +169,6 @@ import org.oppia.android.util.parser.image.GlideImageLoaderModule import org.oppia.android.util.parser.image.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode -import java.io.IOException -import java.util.concurrent.TimeoutException -import javax.inject.Inject -import javax.inject.Singleton /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -1181,7 +1180,7 @@ class ExplorationActivityTest { @Test // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { - /*{ + /* { onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() @@ -1191,7 +1190,7 @@ class ExplorationActivityTest { onView(withId(R.id.play_pause_audio_icon)) .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) - }*/ + } */ markAllSpotlightsSeen() setUpAudio() @@ -1214,21 +1213,21 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() // Clicks continue until we reach the first interaction. - /*onView(withId(R.id.continue_interaction_button)).perform(click()) + /* onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click())*/ + onView(withId(R.id.continue_interaction_button)).perform(click()) */ - /*onView(withId(R.id.action_audio_player)).perform(click()) + /* onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() - )*/ + ) */ - /*onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) + /* onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) @@ -1238,7 +1237,7 @@ class ExplorationActivityTest { ) ) - onView(withText("What is a Ratio?"))*/ + onView(withText("What is a Ratio?")) */ } explorationDataController.stopPlayingExploration(isCompletion = false) } From d248806d545cc5ba6cc17f32c4b0c7c46dbafbc9 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:31:22 +0530 Subject: [PATCH 13/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 452abf4f914..0e6589fc314 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -42,10 +42,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.ActivityTestRule import com.google.common.truth.Truth.assertThat import dagger.Component -import java.io.IOException -import java.util.concurrent.TimeoutException -import javax.inject.Inject -import javax.inject.Singleton import org.hamcrest.BaseMatcher import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.containsString From 10cb0a0cde2d591b10f5b8927f37d71419d56ecd Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:48:18 +0530 Subject: [PATCH 14/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 0e6589fc314..8131bdc7862 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1188,7 +1188,7 @@ class ExplorationActivityTest { .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) } */ - markAllSpotlightsSeen() + /* markAllSpotlightsSeen() setUpAudio() launch( createExplorationActivityIntent( @@ -1235,6 +1235,42 @@ class ExplorationActivityTest { onView(withText("What is a Ratio?")) */ } + explorationDataController.stopPlayingExploration(isCompletion = false) */ + + markAllSpotlightsSeen() + setUpAudio() + launch( + createExplorationActivityIntent( + internalProfileId, + RATIOS_TOPIC_ID, + RATIOS_STORY_ID_0, + RATIOS_EXPLORATION_ID_0, + shouldSavePartialProgress = false + ) + ).use { + explorationDataController.startPlayingNewExploration( + internalProfileId, + RATIOS_TOPIC_ID, + RATIOS_STORY_ID_0, + RATIOS_EXPLORATION_ID_0 + ) + networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) + testCoroutineDispatchers.runCurrent() + onView(withId(R.id.action_audio_player)).perform(click()) + + testCoroutineDispatchers.runCurrent() + onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) + onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) + + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) + onView(withId(R.id.play_pause_audio_icon)).check( + matches( + withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) + ) + ) + + onView(withText("What is a Ratio?")) + } explorationDataController.stopPlayingExploration(isCompletion = false) } From d590b42b895de176e81d5091ea4e3cda2702c0ca Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:54:10 +0530 Subject: [PATCH 15/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 8131bdc7862..c73634d3745 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1176,67 +1176,6 @@ class ExplorationActivityTest { @Test // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { - /* { - onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123"), - closeSoftKeyboard() - ) - onView(withId(R.id.submit_answer_button)).perform(click()) - Thread.sleep(1000) - - onView(withId(R.id.play_pause_audio_icon)) - .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) - } */ - - /* markAllSpotlightsSeen() - setUpAudio() - launch( - createExplorationActivityIntent( - internalProfileId, - RATIOS_TOPIC_ID, - RATIOS_STORY_ID_0, - RATIOS_EXPLORATION_ID_0, - shouldSavePartialProgress = false - ) - ).use { - explorationDataController.startPlayingNewExploration( - internalProfileId, - RATIOS_TOPIC_ID, - RATIOS_STORY_ID_0, - RATIOS_EXPLORATION_ID_0 - ) - networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) - testCoroutineDispatchers.runCurrent() - - // Clicks continue until we reach the first interaction. - /* onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) */ - - /* onView(withId(R.id.action_audio_player)).perform(click()) - - testCoroutineDispatchers.runCurrent() - onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123"), - closeSoftKeyboard() - ) */ - - /* onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) - onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) - - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.play_pause_audio_icon)).check( - matches( - withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) - ) - ) - - onView(withText("What is a Ratio?")) */ - } - explorationDataController.stopPlayingExploration(isCompletion = false) */ - markAllSpotlightsSeen() setUpAudio() launch( From 5e9ea1d2419d3d716eff4040dc28c12af7d89d1d Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 10:59:19 +0530 Subject: [PATCH 16/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index c73634d3745..7c68ec3eded 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1174,7 +1174,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") + @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() setUpAudio() From 51e7877a7a6c9eff70e07ea11f0c544223cd817b Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 11:08:52 +0530 Subject: [PATCH 17/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 7c68ec3eded..3b26918ae01 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -165,6 +165,10 @@ import org.oppia.android.util.parser.image.GlideImageLoaderModule import org.oppia.android.util.parser.image.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode +import java.io.IOException +import java.util.concurrent.TimeoutException +import javax.inject.Inject +import javax.inject.Singleton /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) From 38922cc6eb4a2d815d9aff411141e0bf40af08bc Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 11:20:37 +0530 Subject: [PATCH 18/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 3b26918ae01..a7cae3da159 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1178,7 +1178,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") + // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() setUpAudio() @@ -1199,20 +1199,6 @@ class ExplorationActivityTest { ) networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) testCoroutineDispatchers.runCurrent() - onView(withId(R.id.action_audio_player)).perform(click()) - - testCoroutineDispatchers.runCurrent() - onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) - onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) - - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.play_pause_audio_icon)).check( - matches( - withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) - ) - ) - - onView(withText("What is a Ratio?")) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 21d03dff65774fd4b86d300506e3a8c1a92bf7b1 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 11:40:56 +0530 Subject: [PATCH 19/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index a7cae3da159..d4f865cd249 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1199,6 +1199,13 @@ class ExplorationActivityTest { ) networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) testCoroutineDispatchers.runCurrent() + + // Clicks continue until we reach the first interaction. + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 6e619476d2473d0ad1fed3561e0a20207d65d582 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 12:12:26 +0530 Subject: [PATCH 20/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d4f865cd249..5b99129d1de 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1201,11 +1201,7 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() // Clicks continue until we reach the first interaction. - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) + waitForTheView(withId(R.id.continue_interaction_button)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) } From f06af1dc9b9bd2640b8ae5df6c5740f309c409c9 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 12:28:40 +0530 Subject: [PATCH 21/68] Fixing tests --- .../player/exploration/ExplorationActivityTest.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 5b99129d1de..6742acc389b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1201,7 +1201,18 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() // Clicks continue until we reach the first interaction. - waitForTheView(withId(R.id.continue_interaction_button)).perform(click()) + // waitForTheView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.action_audio_player)).perform(click()) + + testCoroutineDispatchers.runCurrent() + + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) + onView(withId(R.id.play_pause_audio_icon)).check( + matches( + withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) + ) + ) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 82a0e70b33b9ba9c9dc748a5d850e133231be64b Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 12:42:47 +0530 Subject: [PATCH 22/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 6742acc389b..fa450bfad20 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1201,7 +1201,6 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() // Clicks continue until we reach the first interaction. - // waitForTheView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.action_audio_player)).perform(click()) @@ -1213,6 +1212,8 @@ class ExplorationActivityTest { withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) ) ) + + onView(withId(R.id.continue_interaction_button)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 1056fcb45f2da14f3330cc21d12f0d60c7846871 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 12:53:08 +0530 Subject: [PATCH 23/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index fa450bfad20..6a6c33637f2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1199,9 +1199,6 @@ class ExplorationActivityTest { ) networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) testCoroutineDispatchers.runCurrent() - - // Clicks continue until we reach the first interaction. - onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() @@ -1213,6 +1210,13 @@ class ExplorationActivityTest { ) ) + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + + // Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) From 95e1342a7a38061e856557af15b80e42048cc4c7 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 30 Nov 2023 13:31:15 +0530 Subject: [PATCH 24/68] Fixing tests --- .../player/exploration/ExplorationActivityTest.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 6a6c33637f2..4d1e5dd1833 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,6 +18,7 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder @@ -1204,11 +1205,6 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.play_pause_audio_icon)).check( - matches( - withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) - ) - ) onView(withId(R.id.state_recycler_view)).perform( scrollToPosition( @@ -1218,6 +1214,15 @@ class ExplorationActivityTest { // Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.text_input_interaction_view)).perform( + editTextInputAction.appendText("123"), + closeSoftKeyboard() + ) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 50f0bf20b0a6c7c843652add633124c772f3ce08 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:02:41 +0530 Subject: [PATCH 25/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4d1e5dd1833..43f253da0a5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1219,6 +1219,7 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) + scrollToViewType(StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION) onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() From f8288ffe2b279fb0facde8a87ba3ead51fc69123 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:24:36 +0530 Subject: [PATCH 26/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 43f253da0a5..ac567749ac9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1219,11 +1219,7 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - scrollToViewType(StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION) - onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123"), - closeSoftKeyboard() - ) + scrollToViewType(StateItemViewModel.ViewType.RATIO_EXPRESSION_INPUT_INTERACTION) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 953e93e0dc19fab772b86b151ef73b39a6e65940 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:26:44 +0530 Subject: [PATCH 27/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index ac567749ac9..0c75144110b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,7 +18,6 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder From 67da6fc3689ace14447461890cc564652c9d32b7 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:38:59 +0530 Subject: [PATCH 28/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 0c75144110b..cb29faa48a4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1210,13 +1210,42 @@ class ExplorationActivityTest { 1 ) ) + onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + onView(withId(R.id.continue_interaction_button)).perform(click()) - // Clicks continue until we reach the first interaction. + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) onView(withId(R.id.continue_interaction_button)).perform(click()) + + /*// Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click())*/ scrollToViewType(StateItemViewModel.ViewType.RATIO_EXPRESSION_INPUT_INTERACTION) } From 8e383ed17a68f35a14f99c7de0ffcecd42707efe Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:47:48 +0530 Subject: [PATCH 29/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index cb29faa48a4..0e81d17ec7c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1210,44 +1210,15 @@ class ExplorationActivityTest { 1 ) ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) + // Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) - - /*// Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click())*/ - scrollToViewType(StateItemViewModel.ViewType.RATIO_EXPRESSION_INPUT_INTERACTION) + scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) } explorationDataController.stopPlayingExploration(isCompletion = false) } From b1fe58bce455cf503256f6a56251dbeb93248fae Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 09:57:48 +0530 Subject: [PATCH 30/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 0e81d17ec7c..25de09f57ca 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1218,7 +1218,15 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + + onView(withId(R.id.submit_answer_button)) + + // scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 0f310927fe9a432f996f3f45413ea21f4c3faed2 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 10:15:08 +0530 Subject: [PATCH 31/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 25de09f57ca..87a18795edf 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1205,18 +1205,11 @@ class ExplorationActivityTest { waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - - // Clicks continue until we reach the first interaction. - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.continue_interaction_button)).perform(click()) + clickContinueButton() + clickContinueButton() + clickContinueButton() + clickContinueButton() + clickContinueButton() onView(withId(R.id.state_recycler_view)).perform( scrollToPosition( @@ -1225,8 +1218,6 @@ class ExplorationActivityTest { ) onView(withId(R.id.submit_answer_button)) - - // scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 0da1c6c577f4eb346074e5ab3b963c73de6a79e2 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 10:27:22 +0530 Subject: [PATCH 32/68] Revert "Fixing tests" This reverts commit 0f310927fe9a432f996f3f45413ea21f4c3faed2. --- .../exploration/ExplorationActivityTest.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 87a18795edf..25de09f57ca 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1205,11 +1205,18 @@ class ExplorationActivityTest { waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - clickContinueButton() - clickContinueButton() - clickContinueButton() - clickContinueButton() - clickContinueButton() + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) + + // Clicks continue until we reach the first interaction. + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) + onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.state_recycler_view)).perform( scrollToPosition( @@ -1218,6 +1225,8 @@ class ExplorationActivityTest { ) onView(withId(R.id.submit_answer_button)) + + // scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 34d97294b9e8e96b1a2f0f9009b500d35a30ec38 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 10:44:32 +0530 Subject: [PATCH 33/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 25de09f57ca..d97992b620f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1224,7 +1224,7 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.submit_answer_button)) + onView(withId(R.id.text_input_interaction_view)) // scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) } From 23976b508db2581e64a1038b82c218be01dcc61a Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 10:56:11 +0530 Subject: [PATCH 34/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d97992b620f..97b547b794d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,6 +18,7 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder @@ -1202,7 +1203,6 @@ class ExplorationActivityTest { onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) onView(withId(R.id.state_recycler_view)).perform( @@ -1224,9 +1224,13 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)) + testCoroutineDispatchers.runCurrent() + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - // scrollToViewType(StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON) + onView(withId(R.id.text_input_interaction_view)).perform( + editTextInputAction.appendText("123"), + closeSoftKeyboard() + ) } explorationDataController.stopPlayingExploration(isCompletion = false) } From b0f5a247da6af472b5dcc17e52633fc3f5a20fa1 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 11:04:59 +0530 Subject: [PATCH 35/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 97b547b794d..a3cd2f74956 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1224,7 +1224,6 @@ class ExplorationActivityTest { ) ) - testCoroutineDispatchers.runCurrent() waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) onView(withId(R.id.text_input_interaction_view)).perform( From 5e28b4d2b4b4a1e998c7db9705bb1ebf4576f20c Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 11:16:30 +0530 Subject: [PATCH 36/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index a3cd2f74956..2b9e8d0d7a0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1224,8 +1224,6 @@ class ExplorationActivityTest { ) ) - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() From 2b9e26cfd083bbfc6492f3b16ac98f30b9c4e2b4 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 11:31:38 +0530 Subject: [PATCH 37/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 2b9e8d0d7a0..e7479c070c5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1224,10 +1224,7 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123"), - closeSoftKeyboard() - ) + onView(withId(R.id.text_input_interaction_view)) } explorationDataController.stopPlayingExploration(isCompletion = false) } From e86d40eb2fbb902360ca3faf61d3fa2064b7a3b3 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 11:46:20 +0530 Subject: [PATCH 38/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index e7479c070c5..f8c8cddcb11 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,7 +18,6 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder From 1cc0a94114ecc0e7659aae4a173fb7f4963b9da8 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 11:50:47 +0530 Subject: [PATCH 39/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f8c8cddcb11..aa57b037f6d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1223,7 +1223,9 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)) + onView(withId(R.id.text_input_interaction_view)).perform( + editTextInputAction.appendText("123") + ) } explorationDataController.stopPlayingExploration(isCompletion = false) } From a174fd04437701992ef1ead1d4ab3f91cd25728d Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 12:26:47 +0530 Subject: [PATCH 40/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index aa57b037f6d..dbd78b552c7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,6 +18,7 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.typeText import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder @@ -1224,7 +1225,7 @@ class ExplorationActivityTest { ) onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123") + typeText("123") ) } explorationDataController.stopPlayingExploration(isCompletion = false) From 8d5cbd2b460832b434446e646b2ebce9faf262a4 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 12:48:29 +0530 Subject: [PATCH 41/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index dbd78b552c7..93eb0c38497 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1224,9 +1224,7 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)).perform( - typeText("123") - ) + onView(withId(R.id.text_input_interaction_view)) } explorationDataController.stopPlayingExploration(isCompletion = false) } From aeae5bd64d09b35e2b687ddc8098a00587b84984 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 12:50:25 +0530 Subject: [PATCH 42/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 93eb0c38497..f8c8cddcb11 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,7 +18,6 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.typeText import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder From e9f38a13443185bb562e92b970f3e8107bbe57a5 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 13:10:25 +0530 Subject: [PATCH 43/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f8c8cddcb11..f1f828c7892 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -169,6 +169,7 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton +import org.oppia.android.app.player.state.StateFragmentLocalTest /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -1223,7 +1224,7 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)) + submitTextInput("123") } explorationDataController.stopPlayingExploration(isCompletion = false) } @@ -2443,6 +2444,31 @@ class ExplorationActivityTest { ).check(matches(withText(containsString(expectedHtml)))) } + private fun submitTextInput(text: String) { + typeTextInput(text) + clickSubmitAnswerButton() + } + + private fun typeTextInput(text: String) { + onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(TEXT_INPUT_INTERACTION)) + typeTextIntoInteraction(text, interactionViewId = R.id.text_input_interaction_view) + } + + private fun typeTextIntoInteraction(text: String, interactionViewId: Int) { + onView(withId(interactionViewId)).perform(editTextInputAction.appendText(text)) + testCoroutineDispatchers.runCurrent() + } + + private fun clickSubmitAnswerButton() { + onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(SUBMIT_ANSWER_BUTTON)) + onView(withId(R.id.submit_answer_button)).perform(click()) + testCoroutineDispatchers.runCurrent() + } + + private fun scrollToViewType(viewType: StateItemViewModel.ViewType): ViewAction { + return scrollToHolder(StateFragmentLocalTest.StateViewHolderTypeMatcher(viewType)) + } + private fun scrollToViewType(viewType: StateItemViewModel.ViewType) { onView(withId(R.id.state_recycler_view)).perform( scrollToHolder(StateViewHolderTypeMatcher(viewType)) From b39a957e3ed6c2ed11723c8f48e77a301d9a22f9 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 13:21:48 +0530 Subject: [PATCH 44/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f1f828c7892..75f442c8520 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -169,7 +169,6 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton -import org.oppia.android.app.player.state.StateFragmentLocalTest /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -2466,7 +2465,7 @@ class ExplorationActivityTest { } private fun scrollToViewType(viewType: StateItemViewModel.ViewType): ViewAction { - return scrollToHolder(StateFragmentLocalTest.StateViewHolderTypeMatcher(viewType)) + return scrollToHolder(StateViewHolderTypeMatcher(viewType)) } private fun scrollToViewType(viewType: StateItemViewModel.ViewType) { From 9c23f070d9a98eeabeb2336cd4929d43b003de3a Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 13:52:41 +0530 Subject: [PATCH 45/68] Revert "Fixing tests" This reverts commit b39a957e3ed6c2ed11723c8f48e77a301d9a22f9. --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 75f442c8520..f1f828c7892 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -169,6 +169,7 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton +import org.oppia.android.app.player.state.StateFragmentLocalTest /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -2465,7 +2466,7 @@ class ExplorationActivityTest { } private fun scrollToViewType(viewType: StateItemViewModel.ViewType): ViewAction { - return scrollToHolder(StateViewHolderTypeMatcher(viewType)) + return scrollToHolder(StateFragmentLocalTest.StateViewHolderTypeMatcher(viewType)) } private fun scrollToViewType(viewType: StateItemViewModel.ViewType) { From c25518c964c777dc8f36b63ceeb0e6972d462be6 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 13:52:42 +0530 Subject: [PATCH 46/68] Revert "Fixing tests" This reverts commit e9f38a13443185bb562e92b970f3e8107bbe57a5. --- .../exploration/ExplorationActivityTest.kt | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f1f828c7892..f8c8cddcb11 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -169,7 +169,6 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton -import org.oppia.android.app.player.state.StateFragmentLocalTest /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -1224,7 +1223,7 @@ class ExplorationActivityTest { ) ) - submitTextInput("123") + onView(withId(R.id.text_input_interaction_view)) } explorationDataController.stopPlayingExploration(isCompletion = false) } @@ -2444,31 +2443,6 @@ class ExplorationActivityTest { ).check(matches(withText(containsString(expectedHtml)))) } - private fun submitTextInput(text: String) { - typeTextInput(text) - clickSubmitAnswerButton() - } - - private fun typeTextInput(text: String) { - onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(TEXT_INPUT_INTERACTION)) - typeTextIntoInteraction(text, interactionViewId = R.id.text_input_interaction_view) - } - - private fun typeTextIntoInteraction(text: String, interactionViewId: Int) { - onView(withId(interactionViewId)).perform(editTextInputAction.appendText(text)) - testCoroutineDispatchers.runCurrent() - } - - private fun clickSubmitAnswerButton() { - onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(SUBMIT_ANSWER_BUTTON)) - onView(withId(R.id.submit_answer_button)).perform(click()) - testCoroutineDispatchers.runCurrent() - } - - private fun scrollToViewType(viewType: StateItemViewModel.ViewType): ViewAction { - return scrollToHolder(StateFragmentLocalTest.StateViewHolderTypeMatcher(viewType)) - } - private fun scrollToViewType(viewType: StateItemViewModel.ViewType) { onView(withId(R.id.state_recycler_view)).perform( scrollToHolder(StateViewHolderTypeMatcher(viewType)) From 6acd6df5c19a0e3ce8240af185b17aa0435c233d Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 14:37:24 +0530 Subject: [PATCH 47/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f8c8cddcb11..1fc61b0acb8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1223,7 +1223,7 @@ class ExplorationActivityTest { ) ) - onView(withId(R.id.text_input_interaction_view)) + onView(withId(R.id.text_input_interaction_view)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) } From f3084da0d7ef043fe8523d29d4824052f39d08b7 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 14:54:10 +0530 Subject: [PATCH 48/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 1fc61b0acb8..d3468324219 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1217,13 +1217,7 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - - onView(withId(R.id.text_input_interaction_view)).perform(click()) + onView(withId(R.id.text_input_interaction_view)) } explorationDataController.stopPlayingExploration(isCompletion = false) } From a50fc5499825805f37de97ae3f02bd3b2678973e Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 15:01:33 +0530 Subject: [PATCH 49/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d3468324219..d3e24c600ed 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1206,7 +1206,7 @@ class ExplorationActivityTest { onView(withId(R.id.state_recycler_view)).perform( scrollToPosition( - 1 + (recyclerView.adapter?.itemCount ?: 1) - 1 ) ) @@ -1218,6 +1218,8 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.text_input_interaction_view)) + + onView(withText("What is a Ratio?")) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 51afd8f19e42e31159d7663045cbbf739b2b7599 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 1 Dec 2023 15:02:18 +0530 Subject: [PATCH 50/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d3e24c600ed..6fad4d14902 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1206,7 +1206,7 @@ class ExplorationActivityTest { onView(withId(R.id.state_recycler_view)).perform( scrollToPosition( - (recyclerView.adapter?.itemCount ?: 1) - 1 + 1 ) ) From 025b7fe5a2942accd295bc7a14eae41820a9d2e4 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Mon, 4 Dec 2023 21:59:22 +0530 Subject: [PATCH 51/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 6fad4d14902..c48547b9a1d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1217,7 +1217,9 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.text_input_interaction_view)) + onView(withId(R.id.ratio_input_interaction_view)).perform( + editTextInputAction.appendText("123") + ) onView(withText("What is a Ratio?")) } From d5e634d26207ef35e62d8effc70c331289bdd402 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Mon, 4 Dec 2023 22:10:03 +0530 Subject: [PATCH 52/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index c48547b9a1d..5afc3a77bc6 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -34,6 +34,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withContentDescription import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility +import androidx.test.espresso.matcher.ViewMatchers.withHint import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.espresso.util.HumanReadables @@ -1217,7 +1218,7 @@ class ExplorationActivityTest { onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withId(R.id.continue_interaction_button)).perform(click()) - onView(withId(R.id.ratio_input_interaction_view)).perform( + onView(withHint("Enter your answer as X to Y")).perform( editTextInputAction.appendText("123") ) From 806701210f9562bc756951585c7cb66d7752a24e Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Mon, 4 Dec 2023 22:31:06 +0530 Subject: [PATCH 53/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 5afc3a77bc6..f24dd2742cc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1210,12 +1210,34 @@ class ExplorationActivityTest { 1 ) ) - - // Clicks continue until we reach the first interaction. onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) onView(withId(R.id.continue_interaction_button)).perform(click()) + + onView(withId(R.id.state_recycler_view)).perform( + scrollToPosition( + 1 + ) + ) onView(withId(R.id.continue_interaction_button)).perform(click()) onView(withHint("Enter your answer as X to Y")).perform( From 82677747f46d55a9ed7430c8026db8c6754cf8b0 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Mon, 4 Dec 2023 23:06:51 +0530 Subject: [PATCH 54/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index f24dd2742cc..25474e3bfb2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1205,46 +1205,7 @@ class ExplorationActivityTest { testCoroutineDispatchers.runCurrent() waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withId(R.id.state_recycler_view)).perform( - scrollToPosition( - 1 - ) - ) - onView(withId(R.id.continue_interaction_button)).perform(click()) - - onView(withHint("Enter your answer as X to Y")).perform( - editTextInputAction.appendText("123") - ) - - onView(withText("What is a Ratio?")) + clickContinueButton() } explorationDataController.stopPlayingExploration(isCompletion = false) } From 6f42c3a88856f43a9082be5bd9cd011065e7d4ee Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 20:56:34 +0530 Subject: [PATCH 55/68] Fixing tests --- .../player/exploration/ExplorationActivityTest.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index d61cbf4fd93..c34cd82c0c1 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -34,7 +34,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withContentDescription import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility -import androidx.test.espresso.matcher.ViewMatchers.withHint import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.espresso.util.HumanReadables @@ -1200,12 +1199,18 @@ class ExplorationActivityTest { ) networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL) testCoroutineDispatchers.runCurrent() - onView(withId(R.id.action_audio_player)).perform(click()) - - testCoroutineDispatchers.runCurrent() - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) clickContinueButton() + clickContinueButton() + clickContinueButton() + clickContinueButton() + clickContinueButton() + + onView(withId(R.id.text_input_interaction_view)).perform( + editTextInputAction.appendText("123") + ) + + onView(withId(R.id.submit_answer_button)).perform(click()) } explorationDataController.stopPlayingExploration(isCompletion = false) } From fef953dda155ccee9ea8d6f6d29911f2ba358f14 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 21:11:27 +0530 Subject: [PATCH 56/68] Fixing tests --- .../player/exploration/ExplorationActivityTest.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index c34cd82c0c1..4750b2c3a96 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1191,6 +1191,7 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { + testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, @@ -1206,6 +1207,19 @@ class ExplorationActivityTest { clickContinueButton() clickContinueButton() + onView(withId(R.id.action_audio_player)).perform(click()) + + testCoroutineDispatchers.runCurrent() + onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) + onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) + + waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) + onView(withId(R.id.play_pause_audio_icon)).check( + matches( + withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) + ) + ) + onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123") ) @@ -1301,6 +1315,7 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { + testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, From 1cee16a155e50c4b8f04d9bf4bda9430135a0d20 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 21:22:04 +0530 Subject: [PATCH 57/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4750b2c3a96..827f629b3f5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1207,6 +1207,7 @@ class ExplorationActivityTest { clickContinueButton() clickContinueButton() + testCoroutineDispatchers.runCurrent() onView(withId(R.id.action_audio_player)).perform(click()) testCoroutineDispatchers.runCurrent() From 8b09524d0ff47980ed4512e1b4a5cf5ca4465f9a Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 21:44:45 +0530 Subject: [PATCH 58/68] Fixing tests --- .../app/player/exploration/ExplorationActivityTest.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 827f629b3f5..476e3d45f15 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -169,6 +169,7 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton +import org.oppia.android.testing.DisableAccessibilityChecks /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -1178,6 +1179,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test + @DisableAccessibilityChecks // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() @@ -1214,12 +1216,8 @@ class ExplorationActivityTest { onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) - waitForTheView(withDrawable(R.drawable.ic_pause_circle_filled_white_24dp)) - onView(withId(R.id.play_pause_audio_icon)).check( - matches( - withDrawable(R.drawable.ic_pause_circle_filled_white_24dp) - ) - ) + waitForTheView(withDrawable(R.drawable.ic_play_circle_filled_white_24dp)) + onView(withId(R.id.play_pause_audio_icon)).perform(click()) onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123") From 23f0e7d8ff55ec5b2f4ac3f1f2df0f0e12c4a17e Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 22:07:24 +0530 Subject: [PATCH 59/68] Fixing tests --- .../exploration/ExplorationActivityTest.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 476e3d45f15..4ffc2363d82 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -18,6 +18,7 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewInteraction import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder @@ -1209,21 +1210,18 @@ class ExplorationActivityTest { clickContinueButton() clickContinueButton() - testCoroutineDispatchers.runCurrent() onView(withId(R.id.action_audio_player)).perform(click()) - - testCoroutineDispatchers.runCurrent() - onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed())) - onView(withId(R.id.audio_fragment_voiceover_progressbar)).check(matches(isDisplayed())) - - waitForTheView(withDrawable(R.drawable.ic_play_circle_filled_white_24dp)) - onView(withId(R.id.play_pause_audio_icon)).perform(click()) - onView(withId(R.id.text_input_interaction_view)).perform( - editTextInputAction.appendText("123") + editTextInputAction.appendText("123"), + closeSoftKeyboard() ) - onView(withId(R.id.submit_answer_button)).perform(click()) + Thread.sleep(1000) + + onView(withId(R.id.play_pause_audio_icon)) + .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) + + onView(withText("What is a Ratio?")) } explorationDataController.stopPlayingExploration(isCompletion = false) } From 2fba2dc64c2cf3ccfe70965313d00cf3ff63a533 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 22:10:08 +0530 Subject: [PATCH 60/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4ffc2363d82..00f1af461c7 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -170,7 +170,6 @@ import java.io.IOException import java.util.concurrent.TimeoutException import javax.inject.Inject import javax.inject.Singleton -import org.oppia.android.testing.DisableAccessibilityChecks /** Tests for [ExplorationActivity]. */ @RunWith(AndroidJUnit4::class) @@ -1180,7 +1179,6 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test - @DisableAccessibilityChecks // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() From d573864fbd8caffbf7cc7c123b91bd54968513a3 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 22:37:01 +0530 Subject: [PATCH 61/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 00f1af461c7..5e879119cbd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1209,6 +1209,8 @@ class ExplorationActivityTest { clickContinueButton() onView(withId(R.id.action_audio_player)).perform(click()) + + scrollToViewType(StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION) onView(withId(R.id.text_input_interaction_view)).perform( editTextInputAction.appendText("123"), closeSoftKeyboard() From a85b85279e1fff664904b8827714501c3eb5297b Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 22:54:42 +0530 Subject: [PATCH 62/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 5e879119cbd..ddb7045526e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1192,7 +1192,6 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { - testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, From 3ec3d057af163111aaa244892dcf2efeaac04953 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Wed, 6 Dec 2023 23:03:37 +0530 Subject: [PATCH 63/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index ddb7045526e..483d9e3bdc0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1311,7 +1311,6 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { - testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, From 43bbaba0a16ceaaf5299764739652c5b425ec053 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 7 Dec 2023 09:46:34 +0530 Subject: [PATCH 64/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 483d9e3bdc0..4157026b8d4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1207,6 +1207,7 @@ class ExplorationActivityTest { clickContinueButton() clickContinueButton() + testCoroutineDispatchers.runCurrent() onView(withId(R.id.action_audio_player)).perform(click()) scrollToViewType(StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION) From 43383d732984d3bbf6b61f8d70e199f88a45dc59 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 7 Dec 2023 10:33:12 +0530 Subject: [PATCH 65/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4157026b8d4..e360d406660 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1192,6 +1192,7 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { + testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, @@ -1207,8 +1208,8 @@ class ExplorationActivityTest { clickContinueButton() clickContinueButton() - testCoroutineDispatchers.runCurrent() onView(withId(R.id.action_audio_player)).perform(click()) + testCoroutineDispatchers.runCurrent() scrollToViewType(StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION) onView(withId(R.id.text_input_interaction_view)).perform( From ae5db48815b0c63235793171e9487f36d64f864c Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 7 Dec 2023 10:55:07 +0530 Subject: [PATCH 66/68] Fixing tests --- .../android/app/player/exploration/ExplorationActivityTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index e360d406660..4e703bde23a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1179,6 +1179,7 @@ class ExplorationActivityTest { // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test + @RunOn(TestPlatform.ESPRESSO) // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() From 443853fe269da1e7cb7574328609520ed2dd68b7 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 7 Dec 2023 13:51:16 +0530 Subject: [PATCH 67/68] Fixed testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() --- .../android/app/player/exploration/ExplorationActivityTest.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 4e703bde23a..215b96543e0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1177,10 +1177,8 @@ class ExplorationActivityTest { explorationDataController.stopPlayingExploration(isCompletion = false) } - // TODO(#89): The ExplorationActivity takes time to finish. This test case is failing currently. @Test @RunOn(TestPlatform.ESPRESSO) - // @Ignore("The ExplorationActivity takes time to finish, needs to fixed in #89.") fun testAudioWifi_ratioExp_continueInteraction_audioButton_submitAns_feedbackAudioPlays() { markAllSpotlightsSeen() setUpAudio() @@ -1193,7 +1191,6 @@ class ExplorationActivityTest { shouldSavePartialProgress = false ) ).use { - testCoroutineDispatchers.unregisterIdlingResource() explorationDataController.startPlayingNewExploration( internalProfileId, RATIOS_TOPIC_ID, From 2844d8bd3758e2b61571a40531addbf98b5ac7a5 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Thu, 7 Dec 2023 14:57:48 +0530 Subject: [PATCH 68/68] Minor fixes --- .../android/app/player/exploration/ExplorationActivityTest.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index 215b96543e0..18acf05d0c9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -1111,7 +1111,7 @@ class ExplorationActivityTest { ) ) - onView(withText("What is a Ratio?")) + onView(withText("What is a Ratio?")).check(matches(isDisplayed())) } explorationDataController.stopPlayingExploration(isCompletion = false) } @@ -1219,8 +1219,6 @@ class ExplorationActivityTest { onView(withId(R.id.play_pause_audio_icon)) .check(matches(withContentDescription(context.getString(R.string.audio_pause_description)))) - - onView(withText("What is a Ratio?")) } explorationDataController.stopPlayingExploration(isCompletion = false) }