Merge branch 'develop'0.9.9.3

2 files changed, 39 insertions, 1 deletions

diff --git a/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java b/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java
new file mode 100644
index 000000000..807552571
--- /dev/null
+++ b/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java
@@ -0,0 +1,38 @@
+package instrumentationTest.de.test.antennapod.ui;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+import com.robotium.solo.Solo;
+
+import de.danoeh.antennapod.activity.VideoplayerActivity;
+
+/**
+ * Test class for VideoplayerActivity
+ */
+public class VideoplayerActivityTest extends ActivityInstrumentationTestCase2<VideoplayerActivity> {
+
+    private Solo solo;
+
+    public VideoplayerActivityTest() {
+        super(VideoplayerActivity.class);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        solo = new Solo(getInstrumentation(), getActivity());
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+        super.tearDown();
+    }
+
+    /**
+     * Test if activity can be started.
+     */
+    public void testStartActivity() throws Exception {
+        solo.waitForActivity(VideoplayerActivity.class);
+    }
+}
diff --git a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java b/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java
index 91e5d966f..08fd0d486 100644
--- a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java
+++ b/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java
@@ -38,7 +38,7 @@ public class URLCheckerTest extends AndroidTestCase {
         assertEquals("http://example.com", out);
     }
 
-    public void testItcpProtocol() {
+    public void testItpcProtocol() {
         final String in = "itpc://example.com";
         final String out = URLChecker.prepareURL(in);
         assertEquals("http://example.com", out);