1 files changed, 10 insertions, 12 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java
index 00eef5c8d..b89f1b9bc 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/AutoDownloadTest.java
@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+import de.test.antennapod.EspressoTestUtils;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.After;
@@ -14,6 +16,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.DBTasksCallbacks;
@@ -49,21 +52,16 @@ public class AutoDownloadTest {
 
         dbTasksCallbacksOrig = ClientConfig.dbTasksCallbacks;
 
-        // create new database
-        PodDBAdapter.init(context);
-        PodDBAdapter.deleteDatabase();
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        adapter.close();
+        EspressoTestUtils.clearPreferences();
+        EspressoTestUtils.clearDatabase();
+        UserPreferences.setAllowMobileStreaming(true);
     }
 
     @After
     public void tearDown() throws Exception {
-        stubFeedsServer.tearDown();
         ClientConfig.dbTasksCallbacks = dbTasksCallbacksOrig;
-
-        context.sendBroadcast(new Intent(PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE));
-        Awaitility.await().until(() -> !PlaybackService.isRunning);
+        EspressoTestUtils.tryKillPlaybackService();
+        stubFeedsServer.tearDown();
     }
 
     /**
@@ -117,7 +115,7 @@ public class AutoDownloadTest {
         FeedMedia media = item.getMedia();
         DBTasks.playMedia(context, media, false, true, true);
         Awaitility.await("episode is playing")
-                .atMost(1000, MILLISECONDS)
+                .atMost(2000, MILLISECONDS)
                 .until(() -> item.equals(getCurrentlyPlaying()));
     }
 
@@ -126,7 +124,7 @@ public class AutoDownloadTest {
         if (playable == null) {
             return null;
         }
-        return ((FeedMedia)playable).getItem();
+        return ((FeedMedia) playable).getItem();
     }
 
     private void useDownloadAlgorithm(final AutomaticDownloadAlgorithm downloadAlgorithm) {