diff options
Diffstat (limited to 'app/src/androidTest/java/de')
3 files changed, 13 insertions, 23 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java index 647ab911f..666cd845e 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java @@ -267,11 +267,11 @@ public class DBReaderTest { for (int i = 0; i < newItems.size(); i++) { unreadIds[i] = newItems.get(i).getId(); } - List<FeedItem> newItemsSaved = DBReader.getNewItemsList(); + List<FeedItem> newItemsSaved = DBReader.getNewItemsList(0, Integer.MAX_VALUE); assertNotNull(newItemsSaved); assertTrue(newItems.size() == newItemsSaved.size()); - for(int i=0; i < newItemsSaved.size(); i++) { - long savedId = newItemsSaved.get(i).getId(); + for (FeedItem feedItem : newItemsSaved) { + long savedId = feedItem.getId(); boolean found = false; for (long id : unreadIds) { if (id == savedId) { @@ -368,7 +368,6 @@ public class DBReaderTest { @Test public void testGetFeedItemlistCheckChaptersFalse() throws Exception { - Context context = InstrumentationRegistry.getTargetContext(); List<Feed> feeds = DBTestUtils.saveFeedlist(10, 10, false, false, 0); for (Feed feed : feeds) { for (FeedItem item : feed.getItems()) { diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java index a68afbc2e..7d3972378 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -164,7 +164,7 @@ public class PreferencesTest { @Test public void testHeadPhonesDisconnect() { - onView(withText(R.string.playback_pref)).perform(click()); + clickPreference(R.string.playback_pref); final boolean pauseOnHeadsetDisconnect = UserPreferences.isPauseOnHeadsetDisconnect(); onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click()); Awaitility.await().atMost(1000, MILLISECONDS) @@ -176,7 +176,7 @@ public class PreferencesTest { @Test public void testHeadPhonesReconnect() { - onView(withText(R.string.playback_pref)).perform(click()); + clickPreference(R.string.playback_pref); if (!UserPreferences.isPauseOnHeadsetDisconnect()) { onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click()); Awaitility.await().atMost(1000, MILLISECONDS) @@ -193,7 +193,7 @@ public class PreferencesTest { @Test public void testBluetoothReconnect() { - onView(withText(R.string.playback_pref)).perform(click()); + clickPreference(R.string.playback_pref); if (!UserPreferences.isPauseOnHeadsetDisconnect()) { onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click()); Awaitility.await().atMost(1000, MILLISECONDS) @@ -222,7 +222,7 @@ public class PreferencesTest { @Test public void testAutoDelete() { - onView(withText(R.string.storage_pref)).perform(click()); + clickPreference(R.string.storage_pref); final boolean autoDelete = UserPreferences.isAutoDelete(); onView(withText(R.string.pref_auto_delete_title)).perform(click()); Awaitility.await().atMost(1000, MILLISECONDS) @@ -245,7 +245,7 @@ public class PreferencesTest { @Test public void testPauseForInterruptions() { - onView(withText(R.string.playback_pref)).perform(click()); + clickPreference(R.string.playback_pref); final boolean pauseForFocusLoss = UserPreferences.shouldPauseForFocusLoss(); clickPreference(R.string.pref_pausePlaybackForFocusLoss_title); Awaitility.await().atMost(1000, MILLISECONDS) @@ -257,7 +257,7 @@ public class PreferencesTest { @Test public void testDisableUpdateInterval() { - onView(withText(R.string.network_pref)).perform(click()); + clickPreference(R.string.network_pref); onView(withText(R.string.pref_autoUpdateIntervallOrTime_title)).perform(click()); onView(withText(R.string.pref_autoUpdateIntervallOrTime_Disable)).perform(click()); Awaitility.await().atMost(1000, MILLISECONDS) @@ -385,7 +385,7 @@ public class PreferencesTest { @Test public void testEpisodeCleanupQueueOnly() { - onView(withText(R.string.network_pref)).perform(click()); + clickPreference(R.string.network_pref); onView(withText(R.string.pref_automatic_download_title)).perform(click()); onView(withText(R.string.pref_episode_cleanup_title)).perform(click()); onView(isRoot()).perform(waitForView(withText(R.string.episode_cleanup_queue_removal), 1000)); @@ -396,7 +396,7 @@ public class PreferencesTest { @Test public void testEpisodeCleanupNeverAlg() { - onView(withText(R.string.network_pref)).perform(click()); + clickPreference(R.string.network_pref); onView(withText(R.string.pref_automatic_download_title)).perform(click()); onView(withText(R.string.pref_episode_cleanup_title)).perform(click()); onView(withId(R.id.select_dialog_listview)).perform(swipeUp()); @@ -407,7 +407,7 @@ public class PreferencesTest { @Test public void testEpisodeCleanupClassic() { - onView(withText(R.string.network_pref)).perform(click()); + clickPreference(R.string.network_pref); onView(withText(R.string.pref_automatic_download_title)).perform(click()); onView(withText(R.string.pref_episode_cleanup_title)).perform(click()); onView(isRoot()).perform(waitForView(withText(R.string.episode_cleanup_after_listening), 1000)); 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 8e16d1a3b..4365fa0ae 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java @@ -98,15 +98,6 @@ public class UITestUtils { return String.format("%s/files/%d", server.getBaseUrl(), id); } - private File newBitmapFile(String name) throws IOException { - File imgFile = new File(destDir, name); - Bitmap bitmap = Bitmap.createBitmap(128, 128, Bitmap.Config.ARGB_8888); - FileOutputStream out = new FileOutputStream(imgFile); - bitmap.compress(Bitmap.CompressFormat.PNG, 1, out); - out.close(); - return imgFile; - } - private File newMediaFile(String name) throws IOException { File mediaFile = new File(hostedMediaDir, name); if (mediaFile.exists()) { @@ -201,7 +192,7 @@ public class UITestUtils { PodDBAdapter adapter = PodDBAdapter.getInstance(); adapter.open(); - adapter.setCompleteFeed(hostedFeeds.toArray(new Feed[hostedFeeds.size()])); + adapter.setCompleteFeed(hostedFeeds.toArray(new Feed[0])); adapter.setQueue(queue); adapter.close(); EventBus.getDefault().post(new FeedListUpdateEvent(hostedFeeds)); |