Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix part of #5344: Enable Multiple Classrooms #5510

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Fix part of #5344: Enable Multiple Classrooms #5510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4b63e
Toggle multiple classrooms flag on
theMr17 Aug 23, 2024
6fd11ad
Fix tests
theMr17 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -219,6 +217,7 @@ class PinPasswordActivityTest {

@Test
fun testPinPassword_withAdmin_inputCorrectPin_opensHomeActivity() {
TestPlatformParameterModule.forceEnableMultipleClassrooms(false)
ActivityScenario.launch<PinPasswordActivity>(
PinPasswordActivity.createPinPasswordActivityIntent(
context = context,
Expand All @@ -235,7 +234,6 @@ class PinPasswordActivityTest {
}

@Test
@RunOn(TestPlatform.ESPRESSO)
fun testPinPassword_enableClassrooms_withAdmin_inputCorrectPin_opensClassroomListActivity() {
TestPlatformParameterModule.forceEnableMultipleClassrooms(true)
ActivityScenario.launch<PinPasswordActivity>(
Expand All @@ -256,6 +254,7 @@ class PinPasswordActivityTest {

@Test
fun testPinPassword_withUser_inputCorrectPin_opensHomeActivity() {
TestPlatformParameterModule.forceEnableMultipleClassrooms(false)
ActivityScenario.launch<PinPasswordActivity>(
PinPasswordActivity.createPinPasswordActivityIntent(
context = context,
Expand All @@ -272,7 +271,6 @@ class PinPasswordActivityTest {
}

@Test
@RunOn(TestPlatform.ESPRESSO)
fun testPinPassword_enableClassrooms_withUser_inputCorrectPin_opensClassroomListActivity() {
TestPlatformParameterModule.forceEnableMultipleClassrooms(true)
ActivityScenario.launch<PinPasswordActivity>(
Expand Down Expand Up @@ -544,6 +542,7 @@ class PinPasswordActivityTest {

@Test
fun testPinPassword_withUser_forgot_inputAdminPinAndNewPin_opensHomeActivity() {
TestPlatformParameterModule.forceEnableMultipleClassrooms(false)
ActivityScenario.launch<PinPasswordActivity>(
PinPasswordActivity.createPinPasswordActivityIntent(
context = context,
Expand Down
2 changes: 1 addition & 1 deletion utility/src/main/java/org/oppia/android/util/platformparameter/FeatureFlagConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading