[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: add a couple WikiSite tests

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334741 )

Change subject: Update: add a couple WikiSite tests
......................................................................

Update: add a couple WikiSite tests

Change-Id: Id68f4efbccadf4c4e351d444832c47b22d9deb52
---
M app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
1 file changed, 22 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/41/334741/1

diff --git a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java 
b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
index 610ee28..bfbc3cf 100644
--- a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
+++ b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.test.TestParcelUtil;
 import org.wikipedia.test.TestRunner;
@@ -11,6 +13,26 @@
 import static org.hamcrest.Matchers.not;
 
 @RunWith(TestRunner.class) public class WikiSiteTest {
+    @Test public void testCtorParcel() throws Throwable {
+        WikiSite subject = WikiSite.forLanguageCode("test");
+        TestParcelUtil.test(subject);
+    }
+
+    @Test public void testCtorAuthorityDefaultScheme() {
+        WikiSite subject = new WikiSite("wikipedia.org");
+        assertThat(subject.secureScheme(), is(true));
+    }
+
+    @Test public void testUnmarshal() {
+        WikiSite wiki = WikiSite.forLanguageCode("test");
+        assertThat(GsonUnmarshaller.unmarshal(WikiSite.class, 
GsonMarshaller.marshal(wiki)), is(wiki));
+    }
+
+    @Test public void testUnmarshalScheme() {
+        WikiSite wiki = new WikiSite(false, "wikipedia.org", "");
+        assertThat(GsonUnmarshaller.unmarshal(WikiSite.class, 
GsonMarshaller.marshal(wiki)), is(wiki));
+    }
+
     @Test public void testEquals() {
         assertThat(WikiSite.forLanguageCode("en"), 
is(WikiSite.forLanguageCode("en")));
 
@@ -37,10 +59,5 @@
         assertThat(new PageTitle("wiki", wiki), 
is(wiki.titleForInternalLink("wiki")));
         assertThat(new PageTitle("wiki", wiki), 
is(wiki.titleForInternalLink("/wiki/wiki")));
         assertThat(new PageTitle("wiki/wiki", wiki), 
is(wiki.titleForInternalLink("/wiki/wiki/wiki")));
-    }
-
-    @Test public void testCtorParcel() throws Throwable {
-        WikiSite wiki = WikiSite.forLanguageCode("test");
-        TestParcelUtil.test(wiki);
     }
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/334741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id68f4efbccadf4c4e351d444832c47b22d9deb52
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits