4 files changed, 21 insertions, 15 deletions
diff --git a/core/src/androidTest/java/de/danoeh/antennapod/core/test/ApplicationTest.java b/core/src/androidTest/java/de/danoeh/antennapod/core/test/ApplicationTest.java
deleted file mode 100644
index ee9db0133..000000000
--- a/core/src/androidTest/java/de/danoeh/antennapod/core/test/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.danoeh.antennapod.core.test;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
-\ No newline at end of file
diff --git a/core/src/androidTest/java/de/danoeh/antennapod/core/tests/AntennaPodTestRunner.java b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/AntennaPodTestRunner.java
new file mode 100644
index 000000000..fbb5459d4
--- /dev/null
+++ b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/AntennaPodTestRunner.java
@@ -0,0 +1,15 @@
+package de.danoeh.antennapod.core.tests;
+
+import android.test.InstrumentationTestRunner;
+import android.test.suitebuilder.TestSuiteBuilder;
+import junit.framework.TestSuite;
+
+public class AntennaPodTestRunner extends InstrumentationTestRunner {
+
+    @Override
+    public TestSuite getAllTests() {
+        return new TestSuiteBuilder(AntennaPodTestRunner.class)
+                .includeAllPackagesUnderHere()
+                .build();
+    }
+}
+\ No newline at end of file
diff --git a/core/src/androidTest/java/de/danoeh/antennapod/core/util/DateUtilsTest.java b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/util/DateUtilsTest.java
index 46140fbd1..2a2d6414a 100644
--- a/core/src/androidTest/java/de/danoeh/antennapod/core/util/DateUtilsTest.java
+++ b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/util/DateUtilsTest.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.core.util;
+package de.danoeh.antennapod.core.tests.util;
 
 
 import android.test.AndroidTestCase;
@@ -7,6 +7,8 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import de.danoeh.antennapod.core.util.DateUtils;
+
 public class DateUtilsTest extends AndroidTestCase {
 
     public void testParseDateWithMicroseconds() throws Exception {
diff --git a/core/src/androidTest/java/de/danoeh/antennapod/core/util/LongLongMapTest.java b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/util/LongLongMapTest.java
index d75cd5c77..50c2a9c3c 100644
--- a/core/src/androidTest/java/de/danoeh/antennapod/core/util/LongLongMapTest.java
+++ b/core/src/androidTest/java/de/danoeh/antennapod/core/tests/util/LongLongMapTest.java
@@ -1,7 +1,9 @@
-package de.danoeh.antennapod.core.util;
+package de.danoeh.antennapod.core.tests.util;
 
 import android.test.AndroidTestCase;
 
+import de.danoeh.antennapod.core.util.LongIntMap;
+
 public class LongLongMapTest extends AndroidTestCase {
 
     public void testEmptyMap() {