From acb94db6d62ffd66732d99cf66697c88a8ca3dfe Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Thu, 28 Sep 2017 06:40:06 -0500 Subject: [PATCH] Introduce failing test for bug #339 --- .../java/org/isoron/uhabits/BaseUserInterfaceTest.java | 2 +- .../java/org/isoron/uhabits/acceptance/HabitsTest.java | 3 +-- .../isoron/uhabits/acceptance/steps/CommonSteps.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java index 75516133a..e2dfb6b1f 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java @@ -60,9 +60,9 @@ public class BaseUserInterfaceTest @Before public void setUp() throws Exception { + device = getInstance(getInstrumentation()); TestButler.setup(getTargetContext()); TestButler.verifyAnimationsDisabled(getTargetContext()); - device = getInstance(getInstrumentation()); HabitsApplication app = (HabitsApplication) getTargetContext().getApplicationContext(); diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java index e76bae1c2..035e0c150 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java @@ -31,7 +31,6 @@ import static org.isoron.uhabits.acceptance.steps.CommonSteps.*; import static org.isoron.uhabits.acceptance.steps.EditHabitSteps.*; import static org.isoron.uhabits.acceptance.steps.ListHabitsSteps.MenuItem.*; import static org.isoron.uhabits.acceptance.steps.ListHabitsSteps.*; -import static org.isoron.uhabits.acceptance.steps.ListHabitsSteps.MenuItem.EDIT; @RunWith(AndroidJUnit4.class) @LargeTest @@ -94,7 +93,7 @@ public class HabitsTest extends BaseUserInterfaceTest clickSave(); verifyShowsScreen(LIST_HABITS); - verifyDisplaysText("Take a walk"); + verifyDisplaysTextInSequence("Wake up early", "Take a walk", "Meditate"); verifyDoesNotDisplayText("Track time"); } diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java index fbbafe672..14b16144b 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java @@ -31,6 +31,7 @@ import org.isoron.uhabits.activities.habits.list.*; import static android.support.test.espresso.Espresso.*; import static android.support.test.espresso.action.ViewActions.*; +import static android.support.test.espresso.assertion.PositionAssertions.*; import static android.support.test.espresso.assertion.ViewAssertions.*; import static android.support.test.espresso.matcher.ViewMatchers.*; import static junit.framework.Assert.*; @@ -114,6 +115,15 @@ public class CommonSteps extends BaseUserInterfaceTest onView(withText(text)).check(matches(isEnabled())); } + public static void verifyDisplaysTextInSequence(String... text) + { + verifyDisplaysText(text[0]); + for(int i = 1; i < text.length; i++) { + verifyDisplaysText(text[i]); + onView(withText(text[i])).check(isBelow(withText(text[i-1]))); + } + } + private static void verifyDisplaysView(String className) { onView(withClassName(endsWith(className))).check(matches(isEnabled()));