Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171330
Change subject: Fix tests related to PageProperties
......................................................................
Fix tests related to PageProperties
- Also fixed error in EditPreview test.
- Also fixed Page .equals test.
Change-Id: Idafb44bf8b0ef9e8e2ea741615f14c41e9a3263b
---
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
M wikipedia/src/main/java/org/wikipedia/page/Page.java
4 files changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/30/171330/1
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
index b1d82df..f2cf666 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
@@ -21,7 +21,7 @@
sections.add(new Section(i, 1, "Something " + i, "Something_" + i,
"Content Something" + i));
}
PageTitle title = new PageTitle(null, "Test", new
Site("en.wikipedia.org"));
- PageProperties props = new PageProperties("2001-02-03T04:00:00Z",
"Test", null, true, true);
+ PageProperties props = new PageProperties("2001-02-03T04:00:00Z",
"Test", null, true, true, null, null);
Page page = new Page(title, sections, props);
assertEquals(page, new Page(page.toJSON()));
}
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
index fc48e13..5fe8c6b 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
@@ -52,9 +52,9 @@
sections.add(new Section(i, 1, "Something " + i, "Something_" + i,
"Content Something" + i));
}
PageTitle title = new PageTitle(null, "Test", new
Site("en.wikipedia.org"));
- PageProperties props = new PageProperties("", "Something",
"autoconfirmed", false, false);
- Page page = new Page(title, sections, props);
- parcelAndTestObjects(page);
+ PageProperties props = new PageProperties("", "Something",
"autoconfirmed", false, false, null, null);
+ parcelAndTestObjects(title);
+ parcelAndTestObjects(props);
}
public void testLruCache() throws Exception {
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
index 878689c..d5a5ba5 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java
@@ -21,7 +21,7 @@
final PageTitle title = new PageTitle(null,
"Test_page_for_app_testing/Section1", new Site("test.wikipedia.org"));
long randomTime = System.currentTimeMillis();
final String wikitext = "== Section 2 ==\n\nEditing section INSERT
RANDOM & HERE test at " + randomTime;
- final String expected = "<div></div><h2><span class=\"mw-headline\"
id=\"Section_2\">Section 2</span><a href=\"#/editor/1\" title=\"Edit section:
Section 2\" data-section=\"1\" class=\"icon icon-edit edit-page enabled
icon-32px\">Edit</a></h2><div>\n<p>Editing section INSERT RANDOM & HERE
test at " + randomTime + "</p>\n\n\n\n</div>";
+ final String expected = "<div></div><h2><span class=\"mw-headline\"
id=\"Section_2\">Section 2</span><a href=\"#/editor/1\" title=\"Edit section:
Section 2\" data-section=\"1\" class=\"icon icon-edit-enabled edit-page
icon-32px\">Edit</a></h2><div>\n<p>Editing section INSERT RANDOM & HERE
test at " + randomTime + "</p>\n\n\n\n</div>";
final CountDownLatch completionLatch = new CountDownLatch(1);
runTestOnUiThread(new Runnable() {
@Override
diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
index 580ce45..bfae67f 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -43,6 +43,18 @@
}
@Override
+ public boolean equals(Object o) {
+ if (!(o instanceof Page)) {
+ return false;
+ }
+
+ Page other = (Page) o;
+ return title.equals(other.title)
+ && sections.equals(other.sections)
+ && pageProperties.equals(other.pageProperties);
+ }
+
+ @Override
public String toString() {
return "Page{"
+ "title=" + title
--
To view, visit https://gerrit.wikimedia.org/r/171330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idafb44bf8b0ef9e8e2ea741615f14c41e9a3263b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
