Dbrant has submitted this change and it was merged.
Change subject: Codestyle: Category Coding (tests)
......................................................................
Codestyle: Category Coding (tests)
Change-Id: I7a982fe3ac2ea34b5795184b8ad66dd32f541ee1
---
M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/FetchUserContribsTaskTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
5 files changed, 26 insertions(+), 25 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
index 43fc856..ef4a0a0 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java
@@ -20,6 +20,7 @@
public class DoEditTaskTests extends ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 20000;
+ private static final int SECTION_ID = 3;
public DoEditTaskTests() {
super(TestDummyActivity.class);
@@ -44,12 +45,12 @@
app.getEditTokenStorage().get(title.getSite(), new
EditTokenStorage.TokenRetreivedCallback() {
@Override
public void onTokenRetreived(String token) {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 3, token, "") {
+ new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, SECTION_ID, token, "") {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
assertEquals("Success", result.getResult());
- new
FetchSectionWikitextTask(getInstrumentation().getTargetContext(), title, 3) {
+ new
FetchSectionWikitextTask(getInstrumentation().getTargetContext(), title,
SECTION_ID) {
@Override
public void onFinish(String result) {
assertNotNull(result);
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FetchUserContribsTaskTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FetchUserContribsTaskTest.java
index a07475b..59cba12 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/FetchUserContribsTaskTest.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/FetchUserContribsTaskTest.java
@@ -10,6 +10,7 @@
public class FetchUserContribsTaskTest extends
ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 20000;
+ private static final int NUM_FETCH = 10;
public FetchUserContribsTaskTest() {
super(TestDummyActivity.class);
@@ -21,12 +22,12 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new
FetchUserContribsTask(getInstrumentation().getTargetContext(), new
Site("test.wikipedia.org"), "yuvipanda", 10, null) {
+ new
FetchUserContribsTask(getInstrumentation().getTargetContext(), new
Site("test.wikipedia.org"), "yuvipanda", NUM_FETCH, null) {
@Override
public void
onFinish(FetchUserContribsTask.UserContributionsList result) {
assertNotNull(result);
assertNotNull(result.getQueryContinue());
- assertFalse(result.getContribs().size() < 10);
+ assertFalse(result.getContribs().size() < NUM_FETCH);
completionLatch.countDown();
}
}.execute();
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
index 6dac387..1041968 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java
@@ -1,5 +1,6 @@
package org.wikipedia.test;
+import android.content.Context;
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import org.wikipedia.PageTitle;
@@ -19,37 +20,30 @@
}
public void testPageFetch() throws Throwable {
- final CountDownLatch completionLatch = new CountDownLatch(1);
- startActivity(new Intent(), null, null);
- runTestOnUiThread(new Runnable() {
- @Override
- public void run() {
- new SectionsFetchTask(getInstrumentation().getTargetContext(),
new PageTitle(null, "Test_page_for_app_testing/Section1", new
Site("test.wikipedia.org")), "all") {
- @Override
- public void onFinish(List<Section> result) {
- assertNotNull(result);
- assertEquals(4, result.size());
- completionLatch.countDown();
- }
- }.execute();
- }
- });
- assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT,
TimeUnit.MILLISECONDS));
+ final String title = "Test_page_for_app_testing/Section1";
+ final int expectedNumberOfSections = 4;
+ getAllSections(expectedNumberOfSections, title);
}
-
/** Inspired by https://bugzilla.wikimedia.org/show_bug.cgi?id=66152 */
public void testPageFetchWithAmpersand() throws Throwable {
+ final String title = "Ampersand & title";
+ final int expectedNumberOfSections = 1;
+ getAllSections(expectedNumberOfSections, title);
+ }
+
+ private void getAllSections(final int expectedNumberOfSections, final
String title) throws Throwable {
final CountDownLatch completionLatch = new CountDownLatch(1);
startActivity(new Intent(), null, null);
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new SectionsFetchTask(getInstrumentation().getTargetContext(),
new PageTitle(null, "Ampersand & title", new Site("test.wikipedia.org")),
"all") {
+ final Context ctx = getInstrumentation().getTargetContext();
+ new SectionsFetchTask(ctx, new PageTitle(null, title, new
Site("test.wikipedia.org")), "all") {
@Override
public void onFinish(List<Section> result) {
assertNotNull(result);
- assertEquals(1, result.size());
+ assertEquals(expectedNumberOfSections, result.size());
completionLatch.countDown();
}
}.execute();
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 f675cc6..b1d82df 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
@@ -11,11 +11,13 @@
public class PageTests extends TestCase {
+ private static final int NUM_SECTIONS = 10;
+
public void testJSONSerialization() throws Exception {
ArrayList<Section> sections = new ArrayList<Section>();
Section headSection = new Section(0, 1, null, null, "Hi there!");
sections.add(headSection);
- for (int i = 1; i <= 10; i++) {
+ for (int i = 1; i <= NUM_SECTIONS; i++) {
sections.add(new Section(i, 1, "Something " + i, "Something_" + i,
"Content Something" + i));
}
PageTitle title = new PageTitle(null, "Test", new
Site("en.wikipedia.org"));
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 4b87a6b..fc48e13 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
@@ -15,6 +15,9 @@
import java.util.ArrayList;
public class ParcelableTest extends TestCase {
+
+ private static final int NUM_SECTIONS = 10;
+
private void parcelAndTestObjects(Parcelable p) throws Exception {
Parcel parcel = Parcel.obtain();
p.writeToParcel(parcel, 0);
@@ -45,7 +48,7 @@
public void testPage() throws Exception {
ArrayList<Section> sections = new ArrayList<Section>();
Section headSection = new Section(0, 1, null, null, "Hi there!");
- for (int i = 1; i <= 10; i++) {
+ for (int i = 1; i <= NUM_SECTIONS; i++) {
sections.add(new Section(i, 1, "Something " + i, "Something_" + i,
"Content Something" + i));
}
PageTitle title = new PageTitle(null, "Test", new
Site("en.wikipedia.org"));
--
To view, visit https://gerrit.wikimedia.org/r/147366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a982fe3ac2ea34b5795184b8ad66dd32f541ee1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
