Merge pull request #1072 from mfietz/feature/shake_sleeptimer

Sleep Timer: Shake to reset, lower volume, vibrate, remember preferences

1 files changed, 55 insertions, 5 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index edb576249..385201f25 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -122,11 +122,21 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
             }
 
             @Override
+            public void onSleepTimerAlmostExpired() {
+
+            }
+
+            @Override
             public void onSleepTimerExpired() {
 
             }
 
             @Override
+            public void onSleepTimerReset() {
+
+            }
+
+            @Override
             public void onWidgetUpdaterTick() {
 
             }
@@ -170,11 +180,21 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
             }
 
             @Override
+            public void onSleepTimerAlmostExpired() {
+
+            }
+
+            @Override
             public void onSleepTimerExpired() {
 
             }
 
             @Override
+            public void onSleepTimerReset() {
+
+            }
+
+            @Override
             public void onWidgetUpdaterTick() {
                 countDownLatch.countDown();
             }
@@ -221,7 +241,7 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
         PlaybackServiceTaskManager pstm = new PlaybackServiceTaskManager(c, defaultPSTM);
         pstm.startWidgetUpdater();
         pstm.startPositionSaver();
-        pstm.setSleepTimer(100000);
+        pstm.setSleepTimer(100000, false, false);
         pstm.cancelAllTasks();
         assertFalse(pstm.isPositionSaverActive());
         assertFalse(pstm.isWidgetUpdaterActive());
@@ -241,6 +261,11 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
             }
 
             @Override
+            public void onSleepTimerAlmostExpired() {
+
+            }
+
+            @Override
             public void onSleepTimerExpired() {
                 if (countDownLatch.getCount() == 0) {
                     fail();
@@ -249,6 +274,11 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
             }
 
             @Override
+            public void onSleepTimerReset() {
+
+            }
+
+            @Override
             public void onWidgetUpdaterTick() {
 
             }
@@ -258,7 +288,7 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
 
             }
         });
-        pstm.setSleepTimer(TIME);
+        pstm.setSleepTimer(TIME, false, false);
         countDownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
         pstm.shutdown();
     }
@@ -275,11 +305,21 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
             }
 
             @Override
+            public void onSleepTimerAlmostExpired() {
+
+            }
+
+            @Override
             public void onSleepTimerExpired() {
                 fail("Sleeptimer expired");
             }
 
             @Override
+            public void onSleepTimerReset() {
+
+            }
+
+            @Override
             public void onWidgetUpdaterTick() {
 
             }
@@ -289,7 +329,7 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
 
             }
         });
-        pstm.setSleepTimer(TIME);
+        pstm.setSleepTimer(TIME, false, false);
         pstm.disableSleepTimer();
         assertFalse(countDownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS));
         pstm.shutdown();
@@ -298,7 +338,7 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
     public void testIsSleepTimerActivePositive() {
         final Context c = getInstrumentation().getTargetContext();
         PlaybackServiceTaskManager pstm = new PlaybackServiceTaskManager(c, defaultPSTM);
-        pstm.setSleepTimer(10000);
+        pstm.setSleepTimer(10000, false, false);
         assertTrue(pstm.isSleepTimerActive());
         pstm.shutdown();
     }
@@ -306,7 +346,7 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
     public void testIsSleepTimerActiveNegative() {
         final Context c = getInstrumentation().getTargetContext();
         PlaybackServiceTaskManager pstm = new PlaybackServiceTaskManager(c, defaultPSTM);
-        pstm.setSleepTimer(10000);
+        pstm.setSleepTimer(10000, false, false);
         pstm.disableSleepTimer();
         assertFalse(pstm.isSleepTimerActive());
         pstm.shutdown();
@@ -319,11 +359,21 @@ public class PlaybackServiceTaskManagerTest extends InstrumentationTestCase {
         }
 
         @Override
+        public void onSleepTimerAlmostExpired() {
+
+        }
+
+        @Override
         public void onSleepTimerExpired() {
 
         }
 
         @Override
+        public void onSleepTimerReset() {
+
+        }
+
+        @Override
         public void onWidgetUpdaterTick() {
 
         }