From dc4b63ec524c4dc3275f07c7343c013901c3929a Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 23 Aug 2024 20:53:37 +0530 Subject: [PATCH 1/2] Toggle multiple classrooms flag on --- .../android/util/platformparameter/FeatureFlagConstants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt b/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt index c30ae97206c..39a63ec453a 100644 --- a/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt +++ b/utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt @@ -178,4 +178,4 @@ annotation class EnableMultipleClassrooms const val ENABLE_MULTIPLE_CLASSROOMS = "enable_multiple_classrooms" /** Default value of the feature flag corresponding to [EnableMultipleClassrooms]. */ -const val ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE = false +const val ENABLE_MULTIPLE_CLASSROOMS_DEFAULT_VALUE = true From 6fd11ad2d5871e0fd5f0a689b8c7bc8327571117 Mon Sep 17 00:00:00 2001 From: Saptak Manna Date: Fri, 23 Aug 2024 20:56:26 +0530 Subject: [PATCH 2/2] Fix tests --- .../oppia/android/app/profile/PinPasswordActivityTest.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt index 5da1ccdf4e5..1e678cb7cdb 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt @@ -87,9 +87,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu import org.oppia.android.domain.question.QuestionModule import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule import org.oppia.android.testing.OppiaTestRule -import org.oppia.android.testing.RunOn import org.oppia.android.testing.TestLogReportingModule -import org.oppia.android.testing.TestPlatform import org.oppia.android.testing.espresso.EditTextInputAction import org.oppia.android.testing.espresso.TextInputAction.Companion.hasErrorText import org.oppia.android.testing.espresso.TextInputAction.Companion.hasNoErrorText @@ -219,6 +217,7 @@ class PinPasswordActivityTest { @Test fun testPinPassword_withAdmin_inputCorrectPin_opensHomeActivity() { + TestPlatformParameterModule.forceEnableMultipleClassrooms(false) ActivityScenario.launch( PinPasswordActivity.createPinPasswordActivityIntent( context = context, @@ -235,7 +234,6 @@ class PinPasswordActivityTest { } @Test - @RunOn(TestPlatform.ESPRESSO) fun testPinPassword_enableClassrooms_withAdmin_inputCorrectPin_opensClassroomListActivity() { TestPlatformParameterModule.forceEnableMultipleClassrooms(true) ActivityScenario.launch( @@ -256,6 +254,7 @@ class PinPasswordActivityTest { @Test fun testPinPassword_withUser_inputCorrectPin_opensHomeActivity() { + TestPlatformParameterModule.forceEnableMultipleClassrooms(false) ActivityScenario.launch( PinPasswordActivity.createPinPasswordActivityIntent( context = context, @@ -272,7 +271,6 @@ class PinPasswordActivityTest { } @Test - @RunOn(TestPlatform.ESPRESSO) fun testPinPassword_enableClassrooms_withUser_inputCorrectPin_opensClassroomListActivity() { TestPlatformParameterModule.forceEnableMultipleClassrooms(true) ActivityScenario.launch( @@ -544,6 +542,7 @@ class PinPasswordActivityTest { @Test fun testPinPassword_withUser_forgot_inputAdminPinAndNewPin_opensHomeActivity() { + TestPlatformParameterModule.forceEnableMultipleClassrooms(false) ActivityScenario.launch( PinPasswordActivity.createPinPasswordActivityIntent( context = context,