diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-03-19 21:56:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-19 21:56:39 +0100 |
commit | d7cfa07c449666caa321df3c0894e5de816ffafa (patch) | |
tree | 366955c8b62de0be1805389be54ece561b29dda1 /app/src/androidTest/java | |
parent | 0ed4f808c3877506b3db0f2279fd4168b0cdec02 (diff) | |
parent | 260bb8f5ccca9136a1520443252ad352f3d0b6ac (diff) | |
download | AntennaPod-d7cfa07c449666caa321df3c0894e5de816ffafa.zip |
Merge pull request #3943 from ByteHamster/nav-list-fragment
Nav list fragment
Diffstat (limited to 'app/src/androidTest/java')
3 files changed, 11 insertions, 4 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java index a9d8483fa..225f07dfd 100644 --- a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java @@ -20,6 +20,7 @@ import de.danoeh.antennapod.core.service.download.DownloadService; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.storage.PodDBAdapter; import de.danoeh.antennapod.dialog.RatingDialog; +import de.danoeh.antennapod.fragment.NavDrawerFragment; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; import org.hamcrest.Matcher; @@ -131,9 +132,10 @@ public class EspressoTestUtils { } public static void setLastNavFragment(String tag) { - InstrumentationRegistry.getTargetContext().getSharedPreferences(MainActivity.PREF_NAME, Context.MODE_PRIVATE) + InstrumentationRegistry.getTargetContext().getSharedPreferences( + NavDrawerFragment.PREF_NAME, Context.MODE_PRIVATE) .edit() - .putString(MainActivity.PREF_LAST_FRAGMENT_TAG, tag) + .putString(NavDrawerFragment.PREF_LAST_FRAGMENT_TAG, tag) .commit(); } diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java index d0b2cb4b4..72e4c29d9 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java @@ -99,6 +99,7 @@ public class MainActivityTest { solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBack(); + solo.goBack(); assertEquals(solo.getString(R.string.subscriptions_label), getActionbarTitle()); } @@ -111,6 +112,7 @@ public class MainActivityTest { onView(withText(R.string.back_button_open_drawer)).perform(click()); solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBack(); + solo.goBack(); assertTrue(((MainActivity)solo.getCurrentActivity()).isDrawerOpen()); } @@ -124,6 +126,7 @@ public class MainActivityTest { solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBack(); solo.goBack(); + solo.goBack(); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); } @@ -136,6 +139,7 @@ public class MainActivityTest { onView(withText(R.string.back_button_show_prompt)).perform(click()); solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBack(); + solo.goBack(); onView(withText(R.string.yes)).perform(click()); Thread.sleep(100); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); @@ -150,6 +154,7 @@ public class MainActivityTest { onView(withText(R.string.back_button_default)).perform(click()); solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBack(); + solo.goBack(); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); } } diff --git a/app/src/androidTest/java/de/test/antennapod/ui/NavigationDrawerTest.java b/app/src/androidTest/java/de/test/antennapod/ui/NavigationDrawerTest.java index e7fbbcb89..86b167db2 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/NavigationDrawerTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/NavigationDrawerTest.java @@ -12,6 +12,7 @@ import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.fragment.DownloadsFragment; import de.danoeh.antennapod.fragment.EpisodesFragment; +import de.danoeh.antennapod.fragment.NavDrawerFragment; import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; import de.danoeh.antennapod.fragment.QueueFragment; import de.test.antennapod.EspressoTestUtils; @@ -26,7 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static androidx.test.espresso.Espresso.onData; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.longClick; @@ -194,7 +194,7 @@ public class NavigationDrawerTest { List<String> hidden = UserPreferences.getHiddenDrawerItems(); assertEquals(titles.length, hidden.size()); - for (String tag : MainActivity.NAV_DRAWER_TAGS) { + for (String tag : NavDrawerFragment.NAV_DRAWER_TAGS) { assertTrue(hidden.contains(tag)); } } |