jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: update test packaging and naming
......................................................................
Hygiene: update test packaging and naming
Move tests to match subject packaging and naming.
Change-Id: Ife248bd34b2fe60412d5f2e17edab0bd24fcf6b7
---
R app/src/androidTest/java/org/wikipedia/bridge/CommunicationBridgeTest.java
R
app/src/androidTest/java/org/wikipedia/createaccount/CreateAccountInfoTaskTest.java
R app/src/androidTest/java/org/wikipedia/editing/EditTaskTest.java
R
app/src/androidTest/java/org/wikipedia/editing/FetchSectionWikitextTaskTest.java
R app/src/androidTest/java/org/wikipedia/login/LoginClientTest.java
R app/src/androidTest/java/org/wikipedia/page/PageTests.java
R app/src/androidTest/java/org/wikipedia/page/SectionTest.java
R app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
R app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
9 files changed, 24 insertions(+), 45 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/androidTest/java/org/wikipedia/test/BridgeTests.java
b/app/src/androidTest/java/org/wikipedia/bridge/CommunicationBridgeTest.java
similarity index 96%
rename from app/src/androidTest/java/org/wikipedia/test/BridgeTests.java
rename to
app/src/androidTest/java/org/wikipedia/bridge/CommunicationBridgeTest.java
index 9a8c840..be4a7ca 100644
--- a/app/src/androidTest/java/org/wikipedia/test/BridgeTests.java
+++ b/app/src/androidTest/java/org/wikipedia/bridge/CommunicationBridgeTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.bridge;
import android.support.test.filters.LargeTest;
import android.support.test.runner.AndroidJUnit4;
@@ -9,7 +9,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.bridge.CommunicationBridge;
import org.wikipedia.testlib.TestLatch;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -18,7 +17,7 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
-public class BridgeTests {
+public class CommunicationBridgeTest {
private static final String TEST_FILE_URI =
"file:///android_asset/tests/index.html";
private static final String DOM_LOADED = "DOMLoaded";
private static final String PING = "ping";
diff --git
a/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
b/app/src/androidTest/java/org/wikipedia/createaccount/CreateAccountInfoTaskTest.java
similarity index 93%
rename from
app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
rename to
app/src/androidTest/java/org/wikipedia/createaccount/CreateAccountInfoTaskTest.java
index 48320ab..ad303f5 100644
--- a/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
+++
b/app/src/androidTest/java/org/wikipedia/createaccount/CreateAccountInfoTaskTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.createaccount;
import android.content.Context;
import android.net.Uri;
@@ -13,8 +13,6 @@
import org.junit.runner.RunWith;
import org.mediawiki.api.json.Api;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.createaccount.CreateAccountInfoResult;
-import org.wikipedia.createaccount.CreateAccountInfoTask;
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.editing.CaptchaResult;
import org.wikipedia.testlib.TestLatch;
@@ -34,7 +32,7 @@
*/
@SmallTest
@RunWith(AndroidJUnit4.class)
-public class CreateAccountTaskTest {
+public class CreateAccountInfoTaskTest {
private static WikiSite TEST_WIKI = WikiSite.forLanguageCode("test");
private static Api TEST_API =
WikipediaApp.getInstance().getAPIForSite(TEST_WIKI);
private Context context =
InstrumentationRegistry.getInstrumentation().getTargetContext();
diff --git a/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
b/app/src/androidTest/java/org/wikipedia/editing/EditTaskTest.java
similarity index 96%
rename from app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
rename to app/src/androidTest/java/org/wikipedia/editing/EditTaskTest.java
index edb5c45..7b5d84f 100644
--- a/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
+++ b/app/src/androidTest/java/org/wikipedia/editing/EditTaskTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.editing;
import android.support.annotation.NonNull;
import android.support.test.filters.SmallTest;
@@ -9,11 +9,6 @@
import org.junit.runner.RunWith;
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.editing.AbuseFilterEditResult;
-import org.wikipedia.editing.CaptchaResult;
-import org.wikipedia.editing.EditTask;
-import org.wikipedia.editing.EditingResult;
-import org.wikipedia.editing.SuccessEditResult;
import org.wikipedia.page.PageTitle;
import org.wikipedia.testlib.TestLatch;
diff --git
a/app/src/androidTest/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
b/app/src/androidTest/java/org/wikipedia/editing/FetchSectionWikitextTaskTest.java
similarity index 84%
rename from
app/src/androidTest/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
rename to
app/src/androidTest/java/org/wikipedia/editing/FetchSectionWikitextTaskTest.java
index fc1f87e..58bc684 100644
---
a/app/src/androidTest/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
+++
b/app/src/androidTest/java/org/wikipedia/editing/FetchSectionWikitextTaskTest.java
@@ -1,21 +1,20 @@
-
-package org.wikipedia.test;
+package org.wikipedia.editing;
import android.support.test.filters.SmallTest;
import android.test.ActivityUnitTestCase;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.editing.FetchSectionWikitextTask;
import org.wikipedia.page.PageTitle;
+import org.wikipedia.test.TestDummyActivity;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@SmallTest
-public class FetchSectionWikitextTaskTests extends
ActivityUnitTestCase<TestDummyActivity> {
+public class FetchSectionWikitextTaskTest extends
ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 20_000;
- public FetchSectionWikitextTaskTests() {
+ public FetchSectionWikitextTaskTest() {
super(TestDummyActivity.class);
}
diff --git a/app/src/androidTest/java/org/wikipedia/test/LoginClientTest.java
b/app/src/androidTest/java/org/wikipedia/login/LoginClientTest.java
similarity index 89%
rename from app/src/androidTest/java/org/wikipedia/test/LoginClientTest.java
rename to app/src/androidTest/java/org/wikipedia/login/LoginClientTest.java
index 214d84e..5bc9d34 100644
--- a/app/src/androidTest/java/org/wikipedia/test/LoginClientTest.java
+++ b/app/src/androidTest/java/org/wikipedia/login/LoginClientTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.login;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
@@ -11,9 +11,6 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.editing.EditTokenStorage;
-import org.wikipedia.login.LoginClient;
-import org.wikipedia.login.LoginResult;
-import org.wikipedia.login.User;
import org.wikipedia.testlib.TestLatch;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
@@ -26,8 +23,8 @@
@RunWith(AndroidJUnit4.class)
public class LoginClientTest {
private static final WikiSite TEST_WIKI = WikiSite.forLanguageCode("test");
- private static final String USERNAME = getString(R.string.test_username);
- private static final String PASSWORD = getString(R.string.test_password);
+ private static final String USERNAME =
getString(org.wikipedia.test.R.string.test_username);
+ private static final String PASSWORD =
getString(org.wikipedia.test.R.string.test_password);
private final TestLatch completionLatch = new TestLatch();
@Before
diff --git a/app/src/androidTest/java/org/wikipedia/test/PageTests.java
b/app/src/androidTest/java/org/wikipedia/page/PageTests.java
similarity index 86%
rename from app/src/androidTest/java/org/wikipedia/test/PageTests.java
rename to app/src/androidTest/java/org/wikipedia/page/PageTests.java
index ff2032b..a6e1ec5 100644
--- a/app/src/androidTest/java/org/wikipedia/test/PageTests.java
+++ b/app/src/androidTest/java/org/wikipedia/page/PageTests.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.page;
import android.support.test.filters.SmallTest;
@@ -6,10 +6,6 @@
import org.json.JSONObject;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.page.Page;
-import org.wikipedia.page.PageProperties;
-import org.wikipedia.page.PageTitle;
-import org.wikipedia.page.Section;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/androidTest/java/org/wikipedia/test/SectionTests.java
b/app/src/androidTest/java/org/wikipedia/page/SectionTest.java
similarity index 87%
rename from app/src/androidTest/java/org/wikipedia/test/SectionTests.java
rename to app/src/androidTest/java/org/wikipedia/page/SectionTest.java
index d84c217..dabddc9 100644
--- a/app/src/androidTest/java/org/wikipedia/test/SectionTests.java
+++ b/app/src/androidTest/java/org/wikipedia/page/SectionTest.java
@@ -1,12 +1,10 @@
-package org.wikipedia.test;
+package org.wikipedia.page;
import android.support.test.filters.SmallTest;
import android.test.AndroidTestCase;
-import org.wikipedia.page.Section;
-
@SmallTest
-public class SectionTests extends AndroidTestCase {
+public class SectionTest extends AndroidTestCase {
public void testSectionLead() {
// Section 0 is the lead
Section section = new Section(0, 0, "Heading", "Heading", "Content");
@@ -26,4 +24,4 @@
assertEquals(parentSection, Section.fromJson(parentSection.toJSON()));
}
-}
\ No newline at end of file
+}
diff --git
a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
b/app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
similarity index 93%
rename from
app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
rename to app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
index 174f942..84cf1d9 100644
--- a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/page/SuggestionsTaskTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.test;
+package org.wikipedia.page;
import android.support.test.filters.SmallTest;
import android.test.ActivityUnitTestCase;
@@ -6,10 +6,9 @@
import org.wikipedia.Constants;
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.page.PageTitle;
-import org.wikipedia.page.SuggestionsTask;
import org.wikipedia.search.SearchResult;
import org.wikipedia.search.SearchResults;
+import org.wikipedia.test.TestDummyActivity;
import java.util.ArrayList;
import java.util.List;
@@ -20,13 +19,13 @@
* Tests for getting suggestions for further reading.
*/
@SmallTest
-public class SuggestionsTaskTests extends
ActivityUnitTestCase<TestDummyActivity> {
+public class SuggestionsTaskTest extends
ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 200_000;
private static final WikiSite WIKI = WikiSite.forLanguageCode("en"); //
suggestions don't seem to work on testwiki
private WikipediaApp app = WikipediaApp.getInstance();
- public SuggestionsTaskTests() {
+ public SuggestionsTaskTest() {
super(TestDummyActivity.class);
}
diff --git
a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
b/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
similarity index 92%
rename from app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
rename to
app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
index 9bc249c..8c1beed 100644
--- a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
+++
b/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
@@ -1,13 +1,11 @@
-package org.wikipedia.test;
+package org.wikipedia.search;
import android.support.test.filters.SmallTest;
import android.test.ActivityUnitTestCase;
import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.search.FullSearchArticlesTask;
-import org.wikipedia.search.SearchResult;
-import org.wikipedia.search.SearchResults;
+import org.wikipedia.test.TestDummyActivity;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -16,12 +14,12 @@
* Tests for full text search.
*/
@SmallTest
-public class FullSearchTaskTests extends
ActivityUnitTestCase<TestDummyActivity> {
+public class FullSearchArticlesTaskTest extends
ActivityUnitTestCase<TestDummyActivity> {
private static final int TASK_COMPLETION_TIMEOUT = 20_000;
private static final int BATCH_SIZE = 12;
private static final WikiSite WIKI = WikiSite.forLanguageCode("en");
- public FullSearchTaskTests() {
+ public FullSearchArticlesTaskTest() {
super(TestDummyActivity.class);
}
--
To view, visit https://gerrit.wikimedia.org/r/317096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife248bd34b2fe60412d5f2e17edab0bd24fcf6b7
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
