14 files changed, 21 insertions, 16 deletions
diff --git a/tests/src/cgeo/geocaching/test/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java
index bb3bee8..49ef596 100644
--- a/tests/src/cgeo/geocaching/test/SettingsTest.java
+++ b/tests/src/cgeo/geocaching/SettingsTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgeo;
diff --git a/tests/src/cgeo/geocaching/test/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index 8c8d7fb..914d055 100644
--- a/tests/src/cgeo/geocaching/test/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.cgBase;
 
diff --git a/tests/src/cgeo/geocaching/test/cgDestinationTest.java b/tests/src/cgeo/geocaching/cgDestinationTest.java
index 883c1ab..1d7b341 100644
--- a/tests/src/cgeo/geocaching/test/cgDestinationTest.java
+++ b/tests/src/cgeo/geocaching/cgDestinationTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.cgDestination;
 import cgeo.geocaching.geopoint.Geopoint;
diff --git a/tests/src/cgeo/geocaching/test/cgWaypointTest.java b/tests/src/cgeo/geocaching/cgWaypointTest.java
index 601308c..aee101e 100644
--- a/tests/src/cgeo/geocaching/test/cgWaypointTest.java
+++ b/tests/src/cgeo/geocaching/cgWaypointTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.cgWaypoint;
 
diff --git a/tests/src/cgeo/geocaching/test/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 89eda4d..1fbe18c 100644
--- a/tests/src/cgeo/geocaching/test/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgCache;
diff --git a/tests/src/cgeo/geocaching/test/cgeogpxesTest.java b/tests/src/cgeo/geocaching/cgeogpxesTest.java
index 9c2d088..de2cc29 100644
--- a/tests/src/cgeo/geocaching/test/cgeogpxesTest.java
+++ b/tests/src/cgeo/geocaching/cgeogpxesTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching;
 
 import cgeo.geocaching.cgeogpxes;
 
diff --git a/tests/src/cgeo/geocaching/test/CompatibilityTest.java b/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java
index 1d5ef5c..0dbeb3b 100644
--- a/tests/src/cgeo/geocaching/test/CompatibilityTest.java
+++ b/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.compatibility;
 
 import cgeo.geocaching.cgeo;
 import cgeo.geocaching.compatibility.Compatibility;
diff --git a/tests/src/cgeo/geocaching/test/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index c02ba30..330b59c 100644
--- a/tests/src/cgeo/geocaching/test/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.files;
 
 import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgCache;
@@ -9,6 +9,8 @@ import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.files.GPX10Parser;
 import cgeo.geocaching.files.GPXParser;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.test.R;
+import cgeo.geocaching.test.R.raw;
 
 import android.content.res.Resources;
 import android.os.Handler;
diff --git a/tests/src/cgeo/geocaching/test/LocParserTest.java b/tests/src/cgeo/geocaching/files/LocParserTest.java
index ec6d7e6..8e79ec3 100644
--- a/tests/src/cgeo/geocaching/test/LocParserTest.java
+++ b/tests/src/cgeo/geocaching/files/LocParserTest.java
@@ -1,9 +1,11 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.files;
 
 import cgeo.geocaching.cgCoord;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.files.LocParser;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.test.R;
+import cgeo.geocaching.test.R.raw;
 
 import android.content.res.Resources;
 import android.test.InstrumentationTestCase;
diff --git a/tests/src/cgeo/geocaching/test/DistanceParserTest.java b/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java
index 34bef7b..3e8336b 100644
--- a/tests/src/cgeo/geocaching/test/DistanceParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.geopoint;
 
 import cgeo.geocaching.geopoint.DistanceParser;
 
diff --git a/tests/src/cgeo/geocaching/test/GeoPointParserTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
index e6eb0e8..32b7562 100644
--- a/tests/src/cgeo/geocaching/test/GeoPointParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.geopoint;
 
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointParser;
diff --git a/tests/src/cgeo/geocaching/test/GeopointTest.java b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
index ad42d73..ef1955b 100644
--- a/tests/src/cgeo/geocaching/test/GeopointTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.geopoint;
 
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Geopoint.GeopointException;
diff --git a/tests/src/cgeo/geocaching/test/cgeoTestSuite.java b/tests/src/cgeo/geocaching/test/CgeoTestSuite.java
index 31a469e..ee4ab43 100644
--- a/tests/src/cgeo/geocaching/test/cgeoTestSuite.java
+++ b/tests/src/cgeo/geocaching/test/CgeoTestSuite.java
@@ -1,8 +1,9 @@
 package cgeo.geocaching.test;
 
+import android.test.suitebuilder.TestSuiteBuilder;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import android.test.suitebuilder.TestSuiteBuilder;
 
 /**
  * The c:geo unit test suite. Based on http://marakana.com/tutorials/android/junit-test-example.html
@@ -11,9 +12,9 @@ import android.test.suitebuilder.TestSuiteBuilder;
  * For further informations have a look at http://developer.android.com/guide/topics/testing/testing_android.html
  */
 
-public class cgeoTestSuite extends TestSuite {
+public class CgeoTestSuite extends TestSuite {
 
     public static Test suite() {
-        return new TestSuiteBuilder(cgeoTestSuite.class).includeAllPackagesUnderHere().build();
+        return new TestSuiteBuilder(CgeoTestSuite.class).includePackages("cgeo.geocaching").build();
     }
 }
diff --git a/tests/src/cgeo/geocaching/test/CryptUtilsTest.java b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
index 7966943..22c87f6 100644
--- a/tests/src/cgeo/geocaching/test/CryptUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.test;
+package cgeo.geocaching.utils;
 
 import cgeo.geocaching.utils.CryptUtils;