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

Fix #1968: Fix NavigationDrawerTestActivityTest for Robolectric #2204

Merged
merged 7 commits into from
Dec 11, 2020
Merged

Fix #1968: Fix NavigationDrawerTestActivityTest for Robolectric #2204

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
739fcf9
checking one test case
anandwana001 Dec 1, 2020
f6887b4
adding ben's solution
anandwana001 Dec 3, 2020
80fcf31
added a test
anandwana001 Dec 7, 2020
c01251d
nit fix
anandwana001 Dec 8, 2020
b03c536
removed ktlint char length disable
anandwana001 Dec 9, 2020
719dc1f
nit fix naming
anandwana001 Dec 10, 2020
38608b2
rename file and function
anandwana001 Dec 11, 2020
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
56 changes: 28 additions & 28 deletions app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.test.espresso.ViewAction
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.swipeUp
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.DrawerActions.close
import androidx.test.espresso.contrib.DrawerMatchers.isClosed
import androidx.test.espresso.contrib.DrawerMatchers.isOpen
import androidx.test.espresso.intent.Intents
Expand Down Expand Up @@ -95,7 +96,6 @@ import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
import org.oppia.android.util.parser.GlideImageLoaderModule
import org.oppia.android.util.parser.HtmlParserEntityTypeModule
import org.oppia.android.util.parser.ImageParsingModule
import org.oppia.android.util.system.OppiaClock
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import javax.inject.Inject
Expand Down Expand Up @@ -127,7 +127,6 @@ class NavigationDrawerTestActivityTest {

private val internalProfileId = 0
private val internalProfileId1 = 1
private lateinit var oppiaClock: OppiaClock

@Before
fun setUp() {
Expand Down Expand Up @@ -161,7 +160,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_clickNavigationDrawerHamburger_defaultProfileNameAtIndex0_displayProfileNameSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_profileNameIsDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId
Expand All @@ -179,7 +178,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_clickNavigationDrawerHamburger_changeConfiguration_defaultProfileNameAtIndex0_displayProfileNameSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_changeConfig_profileNameIsDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId
Expand All @@ -198,7 +197,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_clickNavigationDrawerHamburger_checkProfileProgress_displayProfileProgressSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_profileProgressIsDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId
Expand All @@ -216,7 +215,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_clickNavigationDrawerHamburger_defaultProfileNameAtIndex1_displayProfileNameSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_withUserProfile_openNavDrawer_profileNameIsDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId1
Expand Down Expand Up @@ -255,7 +254,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_openNavDrawer_navigationDrawerIsOpenedSuccessfully() {
fun testNavigationDrawerTestActivity_openNavDrawer_navigationDrawerIsOpened() {
BenHenning marked this conversation as resolved.
Show resolved Hide resolved
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withId(R.id.home_fragment_placeholder)).check(matches(isCompletelyDisplayed()))
Expand All @@ -264,17 +263,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_clickNavigationDrawerHamburger_changeConfiguration_navigationDrawerIsOpenedSuccessfully() { // ktlint-disable max-line-length
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withId(R.id.home_fragment_placeholder)).check(matches(isCompletelyDisplayed()))
onView(isRoot()).perform(orientationLandscape())
onView(withId(R.id.home_activity_drawer_layout)).check(matches(isOpen()))
}
}

@Test
fun testNavigationDrawerTestActivity_openNavigationDrawerAndRotate_navigationDrawerIsNotClosedAfterRotationIsVerifiedSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_changeConfig_navDrawerIsDisplayed() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(isRoot()).perform(orientationLandscape())
Expand All @@ -283,7 +272,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_withAdminProfile_openNavigationDrawer_checkAdministratorControlsDisplayed() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_adminControlsIsDisplayed() {
anandwana001 marked this conversation as resolved.
Show resolved Hide resolved
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(internalProfileId)
).use {
Expand All @@ -293,7 +282,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_withAdminProfile_openNavigationDrawer_changeConfiguration_checkAdministratorControlsDisplayed() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_changeConfig_adminControlsIsDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(internalProfileId)
).use {
Expand All @@ -305,7 +294,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_withAdminProfile_openNavigationDrawer_clickAdministratorControls_checkOpensAdministratorControlsActivity() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_adminControlsMenu_opensAdminControlsActivity() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId
Expand All @@ -320,7 +309,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_withUserProfile_openNavigationDrawer_checkAdministratorControlsNotDisplayed() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_withUserProfile_openNavDrawer_adminControlsIsNotDisplayed() {
launch<NavigationDrawerTestActivity>(
createNavigationDrawerActivityIntent(
internalProfileId1
Expand All @@ -335,7 +324,7 @@ class NavigationDrawerTestActivityTest {
// TODO(#1806): Enable this once lowfi implementation is done.
@Test
@Ignore("My Downloads is removed until we have full download support.")
fun testNavigationDrawerTestActivity_openNavigationDrawer_selectMyDownloadsMenuInNavigationDrawer_showsMyDownloadsFragmentSuccessfully() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_myDownloadsMenu_myDownloadsFragmentIsDisplayed() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_my_downloads)).perform(click())
Expand All @@ -344,7 +333,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_openNavigationDrawer_selectSwitchProfileMenu_showsExitToProfileChooserDialog() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_switchProfileMenu_showsExitToProfileChooserDialog() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_switch_profile)).perform(click())
Expand All @@ -355,7 +344,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_openNavigationDrawer_selectSwitchProfileMenu_showsExitToProfileChooserDialog_clickExit_checkOpensProfileChooserActivity() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_switchProfileMenu_clickExit_opensProfileChooserActivity() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_switch_profile)).perform(click())
Expand All @@ -371,7 +360,18 @@ class NavigationDrawerTestActivityTest {

@RunOn(TestPlatform.ESPRESSO)
@Test
fun testNavigationDrawerTestActivity_selectSwitchProfileMenu_clickCancel_checkDrawerIsClosed() {
fun testNavigationDrawerTestActivity_openNavDrawerAndClose_navDrawerIsClosed() {
launch(NavigationDrawerTestActivity::class.java).use {
testCoroutineDispatchers.runCurrent()
it.openNavigationDrawer()
onView(withId(R.id.home_activity_drawer_layout)).perform(close())
onView(withId(R.id.home_activity_drawer_layout)).check(matches(isClosed()))
}
}

@RunOn(TestPlatform.ESPRESSO)
@Test
fun testNavigationDrawerTestActivity_selectSwitchProfileMenu_clickCancel_navDrawerIsClosed() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_switch_profile)).perform(click())
Expand All @@ -387,7 +387,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_selectSwitchProfile_orientationChange_checkDialogVisible() {
fun testNavigationDrawerTestActivity_selectSwitchProfile_changeConfig_dialogIsVisible() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_switch_profile)).perform(click())
Expand All @@ -400,7 +400,7 @@ class NavigationDrawerTestActivityTest {
}

@Test
fun testNavigationDrawerTestActivity_openNavDrawer_selectHelpMenu_opensHelpActivity() { // ktlint-disable max-line-length
fun testNavigationDrawerTestActivity_openNavDrawer_selectHelpMenu_opensHelpActivity() {
launch(NavigationDrawerTestActivity::class.java).use {
it.openNavigationDrawer()
onView(withText(R.string.menu_help)).perform(click())
Expand Down