diff options
| author | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 12:36:45 +0200 |
|---|---|---|
| committer | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 13:13:19 +0200 |
| commit | 87cca61dcd8337facf695f03f1330c55bfa85168 (patch) | |
| tree | 630888c57de93856f33184ec475f01716812deff /app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java | |
| parent | cc9c8bb63a27deb35f0e234d252e22a73ef6c117 (diff) | |
| parent | 2ffdc275b8dd127f15506556d1b7ba9fb9108b47 (diff) | |
| download | AntennaPod-87cca61dcd8337facf695f03f1330c55bfa85168.zip | |
Merge remote-tracking branch 'origin/develop' into feat/simple-adjust-volume-per-feed
Diffstat (limited to 'app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java')
| -rw-r--r-- | app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java index d1ca25ad3..e4081a55a 100644 --- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java +++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java @@ -2,8 +2,8 @@ package de.test.antennapod.service.playback; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; import de.danoeh.antennapod.core.feed.VolumeReductionSetting; import de.test.antennapod.EspressoTestUtils; import junit.framework.AssertionFailedError; @@ -33,7 +33,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static android.support.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.InstrumentationRegistry.getInstrumentation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; |