Merge branch 'develop'

4 files changed, 54 insertions, 9 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 9a0e11816..bd9057b47 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -138,7 +138,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         ListView list = (ListView) solo.getView(R.id.nav_list);
         for (int i = 0; i < uiTestUtils.hostedFeeds.size(); i++) {
             Feed f = uiTestUtils.hostedFeeds.get(i);
-            solo.clickOnScreen(50, 50); // open nav drawer
+            openNavDrawer();
             solo.scrollListToLine(list, i);
             solo.clickOnText(f.getTitle());
             solo.waitForView(android.R.id.list);
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
index d4994fb1a..bfbeedd83 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java
@@ -245,10 +245,10 @@ public class PlaybackSonicTest extends ActivityInstrumentationTestCase2<MainActi
         }, Timeout.getSmallTimeout());
         assertTrue(startedPlaying);
 
-        boolean stoppedPlaying = solo.waitForCondition(() -> {
-            return uiTestUtils.getCurrentMedia(getActivity()) == null
-                    || uiTestUtils.getCurrentMedia(getActivity()).getId() != mediaId;
-        }, Timeout.getLargeTimeout());
+        boolean stoppedPlaying = solo.waitForCondition(() ->
+                uiTestUtils.getCurrentMedia(getActivity()) == null
+                    || uiTestUtils.getCurrentMedia(getActivity()).getId() != mediaId
+        , Timeout.getLargeTimeout());
         assertTrue(stoppedPlaying);
 
         startLocalPlayback();
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
index 5ce495f9a..661c2200b 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
@@ -236,10 +236,9 @@ public class PlaybackTest extends ActivityInstrumentationTestCase2<MainActivity>
         }, Timeout.getSmallTimeout());
         assertTrue(startedPlaying);
 
-        boolean stoppedPlaying = solo.waitForCondition(() -> {
-            return uiTestUtils.getCurrentMedia(getActivity()) == null
-                    || uiTestUtils.getCurrentMedia(getActivity()).getId() != mediaId;
-        }, Timeout.getLargeTimeout());
+        boolean stoppedPlaying = solo.waitForCondition(() ->
+                uiTestUtils.getCurrentMedia(getActivity()) == null
+                || uiTestUtils.getCurrentMedia(getActivity()).getId() != mediaId, Timeout.getLargeTimeout());
         assertTrue(stoppedPlaying);
 
         startLocalPlayback();
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 040f4150b..91928f01e 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -3,10 +3,12 @@ package de.test.antennapod.ui;
 import android.content.Context;
 import android.content.res.Resources;
 import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
 
 import com.robotium.solo.Solo;
 import com.robotium.solo.Timeout;
 
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.R;
@@ -362,4 +364,48 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
                 Timeout.getLargeTimeout()));
     }
 
+
+    public void testRewindChange() {
+        int seconds = UserPreferences.getRewindSecs();
+        int deltas[] = res.getIntArray(R.array.seek_delta_values);
+
+        solo.clickOnText(solo.getString(R.string.pref_rewind));
+        solo.waitForDialogToOpen();
+
+        int currentIndex = Arrays.binarySearch(deltas, seconds);
+        assertTrue(currentIndex >= 0 && currentIndex < deltas.length);  // found?
+
+        // Find next value (wrapping around to next)
+        int newIndex = (currentIndex + 1) % deltas.length;
+
+        solo.clickOnText(String.valueOf(deltas[newIndex]) + " seconds");
+        solo.clickOnButton("Confirm");
+
+        solo.waitForDialogToClose();
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getRewindSecs() == deltas[newIndex],
+                Timeout.getLargeTimeout()));
+    }
+
+    public void testFastForwardChange() {
+        for (int i = 2; i > 0; i--) { // repeat twice to catch any error where fastforward is tracking rewind
+            int seconds = UserPreferences.getFastForwardSecs();
+            int deltas[] = res.getIntArray(R.array.seek_delta_values);
+
+            solo.clickOnText(solo.getString(R.string.pref_fast_forward));
+            solo.waitForDialogToOpen();
+
+            int currentIndex = Arrays.binarySearch(deltas, seconds);
+            assertTrue(currentIndex >= 0 && currentIndex < deltas.length);  // found?
+
+            // Find next value (wrapping around to next)
+            int newIndex = (currentIndex + 1) % deltas.length;
+
+            solo.clickOnText(String.valueOf(deltas[newIndex]) + " seconds");
+            solo.clickOnButton("Confirm");
+
+            solo.waitForDialogToClose();
+            assertTrue(solo.waitForCondition(() -> UserPreferences.getFastForwardSecs() == deltas[newIndex],
+                    Timeout.getLargeTimeout()));
+        }
+    }
 }