diff --git a/app/src/androidTest/java/com/a1/nextlocation/CouponFragmentTest.java b/app/src/androidTest/java/com/a1/nextlocation/CouponFragmentTest.java index b27e97b..e5d4342 100644 --- a/app/src/androidTest/java/com/a1/nextlocation/CouponFragmentTest.java +++ b/app/src/androidTest/java/com/a1/nextlocation/CouponFragmentTest.java @@ -30,14 +30,14 @@ public class CouponFragmentTest { @Test public void clickBackButton() throws Exception{ mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new CouponFragment()).commit(); - onView(withId(R.id.couponBackButton)).perform(click()); + onView(withId(R.id.coupon_back_button)).perform(click()); onView(withId(R.id.statisticsFragment)).check(matches(isDisplayed())); } @Test public void clickDetailButton() throws Exception{ mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new CouponFragment()).commit(); - onView(withId(R.id.couponRecyclerView)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click())); + onView(withId(R.id.coupon_recyclerview)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click())); onView(withText("activeren")).inRoot(RootMatchers.isDialog()).perform(click()); onView(withText("Klaar")).inRoot(RootMatchers.isDialog()).check(matches(isDisplayed())); diff --git a/app/src/androidTest/java/com/a1/nextlocation/LocationDetailFragment.java b/app/src/androidTest/java/com/a1/nextlocation/LocationDetailFragment.java new file mode 100644 index 0000000..aae88e4 --- /dev/null +++ b/app/src/androidTest/java/com/a1/nextlocation/LocationDetailFragment.java @@ -0,0 +1,26 @@ +package com.a1.nextlocation; + +import androidx.test.rule.ActivityTestRule; + +import com.a1.nextlocation.fragments.CouponFragment; + +import org.junit.Rule; +import org.junit.Test; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; + +public class LocationDetailFragment { + @Rule + public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(MainActivity.class); + + @Test + public void clickBackButton() throws Exception{ + mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new com.a1.nextlocation.fragments.LocationDetailFragment()).commit(); + onView(withId(R.id.detail_location_back_button)).perform(click()); + onView(withId(R.id.locationFragment)).check(matches(isDisplayed())); + } +} diff --git a/app/src/androidTest/java/com/a1/nextlocation/LocationFragmentTest.java b/app/src/androidTest/java/com/a1/nextlocation/LocationFragmentTest.java index f6d1e55..19dedd2 100644 --- a/app/src/androidTest/java/com/a1/nextlocation/LocationFragmentTest.java +++ b/app/src/androidTest/java/com/a1/nextlocation/LocationFragmentTest.java @@ -25,7 +25,7 @@ public class LocationFragmentTest { @Test public void clickBackButton() throws Exception{ mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new LocationFragment()).commit(); - onView(withId(R.id.locationBackButton)).perform(click()); + onView(withId(R.id.location_back_button)).perform(click()); onView(withId(R.id.homeFragment)).check(matches(isDisplayed())); } @@ -33,7 +33,7 @@ public class LocationFragmentTest { @Test public void clickDetailButton() throws Exception{ mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new LocationFragment()).commit(); - onView(withId(R.id.locationRecyclerView)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click())); + onView(withId(R.id.location_recyclerview)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click())); onView(withId(R.id.locationDetailFragment)).check(matches(isDisplayed())); }