From 31861ca285d721f9170077e8486ddb298e9aa426 Mon Sep 17 00:00:00 2001 From: Soso Tughushi Date: Wed, 29 Jun 2016 19:56:39 +0400 Subject: Fixed rule 'Lamdbas containing only one statement should not nest this statement in a block' --- .../androidTest/java/de/test/antennapod/ui/PlaybackSonicTest.java | 8 ++++---- app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'app/src/androidTest/java/de/test/antennapod/ui') 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 { - 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 }, 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(); -- cgit v1.2.3 From da7fe225d0648f259f25e6a5aa624e4ddd35b246 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Thu, 4 Aug 2016 21:18:29 +0200 Subject: Fix test --- app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/androidTest/java/de/test/antennapod/ui') 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 Date: Wed, 28 Sep 2016 19:37:08 -0700 Subject: Added tests for preference settings to customize fastforward and rewind delta. --- .../de/test/antennapod/ui/PreferencesTest.java | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'app/src/androidTest/java/de/test/antennapod/ui') 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..8d8d727bd 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,57 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2= 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())); + + //Log.d("PreferencesTest", "After rewind secs: " + UserPreferences.getRewindSecs()); + + } + + 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); + + //Log.d("PreferencesTest", "Before fastForward secs: " + UserPreferences.getFastForwardSecs()); + + 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())); + + //Log.d("PreferencesTest", "After fastForward secs: " + UserPreferences.getFastForwardSecs()); + } + } } -- cgit v1.2.3 From db4f9bc97852ad13efee8c205268590825899221 Mon Sep 17 00:00:00 2001 From: eraymond Date: Sun, 2 Oct 2016 12:53:10 -0700 Subject: Removed commented out debugging code and superfluous comments. Change order of protected static keywords. --- app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/src/androidTest/java/de/test/antennapod/ui') 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 8d8d727bd..e29d77e8d 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -369,8 +369,6 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2 UserPreferences.getRewindSecs() == deltas[newIndex], Timeout.getLargeTimeout())); - - //Log.d("PreferencesTest", "After rewind secs: " + UserPreferences.getRewindSecs()); - } public void testFastForwardChange() { -- cgit v1.2.3 From dc38ecdd688423232a7c1ac51d6efbecba1f5eab Mon Sep 17 00:00:00 2001 From: eraymond Date: Sun, 2 Oct 2016 12:57:15 -0700 Subject: Removed commented out debugging code and superfluous comments. Change order of protected static keywords. --- app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/src/androidTest/java/de/test/antennapod/ui') 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 e29d77e8d..91928f01e 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -391,8 +391,6 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2 UserPreferences.getFastForwardSecs() == deltas[newIndex], Timeout.getLargeTimeout())); - - //Log.d("PreferencesTest", "After fastForward secs: " + UserPreferences.getFastForwardSecs()); } } } -- cgit v1.2.3