Read current media from preferences instead of activity->fragment->controller

3 files changed, 12 insertions, 7 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 bdcad215d..0784cb078 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -29,10 +29,12 @@ import static androidx.test.espresso.contrib.ActivityResultMatchers.hasResultCod
 import static androidx.test.espresso.intent.Intents.intended;
 import static androidx.test.espresso.intent.Intents.times;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 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.waitForView;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -79,7 +81,7 @@ public class MainActivityTest {
         onView(withText(R.string.confirm_label)).perform(scrollTo(), click());
         Espresso.closeSoftKeyboard();
         onView(withText(R.string.subscribe_label)).perform(click());
-        intended(hasComponent(MainActivity.class.getName()), times(2));
+        onView(isRoot()).perform(waitForView(withId(R.id.butShowSettings), 5000));
     }
 
     private String getActionbarTitle() {
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java b/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java
index ff797b9bc..a536e572e 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java
@@ -86,7 +86,7 @@ public class SpeedChangeTest {
     public void testChangeSpeedPlaying() {
         onView(isRoot()).perform(waitForView(withId(R.id.butPlay), 1000));
         onView(withId(R.id.butPlay)).perform(click());
-        Awaitility.await().atMost(2, TimeUnit.SECONDS).until(()
+        Awaitility.await().atMost(5, TimeUnit.SECONDS).until(()
                 -> activityRule.getActivity().getPlaybackController().getStatus() == PlayerStatus.PLAYING);
         clickThroughSpeeds();
     }
@@ -95,10 +95,10 @@ public class SpeedChangeTest {
     public void testChangeSpeedPaused() {
         onView(isRoot()).perform(waitForView(withId(R.id.butPlay), 1000));
         onView(withId(R.id.butPlay)).perform(click());
-        Awaitility.await().atMost(2, TimeUnit.SECONDS).until(()
+        Awaitility.await().atMost(5, TimeUnit.SECONDS).until(()
                 -> activityRule.getActivity().getPlaybackController().getStatus() == PlayerStatus.PLAYING);
         onView(withId(R.id.butPlay)).perform(click());
-        Awaitility.await().atMost(2, TimeUnit.SECONDS).until(()
+        Awaitility.await().atMost(5, TimeUnit.SECONDS).until(()
                 -> activityRule.getActivity().getPlaybackController().getStatus() == PlayerStatus.PAUSED);
         clickThroughSpeeds();
     }
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index 5e3f66f43..e3796b26a 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.util.Log;
 
 import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
+import de.danoeh.antennapod.core.util.playback.Playable;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -204,12 +205,14 @@ public class UITestUtils {
     }
 
     public PlaybackController getPlaybackController(MainActivity mainActivity) {
-        ExternalPlayerFragment fragment = (ExternalPlayerFragment)mainActivity.getSupportFragmentManager().findFragmentByTag(ExternalPlayerFragment.TAG);
+        ExternalPlayerFragment fragment = (ExternalPlayerFragment) mainActivity.getSupportFragmentManager()
+                .findFragmentByTag(ExternalPlayerFragment.TAG);
         return fragment.getPlaybackControllerTestingOnly();
     }
 
-    public FeedMedia getCurrentMedia(MainActivity mainActivity) {
-        return (FeedMedia)getPlaybackController(mainActivity).getMedia();
+    public FeedMedia getCurrentMedia() {
+        Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(context);
+        return (FeedMedia) playable;
     }
 
     public void setMediaFileName(String filename) {