diff options
Diffstat (limited to 'app/src/androidTest/java/de/test/antennapod/ui')
3 files changed, 12 insertions, 33 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java index 0326174e3..65c962f01 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java @@ -78,7 +78,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv openNavDrawer(); solo.clickOnText(solo.getString(R.string.add_feed_label)); solo.enterText(0, feed.getDownload_url()); - solo.clickOnButton(0); + solo.clickOnButton(solo.getString(R.string.confirm_label)); solo.waitForActivity(DefaultOnlineFeedViewActivity.class); solo.waitForView(R.id.butSubscribe); assertEquals(solo.getString(R.string.subscribe_label), solo.getButton(0).getText().toString()); 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 eb1cb9c71..a6af6c544 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -39,7 +39,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference Timeout.setLargeTimeout(1000); context = getInstrumentation().getTargetContext(); res = getActivity().getResources(); - UserPreferences.createInstance(context); + UserPreferences.init(context); } @Override @@ -231,7 +231,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference return pauseForFocusLoss != UserPreferences.shouldPauseForFocusLoss(); } }, Timeout.getLargeTimeout()); - solo.clickOnText(solo.getString(R.string.pref_auto_delete_title)); + solo.clickOnText(solo.getString(R.string.pref_pausePlaybackForFocusLoss_title)); solo.waitForCondition(new Condition() { @Override public boolean isSatisfied() { @@ -241,9 +241,9 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference } public void testDisableUpdateInterval() { - solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervall_title)); + solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_sum)); solo.waitForDialogToOpen(); - solo.clickOnText(solo.getString(R.string.pref_update_interval_hours_manual)); + solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_Disable)); solo.waitForCondition(new Condition() { @Override public boolean isSatisfied() { @@ -253,7 +253,9 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference } public void testSetUpdateInterval() { - solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervall_title)); + solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_title)); + solo.waitForDialogToOpen(); + solo.clickOnText(solo.getString(R.string.pref_autoUpdateIntervallOrTime_Interval)); solo.waitForDialogToOpen(); String search = "12 " + solo.getString(R.string.pref_update_interval_hours_plural); solo.clickOnText(search); @@ -424,30 +426,4 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference } }, Timeout.getLargeTimeout()); } - - @FlakyTest(tolerance = 3) - public void testAbout() throws IOException { - int numViews = 0, numLinks = 0; - InputStream input = getActivity().getResources().getAssets().open("about.html"); - List<String> lines = IOUtils.readLines(input); - input.close(); - for(String line : lines) { - if(line.contains("(View)")) { - numViews++; - } else if(line.contains("(Link)")) { - numLinks++; - } - } - for(int i=0; i < numViews; i++) { - solo.clickOnText(solo.getString(R.string.about_pref)); - solo.clickOnText("(View)", i); - solo.goBack(); - } - for(int i=0; i < numLinks; i++) { - solo.clickOnText(solo.getString(R.string.about_pref)); - solo.clickOnText("(Link)", i); - solo.goBack(); - } - } - } 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 613826932..7bbc6e462 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java @@ -111,6 +111,9 @@ public class UITestUtils { private File newMediaFile(String name) throws IOException { File mediaFile = new File(hostedMediaDir, name); + if(mediaFile.exists()) { + mediaFile.delete(); + } Assert.assertFalse(mediaFile.exists()); InputStream in = context.getAssets().open("testfile.mp3"); @@ -142,7 +145,7 @@ public class UITestUtils { List<FeedItem> items = new ArrayList<FeedItem>(); for (int j = 0; j < NUM_ITEMS_PER_FEED; j++) { FeedItem item = new FeedItem(j, "Feed " + (i+1) + ": Item " + (j+1), "item" + j, - "http://example.com/feed" + i + "/item/" + j, new Date(), false, feed); + "http://example.com/feed" + i + "/item/" + j, new Date(), FeedItem.UNPLAYED, feed); items.add(item); File mediaFile = newMediaFile("feed-" + i + "-episode-" + j + ".mp3"); |