4 files changed, 21 insertions, 17 deletions
diff --git a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
index 0d3d53b..cd8b5e7 100644
--- a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
+++ b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.test;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.cgData;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LoadFlags.RemoveFlag;
 
@@ -18,7 +18,7 @@ public abstract class AbstractResourceInstrumentationTestCase extends Instrument
     protected static void removeCacheCompletely(final String geocode) {
         final EnumSet<RemoveFlag> flags = EnumSet.copyOf(LoadFlags.REMOVE_ALL);
         flags.add(RemoveFlag.REMOVE_OWN_WAYPOINTS_ONLY_FOR_TESTING);
-        cgeoapplication.getInstance().removeCache(geocode, flags);
+        cgData.removeCache(geocode, flags);
     }
 
     protected InputStream getResourceStream(int resourceId) {
diff --git a/tests/src/cgeo/geocaching/test/RegExPerformanceTest.java b/tests/src/cgeo/geocaching/test/RegExPerformanceTest.java
index b9f8138..bd30532 100644
--- a/tests/src/cgeo/geocaching/test/RegExPerformanceTest.java
+++ b/tests/src/cgeo/geocaching/test/RegExPerformanceTest.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.test.mock.MockedCache;
 import cgeo.geocaching.utils.BaseUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -69,7 +70,10 @@ public class RegExPerformanceTest extends TestCase {
     public final static Pattern PATTERN_DESCRIPTION = Pattern.compile("<span id=\"ctl00_ContentBody_LongDescription\">(.*?)</span>[^<]*</div>[^<]*<p>[^<]*</p>[^<]*<p>[^<]*<strong>\\W*Additional Hints</strong>");
 
 
-    public final static MockedCache[] MOCKED_CACHES = { new GC2CJPF(), new GC1ZXX2(), new GC2JVEH(), new GC3XX5J() };
+    public final static List<MockedCache> MOCKED_CACHES;
+    static {
+        MOCKED_CACHES = Arrays.asList(new GC2CJPF(), new GC1ZXX2(), new GC2JVEH(), new GC3XX5J());
+    }
 
     public static void testRegEx() {
         List<String> output = doTheTests(10);
@@ -124,7 +128,7 @@ public class RegExPerformanceTest extends TestCase {
         for (int j = 0; j < iterations; j++) {
             BaseUtils.getMatch(page, pattern, true, "");
         }
-        return (System.currentTimeMillis() - start);
+        return System.currentTimeMillis() - start;
 
     }
 
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index 9aa18f9..5e8a1d7 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.test.mock;
 
-import cgeo.geocaching.cgImage;
-import cgeo.geocaching.cgTrackable;
+import cgeo.geocaching.Image;
+import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
@@ -133,16 +133,16 @@ public class GC2JVEH extends MockedCache {
     }
 
     @Override
-    public List<cgTrackable> getInventory() {
-        final ArrayList<cgTrackable> inventory = new ArrayList<cgTrackable>();
-        inventory.add(new cgTrackable());
+    public List<Trackable> getInventory() {
+        final ArrayList<Trackable> inventory = new ArrayList<Trackable>();
+        inventory.add(new Trackable());
         return inventory;
     }
 
     @Override
-    public List<cgImage> getSpoilers() {
-        final ArrayList<cgImage> spoilers = new ArrayList<cgImage>();
-        final cgImage mockedImage = new cgImage(null, null, null);
+    public List<Image> getSpoilers() {
+        final ArrayList<Image> spoilers = new ArrayList<Image>();
+        final Image mockedImage = new Image(null, null, null);
         spoilers.add(mockedImage);
         spoilers.add(mockedImage);
         spoilers.add(mockedImage);
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 352c34d..f667264 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.test.mock;
 
 import cgeo.geocaching.ICache;
-import cgeo.geocaching.cgImage;
-import cgeo.geocaching.cgTrackable;
+import cgeo.geocaching.Image;
+import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.gc.GCConstants;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.utils.BaseUtils;
@@ -70,7 +70,7 @@ public abstract class MockedCache implements ICache {
 
             return BaseUtils.replaceWhitespace(buffer.toString());
         } catch (IOException e) {
-            e.printStackTrace();
+            Assert.fail(e.getMessage());
         } finally {
             IOUtils.closeQuietly(is);
             IOUtils.closeQuietly(br);
@@ -134,12 +134,12 @@ public abstract class MockedCache implements ICache {
     }
 
     @Override
-    public List<cgTrackable> getInventory() {
+    public List<Trackable> getInventory() {
         return null;
     }
 
     @Override
-    public List<cgImage> getSpoilers() {
+    public List<Image> getSpoilers() {
         return null;
     }