aboutsummaryrefslogtreecommitdiff
path: root/app/src/androidTest
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-06-05 09:05:29 -0700
committerScott Jackson <daneren2005@gmail.com>2015-06-05 09:05:29 -0700
commitd79f241c64ffa21ebbaacb918f50300515522bbd (patch)
tree2ea66e9d6f75e099eb8d480d483a6479bc791cb3 /app/src/androidTest
parent907bdee1dfb3bbd851c7e88ee2b5112e5e565248 (diff)
downloaddsub-d79f241c64ffa21ebbaacb918f50300515522bbd.tar.gz
dsub-d79f241c64ffa21ebbaacb918f50300515522bbd.tar.bz2
dsub-d79f241c64ffa21ebbaacb918f50300515522bbd.zip
Fix a couple of tests
Diffstat (limited to 'app/src/androidTest')
-rw-r--r--app/src/androidTest/java/github/daneren2005/dsub/activity/DownloadActivityTest.java32
-rw-r--r--app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java2
2 files changed, 1 insertions, 33 deletions
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/activity/DownloadActivityTest.java b/app/src/androidTest/java/github/daneren2005/dsub/activity/DownloadActivityTest.java
deleted file mode 100644
index ce859181..00000000
--- a/app/src/androidTest/java/github/daneren2005/dsub/activity/DownloadActivityTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package github.daneren2005.dsub.activity;
-
-import github.daneren2005.dsub.R;
-import android.test.*;
-import android.view.View;
-
-public class DownloadActivityTest extends
- ActivityInstrumentationTestCase2<DownloadActivity> {
-
- private DownloadActivity activity;
-
- public DownloadActivityTest() {
- super(DownloadActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- activity = getActivity();
- }
-
- /**
- * Test the main layout.
- */
- public void testLayout() {
- View view = activity.findViewById(R.layout.download_activity);
- assertNotNull(view);
- assertNotNull(view.findViewById(R.layout.download_activity));
- assertNotNull(activity.findViewById(R.id.fragment_container));
- }
-
-}
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java b/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java
index 814f658a..30663543 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java
+++ b/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java
@@ -15,7 +15,7 @@ public class BookmarkTest extends TestCase {
*/
public void testSetCreated() throws ParseException {
Bookmark bookmark = new Bookmark();
- bookmark.setCreated(null);
+ bookmark.setCreated((String) null);
assertEquals(null, bookmark.getCreated());
bookmark.setCreated("");