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 #2587: testHomeActivity_allTopicsCompleted_displaysAllTopicCards() test not working #5330

Merged
merged 5 commits into from
Feb 8, 2024
Merged

Fix #2587: testHomeActivity_allTopicsCompleted_displaysAllTopicCards() test not working #5330

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
415f08b
split test method into 4 versions, ensuring tests pass for mobile[por…
deonwaju Feb 4, 2024
d365c48
corrected indentation
deonwaju Feb 4, 2024
7657baa
removed unnecessary if condition in tests.
deonwaju Feb 6, 2024
788c9af
renamed test with suggestions
deonwaju Feb 7, 2024
a07ccae
Merge branch 'oppia:develop' into fix/allTopicsCompleted-displaysAlll…
deonwaju Feb 7, 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
57 changes: 51 additions & 6 deletions app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,8 +1333,9 @@ class HomeActivityTest {
}
}

@Config(qualifiers = "+port")
@Test
fun testHomeActivity_allTopicsCompleted_displaysAllTopicCards() {
fun testHomeActivity_allTopicsCompleted_mobilePortrait_displaysAllTopicCardsIn2Columns() {
fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
storyProgressTestHelper.markAllTopicsAsCompleted(
profileId = profileId,
Expand All @@ -1344,11 +1345,55 @@ class HomeActivityTest {
launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
testCoroutineDispatchers.runCurrent()
scrollToPosition(position = 3)
if (context.resources.getBoolean(R.bool.isTablet)) {
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 3)
} else {
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 2)
}
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 2)
}
}

@Config(qualifiers = "+land")
@Test
fun testHomeActivity_allTopicsCompleted_mobileLandscape_displaysAllTopicCardsIn3Columns() {
fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
storyProgressTestHelper.markAllTopicsAsCompleted(
profileId = profileId,
timestampOlderThanOneWeek = false
)
logIntoAdminTwice()
launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
testCoroutineDispatchers.runCurrent()
scrollToPosition(position = 3)
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 3)
}
}

@Config(qualifiers = "+sw600dp-port")
@Test
fun testHomeActivity_allTopicsCompleted_tabletPortrait_displaysAllTopicCardsIn3Columns() {
fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
storyProgressTestHelper.markAllTopicsAsCompleted(
profileId = profileId,
timestampOlderThanOneWeek = false
)
logIntoAdminTwice()
launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
testCoroutineDispatchers.runCurrent()
scrollToPosition(position = 3)
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 3)
}
}

@Config(qualifiers = "+sw600dp-land")
@Test
fun testHomeActivity_allTopicsCompleted_tabletLandscape_displaysAllTopicCardsIn4Columns() {
fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
storyProgressTestHelper.markAllTopicsAsCompleted(
profileId = profileId,
timestampOlderThanOneWeek = false
)
logIntoAdminTwice()
launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
testCoroutineDispatchers.runCurrent()
scrollToPosition(position = 3)
verifyHomeRecyclerViewHasGridColumnCount(columnCount = 4)
}
}

Expand Down
Loading