diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-04-09 20:34:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 20:34:43 +0200 |
| commit | 5cbf092f3bde5c185c1826a941909db5f2a32c7d (patch) | |
| tree | f20546ce2e40c7037cb3aaadadbb113afdd8bbae /app/src/androidTest/java/de/test/antennapod | |
| parent | dc38ecdd688423232a7c1ac51d6efbecba1f5eab (diff) | |
| parent | 4d256b7323d5a00b081508b13eb9141ab3aa9035 (diff) | |
| download | AntennaPod-5cbf092f3bde5c185c1826a941909db5f2a32c7d.zip | |
Merge branch 'develop' into develop
Diffstat (limited to 'app/src/androidTest/java/de/test/antennapod')
| -rw-r--r-- | app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java | 2 | ||||
| -rw-r--r-- | app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java | 2 |
2 files changed, 2 insertions, 2 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 30ab365bf..9ac92c2f9 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 @@ -789,7 +789,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase { } @Override - public void onPostPlayback(@NonNull Playable media, boolean ended, boolean playingNext) { + public void onPostPlayback(@NonNull Playable media, boolean ended, boolean skipped, boolean playingNext) { } diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java index 78b807710..d02efa521 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java @@ -44,7 +44,7 @@ public class DBTestUtils { PodDBAdapter adapter = PodDBAdapter.getInstance(); adapter.open(); for (int i = 0; i < numFeeds; i++) { - Feed f = new Feed(0, null, "feed " + i, "link" + i, "descr", null, null, + Feed f = new Feed(0, null, "feed " + i, null, "link" + i, "descr", null, null, null, null, "id" + i, null, null, "url" + i, false, new FlattrStatus(), false, null, null, false); f.setItems(new ArrayList<>()); for (int j = 0; j < numItems; j++) { |