refactor espresso test hierarchy

introduce common super class with convenience methods

10 files changed, 43 insertions, 33 deletions

diff --git a/tests/src/cgeo/geocaching/activity/AbstractEspressoTest.java b/tests/src/cgeo/geocaching/activity/AbstractEspressoTest.java
new file mode 100644
index 0000000..0647ec8
--- /dev/null
+++ b/tests/src/cgeo/geocaching/activity/AbstractEspressoTest.java
@@ -0,0 +1,30 @@
+package cgeo.geocaching.activity;
+
+import static com.google.android.apps.common.testing.ui.espresso.Espresso.onData;
+import static com.google.android.apps.common.testing.ui.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.click;
+import static org.hamcrest.Matchers.hasToString;
+import static org.hamcrest.Matchers.startsWith;
+
+import android.app.Activity;
+import android.test.ActivityInstrumentationTestCase2;
+
+public abstract class AbstractEspressoTest<T extends Activity> extends ActivityInstrumentationTestCase2<T> {
+
+    public AbstractEspressoTest(Class<T> activityClass) {
+        super(activityClass);
+    }
+
+    protected final void clickActionBarItem(int labelResourceId) {
+        onData(hasToString(startsWith(getString(labelResourceId)))).perform(click());
+    }
+
+    protected final void openActionBar() {
+        openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
+    }
+
+    protected final String getString(int resId) {
+        return getActivity().getString(resId);
+    }
+
+}
diff --git a/tests/src/cgeo/geocaching/activity/logtrackable/AbstractLogTrackableActivityTest.java b/tests/src/cgeo/geocaching/activity/logtrackable/AbstractLogTrackableActivityTest.java
index e6597dc..d93f1ad 100644
--- a/tests/src/cgeo/geocaching/activity/logtrackable/AbstractLogTrackableActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/logtrackable/AbstractLogTrackableActivityTest.java
@@ -3,10 +3,9 @@ package cgeo.geocaching.activity.logtrackable;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.LogTrackableActivity;
 import cgeo.geocaching.Trackable;
+import cgeo.geocaching.activity.AbstractEspressoTest;
 
-import android.test.ActivityInstrumentationTestCase2;
-
-public abstract class AbstractLogTrackableActivityTest extends ActivityInstrumentationTestCase2<LogTrackableActivity> {
+public abstract class AbstractLogTrackableActivityTest extends AbstractEspressoTest<LogTrackableActivity> {
 
     private static Trackable trackable;
 
diff --git a/tests/src/cgeo/geocaching/activity/logtrackable/LogTrackableActivityTest.java b/tests/src/cgeo/geocaching/activity/logtrackable/LogTrackableActivityTest.java
index c894474..cb2a209 100644
--- a/tests/src/cgeo/geocaching/activity/logtrackable/LogTrackableActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/logtrackable/LogTrackableActivityTest.java
@@ -1,15 +1,10 @@
 package cgeo.geocaching.activity.logtrackable;
 
-import static com.google.android.apps.common.testing.ui.espresso.Espresso.onData;
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onView;
-import static com.google.android.apps.common.testing.ui.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.click;
 import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewAssertions.doesNotExist;
 import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewAssertions.matches;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.isDisplayed;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.hasToString;
-import static org.hamcrest.Matchers.startsWith;
 
 import cgeo.geocaching.R;
 
@@ -28,17 +23,4 @@ public class LogTrackableActivityTest extends AbstractLogTrackableActivityTest {
 
         onView(withText(getString(R.string.init_signature_template_number))).check(doesNotExist());
     }
-
-    private void clickActionBarItem(int labelResourceId) {
-        onData(hasToString(startsWith(getString(labelResourceId)))).perform(click());
-    }
-
-    private void openActionBar() {
-        openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
-    }
-
-    private String getString(int resId) {
-        return getActivity().getString(resId);
-    }
-
 }
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AbstractAddWaypointActivityTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AbstractAddWaypointActivityTest.java
index b5dea39..7be6150 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AbstractAddWaypointActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AbstractAddWaypointActivityTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import cgeo.geocaching.EditWaypointActivity_;
 
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AbstractEditWaypointActivityTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AbstractEditWaypointActivityTest.java
index e5cdf69..bf8224a 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AbstractEditWaypointActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AbstractEditWaypointActivityTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import cgeo.geocaching.EditWaypointActivity_;
 import cgeo.geocaching.Waypoint;
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AbstractWaypointActivityTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AbstractWaypointActivityTest.java
index 1a5783c..36c4302 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AbstractWaypointActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AbstractWaypointActivityTest.java
@@ -1,19 +1,18 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.EditWaypointActivity_;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.activity.AbstractEspressoTest;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LoadFlags.SaveFlag;
 
-import android.test.ActivityInstrumentationTestCase2;
-
 import java.util.Collections;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-public abstract class AbstractWaypointActivityTest extends ActivityInstrumentationTestCase2<EditWaypointActivity_> {
+public abstract class AbstractWaypointActivityTest extends AbstractEspressoTest<EditWaypointActivity_> {
 
     private Geocache cache;
 
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointActivityTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointActivityTest.java
index cffdcfb..853054a 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointActivityTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.enumerations.WaypointType;
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointMultiTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointMultiTest.java
index 3a32570..c66c8de 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointMultiTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointMultiTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
diff --git a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointMysteryTest.java b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointMysteryTest.java
index 248f107..810aa25 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/AddWaypointMysteryTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/AddWaypointMysteryTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onView;
 import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewAssertions.matches;
diff --git a/tests/src/cgeo/geocaching/waypointactivity/EditWaypointActivityTest.java b/tests/src/cgeo/geocaching/activity/waypoint/EditWaypointActivityTest.java
index eda86cc..d419555 100644
--- a/tests/src/cgeo/geocaching/waypointactivity/EditWaypointActivityTest.java
+++ b/tests/src/cgeo/geocaching/activity/waypoint/EditWaypointActivityTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.waypointactivity;
+package cgeo.geocaching.activity.waypoint;
 
 import cgeo.geocaching.R;