Add 'default screen' setting (replaces 'back button behavior') (#6041)

1 files changed, 4 insertions, 96 deletions

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 81d7731c5..a55670ed6 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -1,16 +1,15 @@
 package de.test.antennapod.ui;
 
-import android.app.Activity;
 import android.content.Intent;
-
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.robotium.solo.Solo;
-
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.storage.database.PodDBAdapter;
+import de.test.antennapod.EspressoTestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -19,27 +18,14 @@ import org.junit.runner.RunWith;
 
 import java.io.IOException;
 
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.model.feed.Feed;
-import de.test.antennapod.EspressoTestUtils;
-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.replaceText;
 import static androidx.test.espresso.action.ViewActions.scrollTo;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.contrib.ActivityResultMatchers.hasResultCode;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static de.test.antennapod.EspressoTestUtils.clickPreference;
 import static de.test.antennapod.EspressoTestUtils.openNavDrawer;
 import static de.test.antennapod.EspressoTestUtils.waitForViewGlobally;
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * User interface tests for MainActivity.
@@ -47,7 +33,6 @@ import static org.junit.Assert.assertTrue;
 @RunWith(AndroidJUnit4.class)
 public class MainActivityTest {
 
-    private Solo solo;
     private UITestUtils uiTestUtils;
 
     @Rule
@@ -62,8 +47,6 @@ public class MainActivityTest {
 
         uiTestUtils = new UITestUtils(InstrumentationRegistry.getInstrumentation().getTargetContext());
         uiTestUtils.setup();
-
-        solo = new Solo(InstrumentationRegistry.getInstrumentation(), activityRule.getActivity());
     }
 
     @After
@@ -91,79 +74,4 @@ public class MainActivityTest {
         // wait for podcast feed item list
         waitForViewGlobally(withId(R.id.butShowSettings), 15000);
     }
-
-    @Test
-    public void testBackButtonBehaviorGoToPage() {
-        openNavDrawer();
-        onView(withText(R.string.settings_label)).perform(click());
-        clickPreference(R.string.user_interface_label);
-        clickPreference(R.string.pref_back_button_behavior_title);
-
-        onView(withText(R.string.back_button_go_to_page)).perform(click());
-        onView(withText(R.string.subscriptions_label)).perform(click());
-        onView(withText(R.string.confirm_label)).perform(click());
-
-        solo.goBackToActivity(MainActivity.class.getSimpleName());
-        solo.goBack();
-        solo.goBack();
-        onView(allOf(withId(R.id.toolbar), isDisplayed())).check(
-                matches(hasDescendant(withText(R.string.subscriptions_label))));
-        solo.goBack();
-        assertThat(activityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
-    }
-
-    @Test
-    public void testBackButtonBehaviorOpenDrawer() {
-        openNavDrawer();
-        onView(withText(R.string.settings_label)).perform(click());
-        clickPreference(R.string.user_interface_label);
-        clickPreference(R.string.pref_back_button_behavior_title);
-        onView(withText(R.string.back_button_open_drawer)).perform(click());
-        solo.goBackToActivity(MainActivity.class.getSimpleName());
-        solo.goBack();
-        solo.goBack();
-        assertTrue(((MainActivity) solo.getCurrentActivity()).isDrawerOpen());
-    }
-
-    @Test
-    public void testBackButtonBehaviorDoubleTap() {
-        openNavDrawer();
-        onView(withText(R.string.settings_label)).perform(click());
-        clickPreference(R.string.user_interface_label);
-        clickPreference(R.string.pref_back_button_behavior_title);
-        onView(withText(R.string.back_button_double_tap)).perform(click());
-        solo.goBackToActivity(MainActivity.class.getSimpleName());
-        solo.goBack();
-        solo.goBack();
-        solo.goBack();
-        assertThat(activityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
-    }
-
-    @Test
-    public void testBackButtonBehaviorPrompt() throws Exception {
-        openNavDrawer();
-        onView(withText(R.string.settings_label)).perform(click());
-        clickPreference(R.string.user_interface_label);
-        clickPreference(R.string.pref_back_button_behavior_title);
-        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(activityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
-    }
-
-    @Test
-    public void testBackButtonBehaviorDefault() {
-        openNavDrawer();
-        onView(withText(R.string.settings_label)).perform(click());
-        clickPreference(R.string.user_interface_label);
-        clickPreference(R.string.pref_back_button_behavior_title);
-        onView(withText(R.string.back_button_default)).perform(click());
-        solo.goBackToActivity(MainActivity.class.getSimpleName());
-        solo.goBack();
-        solo.goBack();
-        assertThat(activityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
-    }
 }