Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252872
Change subject: Hygiene: Remove 'Do' from DoEditTask & DoEditTaskTests
......................................................................
Hygiene: Remove 'Do' from DoEditTask & DoEditTaskTests
Change-Id: I616feed19f518c5ab9ea7863493cf272d3bfa959
---
R app/src/androidTest/java/org/wikipedia/test/EditTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/TriggerAbuseFilterTest.java
M app/src/androidTest/java/org/wikipedia/test/TriggerEditCaptchaTest.java
R app/src/main/java/org/wikipedia/editing/EditTask.java
4 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/72/252872/1
diff --git a/app/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
b/app/src/androidTest/java/org/wikipedia/test/EditTaskTests.java
similarity index 94%
rename from app/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
rename to app/src/androidTest/java/org/wikipedia/test/EditTaskTests.java
index cc282fc..4c590db 100644
--- a/app/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/EditTaskTests.java
@@ -6,7 +6,7 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.editing.DoEditTask;
+import org.wikipedia.editing.EditTask;
import org.wikipedia.editing.EditTokenStorage;
import org.wikipedia.editing.EditingResult;
import org.wikipedia.editing.FetchSectionWikitextTask;
@@ -17,11 +17,11 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-public class DoEditTaskTests extends ActivityUnitTestCase<TestDummyActivity> {
+public class EditTaskTests extends ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 20000;
private static final int SECTION_ID = 3;
- public DoEditTaskTests() {
+ public EditTaskTests() {
super(TestDummyActivity.class);
}
@@ -43,7 +43,7 @@
app.getEditTokenStorage().get(title.getSite(), new
EditTokenStorage.TokenRetrievedCallback() {
@Override
public void onTokenRetrieved(String token) {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, SECTION_ID, token, "", false) {
+ new EditTask(getInstrumentation().getTargetContext(), title,
wikitext, SECTION_ID, token, "", false) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git
a/app/src/androidTest/java/org/wikipedia/test/TriggerAbuseFilterTest.java
b/app/src/androidTest/java/org/wikipedia/test/TriggerAbuseFilterTest.java
index c30e8b1..027e474 100644
--- a/app/src/androidTest/java/org/wikipedia/test/TriggerAbuseFilterTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/TriggerAbuseFilterTest.java
@@ -5,7 +5,7 @@
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.AbuseFilterEditResult;
-import org.wikipedia.editing.DoEditTask;
+import org.wikipedia.editing.EditTask;
import org.wikipedia.editing.EditingResult;
import java.util.concurrent.CountDownLatch;
@@ -37,7 +37,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
+ new EditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
@@ -70,7 +70,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
+ new EditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
@@ -103,7 +103,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
+ new EditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git
a/app/src/androidTest/java/org/wikipedia/test/TriggerEditCaptchaTest.java
b/app/src/androidTest/java/org/wikipedia/test/TriggerEditCaptchaTest.java
index 6507eac..48d288a 100644
--- a/app/src/androidTest/java/org/wikipedia/test/TriggerEditCaptchaTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/TriggerEditCaptchaTest.java
@@ -5,7 +5,7 @@
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.CaptchaResult;
-import org.wikipedia.editing.DoEditTask;
+import org.wikipedia.editing.EditTask;
import org.wikipedia.editing.EditingResult;
import org.wikipedia.editing.SuccessEditResult;
@@ -29,7 +29,7 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new DoEditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
+ new EditTask(getInstrumentation().getTargetContext(), title,
wikitext, 0, "+\\", "", false) {
@Override
public void onFinish(EditingResult result) {
assertNotNull(result);
diff --git a/app/src/main/java/org/wikipedia/editing/DoEditTask.java
b/app/src/main/java/org/wikipedia/editing/EditTask.java
similarity index 95%
rename from app/src/main/java/org/wikipedia/editing/DoEditTask.java
rename to app/src/main/java/org/wikipedia/editing/EditTask.java
index cb167aa..90293ea 100644
--- a/app/src/main/java/org/wikipedia/editing/DoEditTask.java
+++ b/app/src/main/java/org/wikipedia/editing/EditTask.java
@@ -10,7 +10,7 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
-public class DoEditTask extends ApiTask<EditingResult> {
+public class EditTask extends ApiTask<EditingResult> {
private final PageTitle title;
private final String sectionWikitext;
private final int sectionID;
@@ -18,7 +18,7 @@
private final String editToken;
private final boolean loggedIn;
- public DoEditTask(Context context, PageTitle title, String
sectionWikitext, int sectionID,
+ public EditTask(Context context, PageTitle title, String sectionWikitext,
int sectionID,
String editToken, String summary, boolean loggedIn) {
super(
SINGLE_THREAD,
--
To view, visit https://gerrit.wikimedia.org/r/252872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I616feed19f518c5ab9ea7863493cf272d3bfa959
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
