summaryrefslogtreecommitdiff
path: root/app/src/androidTest/java/de/test/antennapod/feed
diff options
context:
space:
mode:
authorJonas Kalderstam <jonas@cowboyprogrammer.org>2019-10-05 01:18:14 +0200
committerJonas Kalderstam <jonas@cowboyprogrammer.org>2019-10-05 01:18:14 +0200
commit97aa36061186ae589b26e90939a32e83573368c2 (patch)
treeda900ade55ada0976017046c8ba0b7dd49937f9e /app/src/androidTest/java/de/test/antennapod/feed
parentde78c0e31eeff0609fe5388204e6e39e8f60579b (diff)
parenteb70b4e0fa48f72eef50b2ca55eb590ae5df5726 (diff)
downloadAntennaPod-97aa36061186ae589b26e90939a32e83573368c2.zip
Merge remote-tracking branch 'antennapod/develop' into per_feed_playbackspeed
Diffstat (limited to 'app/src/androidTest/java/de/test/antennapod/feed')
-rw-r--r--app/src/androidTest/java/de/test/antennapod/feed/FeedFilterTest.java2
-rw-r--r--app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/feed/FeedFilterTest.java b/app/src/androidTest/java/de/test/antennapod/feed/FeedFilterTest.java
index 8cd9b0fa1..4b81a4f2b 100644
--- a/app/src/androidTest/java/de/test/antennapod/feed/FeedFilterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/feed/FeedFilterTest.java
@@ -1,6 +1,6 @@
package de.test.antennapod.feed;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import de.danoeh.antennapod.core.feed.FeedFilter;
import de.danoeh.antennapod.core.feed.FeedItem;
import org.junit.Test;
diff --git a/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java b/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java
index 9779b32a5..0b9a67d0a 100644
--- a/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/feed/FeedItemTest.java
@@ -1,6 +1,6 @@
package de.test.antennapod.feed;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import de.danoeh.antennapod.core.feed.FeedItem;
import org.junit.Test;