From 74e0dcf706a4bd3c5ab993b15dc23e43e0e705ba Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 4 Jun 2017 12:46:16 -0400 Subject: [PATCH] Disable PebbleReceiver tests on KitKat --- .../java/org/isoron/uhabits/BaseAndroidTest.java | 2 +- .../org/isoron/uhabits/receivers/PebbleReceiverTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index b3d750ab6..a243ca870 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java @@ -121,7 +121,7 @@ public class BaseAndroidTest extends TestCase protected void awaitLatch() throws InterruptedException { - assertTrue(latch.await(60, TimeUnit.SECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); } protected void setLocale(@NonNull String language, @NonNull String country) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java index e431f4877..9eebeb7e3 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java @@ -33,6 +33,8 @@ import org.json.*; import org.junit.*; import org.junit.runner.*; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.KITKAT; import static com.getpebble.android.kit.Constants.MSG_DATA; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.core.IsEqual.*; @@ -62,6 +64,8 @@ public class PebbleReceiverTest extends BaseAndroidTest @Test public void testCount() throws Exception { + if(SDK_INT <= KITKAT) return; + onPebbleReceived((dict) -> { assertThat(dict.getString(0), equalTo("COUNT")); assertThat(dict.getInteger(1), equalTo(2L)); @@ -75,6 +79,8 @@ public class PebbleReceiverTest extends BaseAndroidTest @Test public void testFetch() throws Exception { + if(SDK_INT <= KITKAT) return; + onPebbleReceived((dict) -> { assertThat(dict.getString(0), equalTo("HABIT")); assertThat(dict.getInteger(1), equalTo(habit2.getId()));