13 files changed, 28 insertions, 48 deletions
diff --git a/tests/src/cgeo/geocaching/filter/AbstractFilterTestCase.java b/tests/src/cgeo/CGeoTestCase.java
index f16d326..31fde34 100644
--- a/tests/src/cgeo/geocaching/filter/AbstractFilterTestCase.java
+++ b/tests/src/cgeo/CGeoTestCase.java
@@ -1,20 +1,19 @@
-package cgeo.geocaching.filter;
+package cgeo;
 
 import cgeo.geocaching.cgeoapplication;
 
 import android.test.ApplicationTestCase;
 
-public abstract class AbstractFilterTestCase extends ApplicationTestCase<cgeoapplication> {
+public abstract class CGeoTestCase extends ApplicationTestCase<cgeoapplication> {
 
-    public AbstractFilterTestCase() {
+    public CGeoTestCase() {
         super(cgeoapplication.class);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-
-        // init environment
         createApplication();
     }
+
 }
diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java
index 15e3170..d6bb389 100644
--- a/tests/src/cgeo/geocaching/cgDataTest.java
+++ b/tests/src/cgeo/geocaching/cgDataTest.java
@@ -1,28 +1,15 @@
 package cgeo.geocaching;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
 
-import android.test.ApplicationTestCase;
-
 import java.util.HashSet;
 import java.util.Set;
 
-public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
-
-    public cgDataTest() {
-        super(cgeoapplication.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // init environment
-        createApplication();
-    }
+public class cgDataTest extends CGeoTestCase {
 
     public static void testStoredLists() {
 
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 30dba33..a813734 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.gc.GCBase;
 import cgeo.geocaching.connector.gc.GCParser;
@@ -21,7 +22,6 @@ import cgeo.test.Compare;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
-import android.test.ApplicationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -34,19 +34,7 @@ import junit.framework.Assert;
  * application and/or context.
  */
 
-public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
-
-    public cgeoApplicationTest() {
-        super(cgeoapplication.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // init environment
-        createApplication();
-    }
+public class cgeoApplicationTest extends CGeoTestCase {
 
     /**
      * The name 'test preconditions' is a convention to signal that if this test
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java b/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
index 587d4ba..608f728 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
+++ b/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
@@ -1,12 +1,11 @@
 package cgeo.geocaching.connector.opencaching;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags;
 
-import android.test.AndroidTestCase;
-
-public class OkapiClientTest extends AndroidTestCase {
+public class OkapiClientTest extends CGeoTestCase {
 
     public static void testGetOCCache() {
         String geoCode = "OU0331";
diff --git a/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java b/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
index cf2abe2..a24cf72 100644
--- a/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/DifficultyFilterTest.java
@@ -1,8 +1,9 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 
-public class DifficultyFilterTest extends AbstractFilterTestCase {
+public class DifficultyFilterTest extends CGeoTestCase {
 
     public static void testTerrainFilter() {
         final cgCache easy = new cgCache();
diff --git a/tests/src/cgeo/geocaching/filter/SizeFilterTest.java b/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
index 65fd8d8..a641874 100644
--- a/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/SizeFilterTest.java
@@ -1,11 +1,12 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.enumerations.CacheSize;
 
 import java.util.ArrayList;
 
-public class SizeFilterTest extends AbstractFilterTestCase {
+public class SizeFilterTest extends CGeoTestCase {
 
     private cgCache micro;
     private cgCache regular;
diff --git a/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java b/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
index 660a596..9b40140 100644
--- a/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateArchivedFilterTest.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.filter.StateFilter.StateArchivedFilter;
 
-public class StateArchivedFilterTest extends AbstractFilterTestCase {
+public class StateArchivedFilterTest extends CGeoTestCase {
 
     private StateFilter.StateArchivedFilter archivedFilter;
     private cgCache archivedCache;
diff --git a/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java b/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
index 7e8a060..e73f771 100644
--- a/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateDisabledFilterTest.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.filter.StateFilter.StateDisabledFilter;
 
-public class StateDisabledFilterTest extends AbstractFilterTestCase {
+public class StateDisabledFilterTest extends CGeoTestCase {
 
     private StateFilter.StateDisabledFilter disabledFilter;
     private cgCache disabledCache;
diff --git a/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java b/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
index 3f0ffcc..053363f 100644
--- a/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StateFoundFilterTest.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.filter.StateFilter.StateFoundFilter;
 
-public class StateFoundFilterTest extends AbstractFilterTestCase {
+public class StateFoundFilterTest extends CGeoTestCase {
 
     private StateFilter.StateFoundFilter foundFilter;
     private cgCache foundCache;
diff --git a/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java b/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
index 5968424..9221da0 100644
--- a/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/StatePremiumFilterTest.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.filter.StateFilter.StatePremiumFilter;
 
-public class StatePremiumFilterTest extends AbstractFilterTestCase {
+public class StatePremiumFilterTest extends CGeoTestCase {
 
     private StateFilter.StatePremiumFilter premiumFilter;
     private cgCache premiumCache;
diff --git a/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java b/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
index 00c78b1..9deea34 100644
--- a/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/TerrainFilterTest.java
@@ -1,8 +1,9 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 
-public class TerrainFilterTest extends AbstractFilterTestCase {
+public class TerrainFilterTest extends CGeoTestCase {
 
     public static void testTerrainFilter() {
         final cgCache easy = new cgCache();
diff --git a/tests/src/cgeo/geocaching/filter/TypeFilterTest.java b/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
index 826ba03..5b2631c 100644
--- a/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
+++ b/tests/src/cgeo/geocaching/filter/TypeFilterTest.java
@@ -1,11 +1,12 @@
 package cgeo.geocaching.filter;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.enumerations.CacheType;
 
 import java.util.ArrayList;
 
-public class TypeFilterTest extends AbstractFilterTestCase {
+public class TypeFilterTest extends CGeoTestCase {
 
     private TypeFilter traditionalFilter;
     private cgCache traditional;
diff --git a/tests/src/cgeo/geocaching/geopoint/HumanDistanceTest.java b/tests/src/cgeo/geocaching/geopoint/HumanDistanceTest.java
index 0532495..c5fce00 100644
--- a/tests/src/cgeo/geocaching/geopoint/HumanDistanceTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/HumanDistanceTest.java
@@ -1,12 +1,11 @@
 package cgeo.geocaching.geopoint;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.Settings;
 
-import android.test.AndroidTestCase;
-
 import java.util.regex.Pattern;
 
-public class HumanDistanceTest extends AndroidTestCase {
+public class HumanDistanceTest extends CGeoTestCase {
 
     private static void assertMatch(final String ok, final float distance) {
         final String humanDistance = HumanDistance.getHumanDistance(distance);