[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove unnecessary test abstraction.

[Dbrant (Code Review)]

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

Change subject: Remove unnecessary test abstraction.
......................................................................

Remove unnecessary test abstraction.

Change-Id: Ic63e17a66e00277bdef82a47f8bf9501ca2b25cb
---
M app/src/test/java/org/wikipedia/createaccount/CreateAccountActivityTest.java
M app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
M 
app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
M 
app/src/test/java/org/wikipedia/dataclient/okhttp/AvailableInputStreamTest.java
M app/src/test/java/org/wikipedia/dataclient/okhttp/CacheControlUtilTest.java
M 
app/src/test/java/org/wikipedia/dataclient/okhttp/cache/CacheDelegateStrategyTest.java
M app/src/test/java/org/wikipedia/dataclient/okhttp/cache/SaveHeaderTest.java
M app/src/test/java/org/wikipedia/dataclient/okhttp/util/HttpUrlUtilTest.java
M app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
M 
app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageSummaryTest.java
M app/src/test/java/org/wikipedia/edit/richtext/ColorSpanExTest.java
M app/src/test/java/org/wikipedia/edit/richtext/StyleSpanExTest.java
M app/src/test/java/org/wikipedia/edit/richtext/URLSpanBoldNoUnderlineTest.java
M app/src/test/java/org/wikipedia/edit/richtext/URLSpanNoUnderlineTest.java
M 
app/src/test/java/org/wikipedia/feed/announcement/GeoIPCookieUnmarshallerTest.java
M app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java
M app/src/test/java/org/wikipedia/feed/mostread/MostReadArticlesTest.java
M app/src/test/java/org/wikipedia/feed/mostread/MostReadItemCardTest.java
M app/src/test/java/org/wikipedia/feed/news/NewsLinkCardTest.java
M app/src/test/java/org/wikipedia/html/ImageElementTest.java
M app/src/test/java/org/wikipedia/html/ImageTagParserTest.java
M app/src/test/java/org/wikipedia/html/PixelDensityDescriptorParserTest.java
M app/src/test/java/org/wikipedia/html/PixelDensityDescriptorTest.java
M 
app/src/test/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactoryTest.java
M app/src/test/java/org/wikipedia/json/WikiSiteTypeAdapterTest.java
M app/src/test/java/org/wikipedia/language/LangLinksActivityTest.java
M app/src/test/java/org/wikipedia/language/TranslationTests.java
M app/src/test/java/org/wikipedia/media/DefaultAvPlayerTest.java
M app/src/test/java/org/wikipedia/media/ImageUrlTest.java
M app/src/test/java/org/wikipedia/media/StateTest.java
M app/src/test/java/org/wikipedia/nearby/NearbyUnitTest.java
M app/src/test/java/org/wikipedia/page/NamespaceTest.java
M app/src/test/java/org/wikipedia/page/PageTest.java
M app/src/test/java/org/wikipedia/page/PageTitleTest.java
M app/src/test/java/org/wikipedia/page/SectionTest.java
M app/src/test/java/org/wikipedia/savedpages/PageImageUrlParserTest.java
M app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
M 
app/src/test/java/org/wikipedia/search/SearchResultsRedirectProcessingTest.java
M app/src/test/java/org/wikipedia/test/LanguageVariantTest.java
M app/src/test/java/org/wikipedia/test/MockWebServerTest.java
M app/src/test/java/org/wikipedia/test/ParcelableTest.java
D app/src/test/java/org/wikipedia/test/TestRunner.java
M app/src/test/java/org/wikipedia/util/BatchUtilTest.java
M app/src/test/java/org/wikipedia/util/DateUtilTest.java
M app/src/test/java/org/wikipedia/util/UriUtilTest.java
M app/src/test/java/org/wikipedia/zero/ZeroConfigTypeAdapterTest.java
46 files changed, 90 insertions(+), 150 deletions(-)


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

diff --git 
a/app/src/test/java/org/wikipedia/createaccount/CreateAccountActivityTest.java 
b/app/src/test/java/org/wikipedia/createaccount/CreateAccountActivityTest.java
index 4bce62b..46ce82a 100644
--- 
a/app/src/test/java/org/wikipedia/createaccount/CreateAccountActivityTest.java
+++ 
b/app/src/test/java/org/wikipedia/createaccount/CreateAccountActivityTest.java
@@ -2,14 +2,14 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.wikipedia.createaccount.CreateAccountActivity.ValidateResult;
 import static org.wikipedia.createaccount.CreateAccountActivity.validateInput;
 
-@RunWith(TestRunner.class) public class CreateAccountActivityTest {
+@RunWith(RobolectricTestRunner.class) public class CreateAccountActivityTest {
 
     @Test public void testValidateInputSuccess() throws Throwable {
         assertThat(validateInput("user", "password", "password",  ""),
diff --git a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java 
b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
index b394001..77f1c1a 100644
--- a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
+++ b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
@@ -2,17 +2,17 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 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;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
-@RunWith(TestRunner.class) public class WikiSiteTest {
+@RunWith(RobolectricTestRunner.class) public class WikiSiteTest {
     @Test public void testSupportedAuthority() {
         assertThat(WikiSite.supportedAuthority("fr.wikipedia.org"), is(true));
         assertThat(WikiSite.supportedAuthority("fr.m.wikipedia.org"), 
is(true));
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
index dca8d35..39f7334 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageLeadTest.java
@@ -5,10 +5,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.page.BasePageLeadTest;
 import org.wikipedia.dataclient.page.PageClient;
 import org.wikipedia.dataclient.page.PageLead;
-import org.wikipedia.test.TestRunner;
 import org.wikipedia.testlib.TestLatch;
 
 import okhttp3.CacheControl;
@@ -21,7 +21,7 @@
 import static org.junit.Assert.fail;
 import static org.wikipedia.json.GsonUnmarshaller.unmarshal;
 
-@RunWith(TestRunner.class) public class MwMobileViewPageLeadTest extends 
BasePageLeadTest {
+@RunWith(RobolectricTestRunner.class) public class MwMobileViewPageLeadTest 
extends BasePageLeadTest {
     private PageClient subject;
 
     @Before public void setUp() throws Throwable {
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/AvailableInputStreamTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/AvailableInputStreamTest.java
index 25ca923..b019b4f 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/AvailableInputStreamTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/AvailableInputStreamTest.java
@@ -2,15 +2,15 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import java.io.ByteArrayInputStream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class AvailableInputStreamTest {
+@RunWith(RobolectricTestRunner.class) public class AvailableInputStreamTest {
 
     @SuppressWarnings("checkstyle:magicnumber")
     @Test public void testAvailableInputStream() throws Throwable {
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/CacheControlUtilTest.java 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/CacheControlUtilTest.java
index 8074bb4..25d9609 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/CacheControlUtilTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/CacheControlUtilTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class CacheControlUtilTest {
+@RunWith(RobolectricTestRunner.class) public class CacheControlUtilTest {
     @Test public void testReplaceMaxStale() {
         assertThat(CacheControlUtil.replaceMaxStale("no-cache, max-stale=1, 
max-age=2, max-stale=3",
                 10), is("no-cache, max-age=2, max-stale=10"));
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/CacheDelegateStrategyTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/CacheDelegateStrategyTest.java
index 76a0713..350dcbc 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/CacheDelegateStrategyTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/CacheDelegateStrategyTest.java
@@ -2,15 +2,15 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.Constants;
-import org.wikipedia.test.TestRunner;
 
 import okhttp3.Request;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class CacheDelegateStrategyTest {
+@RunWith(RobolectricTestRunner.class) public class CacheDelegateStrategyTest {
     @Test public void testIsCacheableTrue() {
         Request req = new Request.Builder()
                 .url(Constants.WIKIPEDIA_URL)
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/SaveHeaderTest.java 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/SaveHeaderTest.java
index d36867c..9ac2cb3 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/SaveHeaderTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/cache/SaveHeaderTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class SaveHeaderTest {
+@RunWith(RobolectricTestRunner.class) public class SaveHeaderTest {
     @Test public void testIsSaveEnabledTrue() {
         assertThat(SaveHeader.isSaveEnabled("true"), is(true));
     }
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/util/HttpUrlUtilTest.java 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/util/HttpUrlUtilTest.java
index c85137c..c839d1b 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/okhttp/util/HttpUrlUtilTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/okhttp/util/HttpUrlUtilTest.java
@@ -2,15 +2,15 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.test.TestRunner;
 
 import okhttp3.HttpUrl;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class HttpUrlUtilTest {
+@RunWith(RobolectricTestRunner.class) public class HttpUrlUtilTest {
     @Test public void testIsRestBaseProd() {
         HttpUrl url = HttpUrl.parse("https://test.wikipedia.org/api/rest_v1/";);
         assertThat(HttpUrlUtil.isRestBase(url), is(true));
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
index 942051a..9de1db1 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageLeadTest.java
@@ -5,11 +5,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.mwapi.page.MwMobileViewPageLead;
 import org.wikipedia.dataclient.page.BasePageLeadTest;
 import org.wikipedia.dataclient.page.PageClient;
 import org.wikipedia.dataclient.page.PageLead;
-import org.wikipedia.test.TestRunner;
 import org.wikipedia.testlib.TestLatch;
 
 import okhttp3.CacheControl;
@@ -22,7 +22,7 @@
 import static org.junit.Assert.fail;
 import static org.wikipedia.json.GsonUnmarshaller.unmarshal;
 
-@RunWith(TestRunner.class) public class RbPageLeadTest extends 
BasePageLeadTest {
+@RunWith(RobolectricTestRunner.class) public class RbPageLeadTest extends 
BasePageLeadTest {
     private PageClient subject;
 
     @Before @Override public void setUp() throws Throwable {
diff --git 
a/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageSummaryTest.java
 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageSummaryTest.java
index 820a30a..04be4d7 100644
--- 
a/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageSummaryTest.java
+++ 
b/app/src/test/java/org/wikipedia/dataclient/restbase/page/RbPageSummaryTest.java
@@ -5,8 +5,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.feed.mostread.MostReadArticlesTest;
-import org.wikipedia.test.TestRunner;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @SuppressWarnings("checkstyle:magicnumber")
 public class RbPageSummaryTest {
     private List<RbPageSummary> subjects;
diff --git a/app/src/test/java/org/wikipedia/edit/richtext/ColorSpanExTest.java 
b/app/src/test/java/org/wikipedia/edit/richtext/ColorSpanExTest.java
index 92a8298..402804a 100644
--- a/app/src/test/java/org/wikipedia/edit/richtext/ColorSpanExTest.java
+++ b/app/src/test/java/org/wikipedia/edit/richtext/ColorSpanExTest.java
@@ -4,10 +4,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.test.TestParcelUtil;
-import org.wikipedia.test.TestRunner;
 
-@RunWith(TestRunner.class) public class ColorSpanExTest {
+@RunWith(RobolectricTestRunner.class) public class ColorSpanExTest {
     @Test public void testCtorParcel() throws Throwable {
         SyntaxRule rule = new SyntaxRule("startSymbol", "endSymbol", 
SyntaxRuleStyle.BOLD);
         Parcelable subject = new ColorSpanEx(1, 2, 10, rule);
diff --git a/app/src/test/java/org/wikipedia/edit/richtext/StyleSpanExTest.java 
b/app/src/test/java/org/wikipedia/edit/richtext/StyleSpanExTest.java
index 400aeab..22e2aa8 100644
--- a/app/src/test/java/org/wikipedia/edit/richtext/StyleSpanExTest.java
+++ b/app/src/test/java/org/wikipedia/edit/richtext/StyleSpanExTest.java
@@ -4,10 +4,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.test.TestParcelUtil;
-import org.wikipedia.test.TestRunner;
 
-@RunWith(TestRunner.class) public class StyleSpanExTest {
+@RunWith(RobolectricTestRunner.class) public class StyleSpanExTest {
     @Test public void testCtorParcel() throws Throwable {
         SyntaxRule rule = new SyntaxRule("startSymbol", "endSymbol", 
SyntaxRuleStyle.BOLD);
         Parcelable subject = new StyleSpanEx(1, 2, rule);
diff --git 
a/app/src/test/java/org/wikipedia/edit/richtext/URLSpanBoldNoUnderlineTest.java 
b/app/src/test/java/org/wikipedia/edit/richtext/URLSpanBoldNoUnderlineTest.java
index a437a0f..b47686c 100644
--- 
a/app/src/test/java/org/wikipedia/edit/richtext/URLSpanBoldNoUnderlineTest.java
+++ 
b/app/src/test/java/org/wikipedia/edit/richtext/URLSpanBoldNoUnderlineTest.java
@@ -4,11 +4,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.richtext.URLSpanBoldNoUnderline;
 import org.wikipedia.test.TestParcelUtil;
-import org.wikipedia.test.TestRunner;
 
-@RunWith(TestRunner.class) public class URLSpanBoldNoUnderlineTest {
+@RunWith(RobolectricTestRunner.class) public class URLSpanBoldNoUnderlineTest {
     @Test public void testCtorParcel() throws Throwable {
         Parcelable subject = new URLSpanBoldNoUnderline("url");
         TestParcelUtil.test(subject);
diff --git 
a/app/src/test/java/org/wikipedia/edit/richtext/URLSpanNoUnderlineTest.java 
b/app/src/test/java/org/wikipedia/edit/richtext/URLSpanNoUnderlineTest.java
index d77ad82..438ba14 100644
--- a/app/src/test/java/org/wikipedia/edit/richtext/URLSpanNoUnderlineTest.java
+++ b/app/src/test/java/org/wikipedia/edit/richtext/URLSpanNoUnderlineTest.java
@@ -4,11 +4,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.richtext.URLSpanNoUnderline;
 import org.wikipedia.test.TestParcelUtil;
-import org.wikipedia.test.TestRunner;
 
-@RunWith(TestRunner.class) public class URLSpanNoUnderlineTest {
+@RunWith(RobolectricTestRunner.class) public class URLSpanNoUnderlineTest {
     @Test public void testCtorParcel() throws Throwable {
         Parcelable subject = new URLSpanNoUnderline("url");
         TestParcelUtil.test(subject);
diff --git 
a/app/src/test/java/org/wikipedia/feed/announcement/GeoIPCookieUnmarshallerTest.java
 
b/app/src/test/java/org/wikipedia/feed/announcement/GeoIPCookieUnmarshallerTest.java
index 0d8459c..a167274 100644
--- 
a/app/src/test/java/org/wikipedia/feed/announcement/GeoIPCookieUnmarshallerTest.java
+++ 
b/app/src/test/java/org/wikipedia/feed/announcement/GeoIPCookieUnmarshallerTest.java
@@ -2,14 +2,14 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class GeoIPCookieUnmarshallerTest {
 
     private static final double LATITUDE = 37.33;
diff --git 
a/app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java 
b/app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java
index 0e2e308..693823a 100644
--- a/app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java
+++ b/app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java
@@ -3,17 +3,17 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.dataclient.restbase.page.RbPageSummary;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FeaturedArticleCardTest {
     private static WikiSite TEST = WikiSite.forLanguageCode("test");
     private RbPageSummary content;
diff --git 
a/app/src/test/java/org/wikipedia/feed/mostread/MostReadArticlesTest.java 
b/app/src/test/java/org/wikipedia/feed/mostread/MostReadArticlesTest.java
index 03743db..36fb3a3 100644
--- a/app/src/test/java/org/wikipedia/feed/mostread/MostReadArticlesTest.java
+++ b/app/src/test/java/org/wikipedia/feed/mostread/MostReadArticlesTest.java
@@ -4,9 +4,9 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -17,7 +17,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @SuppressWarnings("checkstyle:magicnumber")
 public class MostReadArticlesTest {
     @NonNull public static MostReadArticles unmarshal(@NonNull String 
filename) throws Throwable {
diff --git 
a/app/src/test/java/org/wikipedia/feed/mostread/MostReadItemCardTest.java 
b/app/src/test/java/org/wikipedia/feed/mostread/MostReadItemCardTest.java
index 6697098..2c8592c 100644
--- a/app/src/test/java/org/wikipedia/feed/mostread/MostReadItemCardTest.java
+++ b/app/src/test/java/org/wikipedia/feed/mostread/MostReadItemCardTest.java
@@ -3,10 +3,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MostReadItemCardTest {
     private static WikiSite TEST = WikiSite.forLanguageCode("test");
     private MostReadArticles content;
diff --git a/app/src/test/java/org/wikipedia/feed/news/NewsLinkCardTest.java 
b/app/src/test/java/org/wikipedia/feed/news/NewsLinkCardTest.java
index 4a90992..8aaf7ce 100644
--- a/app/src/test/java/org/wikipedia/feed/news/NewsLinkCardTest.java
+++ b/app/src/test/java/org/wikipedia/feed/news/NewsLinkCardTest.java
@@ -5,11 +5,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.dataclient.restbase.page.RbPageSummary;
 import org.wikipedia.json.GsonUtil;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class NewsLinkCardTest {
     private static WikiSite TEST = WikiSite.forLanguageCode("test");
     private List<NewsItem> content;
diff --git a/app/src/test/java/org/wikipedia/html/ImageElementTest.java 
b/app/src/test/java/org/wikipedia/html/ImageElementTest.java
index 86fac5d..4436392 100644
--- a/app/src/test/java/org/wikipedia/html/ImageElementTest.java
+++ b/app/src/test/java/org/wikipedia/html/ImageElementTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.Collections;
 import java.util.Map;
@@ -11,7 +11,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-@RunWith(TestRunner.class) public class ImageElementTest {
+@RunWith(RobolectricTestRunner.class) public class ImageElementTest {
     @Test public void testSrcDefaultEmptySrcSet() {
         String src = "src";
         @SuppressWarnings("unchecked") Map<PixelDensityDescriptor, String> 
srcSet = Collections.emptyMap();
diff --git a/app/src/test/java/org/wikipedia/html/ImageTagParserTest.java 
b/app/src/test/java/org/wikipedia/html/ImageTagParserTest.java
index e0bdcd1..07a772b 100644
--- a/app/src/test/java/org/wikipedia/html/ImageTagParserTest.java
+++ b/app/src/test/java/org/wikipedia/html/ImageTagParserTest.java
@@ -6,13 +6,13 @@
 import org.jsoup.nodes.Element;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-@RunWith(TestRunner.class) public class ImageTagParserTest {
+@RunWith(RobolectricTestRunner.class) public class ImageTagParserTest {
     private static final PixelDensityDescriptor DESCRIPTOR_1X = new 
PixelDensityDescriptor(1);
     private static final PixelDensityDescriptor DESCRIPTOR_1_5X = new 
PixelDensityDescriptor(1.5f);
 
diff --git 
a/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorParserTest.java 
b/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorParserTest.java
index 1aeba1f..c584c2f 100644
--- a/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorParserTest.java
+++ b/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorParserTest.java
@@ -4,12 +4,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class PixelDensityDescriptorParserTest {
+@RunWith(RobolectricTestRunner.class) public class 
PixelDensityDescriptorParserTest {
     @NonNull private final PixelDensityDescriptorParser subject = new 
PixelDensityDescriptorParser();
 
     @Test(expected = ParseException.class) public void testParseEmpty() {
diff --git 
a/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorTest.java 
b/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorTest.java
index d1674d4..9c26dd8 100644
--- a/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorTest.java
+++ b/app/src/test/java/org/wikipedia/html/PixelDensityDescriptorTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class PixelDensityDescriptorTest {
+@RunWith(RobolectricTestRunner.class) public class PixelDensityDescriptorTest {
     @Test public void testDensity() {
         PixelDensityDescriptor subject = new PixelDensityDescriptor(1);
         assertThat(subject.density(), is(1f));
diff --git 
a/app/src/test/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactoryTest.java
 
b/app/src/test/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactoryTest.java
index b1fa30d..0a790cf 100644
--- 
a/app/src/test/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactoryTest.java
+++ 
b/app/src/test/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactoryTest.java
@@ -9,10 +9,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.Constants;
 import org.wikipedia.json.annotations.Required;
 import org.wikipedia.model.BaseModel;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
@@ -20,7 +20,7 @@
 import static org.wikipedia.json.GsonMarshaller.marshal;
 import static org.wikipedia.json.GsonUnmarshaller.unmarshal;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RequiredFieldsCheckOnReadTypeAdapterFactoryTest {
     private final Gson gson = 
GsonUtil.getDefaultGsonBuilder().serializeNulls().create();
 
diff --git a/app/src/test/java/org/wikipedia/json/WikiSiteTypeAdapterTest.java 
b/app/src/test/java/org/wikipedia/json/WikiSiteTypeAdapterTest.java
index dd3cfb2..4f238c9 100644
--- a/app/src/test/java/org/wikipedia/json/WikiSiteTypeAdapterTest.java
+++ b/app/src/test/java/org/wikipedia/json/WikiSiteTypeAdapterTest.java
@@ -2,8 +2,8 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -11,7 +11,7 @@
 import static org.wikipedia.json.GsonMarshaller.marshal;
 import static org.wikipedia.json.GsonUnmarshaller.unmarshal;
 
-@RunWith(TestRunner.class) public class WikiSiteTypeAdapterTest {
+@RunWith(RobolectricTestRunner.class) public class WikiSiteTypeAdapterTest {
     @Test public void testWriteRead() {
         WikiSite wiki = WikiSite.forLanguageCode("test");
         assertThat(unmarshal(WikiSite.class, marshal(wiki)), is(wiki));
diff --git 
a/app/src/test/java/org/wikipedia/language/LangLinksActivityTest.java 
b/app/src/test/java/org/wikipedia/language/LangLinksActivityTest.java
index 43b14f2..fcb244e 100644
--- a/app/src/test/java/org/wikipedia/language/LangLinksActivityTest.java
+++ b/app/src/test/java/org/wikipedia/language/LangLinksActivityTest.java
@@ -1,20 +1,18 @@
 package org.wikipedia.language;
 
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.PageTitle;
-import org.wikipedia.test.TestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class LangLinksActivityTest{
 
     @Test public void testAddChineseEntriesForTraditionalChinese() throws 
Throwable {
diff --git a/app/src/test/java/org/wikipedia/language/TranslationTests.java 
b/app/src/test/java/org/wikipedia/language/TranslationTests.java
index b06cbb5..5d12317 100644
--- a/app/src/test/java/org/wikipedia/language/TranslationTests.java
+++ b/app/src/test/java/org/wikipedia/language/TranslationTests.java
@@ -9,7 +9,7 @@
 import org.jsoup.select.Elements;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.util.log.L;
 
 import java.io.File;
@@ -37,7 +37,7 @@
  *
  * TODO: check content_license_html is valid HTML
  */
-@RunWith(TestRunner.class) @SuppressWarnings("checkstyle:magicnumber")
+@RunWith(RobolectricTestRunner.class) 
@SuppressWarnings("checkstyle:magicnumber")
 public class TranslationTests {
     private static File RES_BASE = new File("src/main/res/");
 
diff --git a/app/src/test/java/org/wikipedia/media/DefaultAvPlayerTest.java 
b/app/src/test/java/org/wikipedia/media/DefaultAvPlayerTest.java
index ad11cf6..4a4cd90 100644
--- a/app/src/test/java/org/wikipedia/media/DefaultAvPlayerTest.java
+++ b/app/src/test/java/org/wikipedia/media/DefaultAvPlayerTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -12,7 +12,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultAvPlayerTest {
     private static final String PATH_A = "http://pathA";;
     private static final String PATH_B = "http://pathB";;
diff --git a/app/src/test/java/org/wikipedia/media/ImageUrlTest.java 
b/app/src/test/java/org/wikipedia/media/ImageUrlTest.java
index f0fdc51..7a61aa6 100644
--- a/app/src/test/java/org/wikipedia/media/ImageUrlTest.java
+++ b/app/src/test/java/org/wikipedia/media/ImageUrlTest.java
@@ -2,14 +2,14 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.wikipedia.Constants.PREFERRED_THUMB_SIZE;
 import static org.wikipedia.util.ImageUrlUtil.getUrlForSize;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ImageUrlTest {
     private String url1024 = 
"https://upload.wikimedia.org/wikipedia/commons/thumb/9/90/Istanbul_Airport_Turkish-Airlines_2013-11-18.JPG/1024px-Istanbul_Airport_Turkish-Airlines_2013-11-18.JPG";;
     private String url320 = 
"https://upload.wikimedia.org/wikipedia/commons/thumb/9/90/Istanbul_Airport_Turkish-Airlines_2013-11-18.JPG/320px-Istanbul_Airport_Turkish-Airlines_2013-11-18.JPG";;
diff --git a/app/src/test/java/org/wikipedia/media/StateTest.java 
b/app/src/test/java/org/wikipedia/media/StateTest.java
index c554203..7258c69 100644
--- a/app/src/test/java/org/wikipedia/media/StateTest.java
+++ b/app/src/test/java/org/wikipedia/media/StateTest.java
@@ -3,12 +3,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class StateTest {
     private static final String PATH_A = "http://pathA";;
     private static final String PATH_B = "http://pathB";;
diff --git a/app/src/test/java/org/wikipedia/nearby/NearbyUnitTest.java 
b/app/src/test/java/org/wikipedia/nearby/NearbyUnitTest.java
index ab5ebcc..91943a3 100644
--- a/app/src/test/java/org/wikipedia/nearby/NearbyUnitTest.java
+++ b/app/src/test/java/org/wikipedia/nearby/NearbyUnitTest.java
@@ -7,8 +7,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.wikipedia.test.TestRunner;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -21,7 +21,7 @@
 /**
  * Unit tests for Nearby related classes. Probably should refactor this into a 
model class.
  */
-@SuppressWarnings("checkstyle:magicnumber") @RunWith(TestRunner.class)
+@SuppressWarnings("checkstyle:magicnumber") 
@RunWith(RobolectricTestRunner.class)
 public class NearbyUnitTest {
     /** dist(origin, point a) */
     private static final int A = 111_319;
diff --git a/app/src/test/java/org/wikipedia/page/NamespaceTest.java 
b/app/src/test/java/org/wikipedia/page/NamespaceTest.java
index 6994f92..8004fbb 100644
--- a/app/src/test/java/org/wikipedia/page/NamespaceTest.java
+++ b/app/src/test/java/org/wikipedia/page/NamespaceTest.java
@@ -4,8 +4,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.test.TestRunner;
 
 import java.util.Locale;
 
@@ -18,7 +18,7 @@
 import static org.wikipedia.page.Namespace.SPECIAL;
 import static org.wikipedia.page.Namespace.TALK;
 
-@RunWith(TestRunner.class) public class NamespaceTest {
+@RunWith(RobolectricTestRunner.class) public class NamespaceTest {
     private static Locale PREV_DEFAULT_LOCALE;
 
     @BeforeClass public static void setUp() {
diff --git a/app/src/test/java/org/wikipedia/page/PageTest.java 
b/app/src/test/java/org/wikipedia/page/PageTest.java
index 76249e6..4676cf1 100644
--- a/app/src/test/java/org/wikipedia/page/PageTest.java
+++ b/app/src/test/java/org/wikipedia/page/PageTest.java
@@ -3,9 +3,9 @@
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.dataclient.page.BasePageLeadTest;
-import org.wikipedia.test.TestRunner;
 
 import java.util.ArrayList;
 
@@ -13,7 +13,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /** Unit tests for Page. */
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class PageTest {
     private static final WikiSite WIKI = WikiSite.forLanguageCode("en");
 
diff --git a/app/src/test/java/org/wikipedia/page/PageTitleTest.java 
b/app/src/test/java/org/wikipedia/page/PageTitleTest.java
index cf101a1..bb29bd7 100644
--- a/app/src/test/java/org/wikipedia/page/PageTitleTest.java
+++ b/app/src/test/java/org/wikipedia/page/PageTitleTest.java
@@ -2,9 +2,9 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.staticdata.MainPageNameData;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -12,7 +12,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(TestRunner.class) public class PageTitleTest {
+@RunWith(RobolectricTestRunner.class) public class PageTitleTest {
     @Test public void testEquals() throws Throwable {
         assertThat(new PageTitle(null, "India", 
WikiSite.forLanguageCode("en")).equals(new PageTitle(null, "India", 
WikiSite.forLanguageCode("en"))), is(true));
         assertThat(new PageTitle("Talk", "India",  
WikiSite.forLanguageCode("en")).equals(new PageTitle("Talk", "India", 
WikiSite.forLanguageCode("en"))), is(true));
diff --git a/app/src/test/java/org/wikipedia/page/SectionTest.java 
b/app/src/test/java/org/wikipedia/page/SectionTest.java
index e9a9a1f..4c1030a 100644
--- a/app/src/test/java/org/wikipedia/page/SectionTest.java
+++ b/app/src/test/java/org/wikipedia/page/SectionTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class SectionTest {
+@RunWith(RobolectricTestRunner.class) public class SectionTest {
     @Test public void testSectionLead() {
         // Section 0 is the lead
         Section section = new Section(0, 0, "Heading", "Heading", "Content");
diff --git 
a/app/src/test/java/org/wikipedia/savedpages/PageImageUrlParserTest.java 
b/app/src/test/java/org/wikipedia/savedpages/PageImageUrlParserTest.java
index 79fba06..bd37173 100644
--- a/app/src/test/java/org/wikipedia/savedpages/PageImageUrlParserTest.java
+++ b/app/src/test/java/org/wikipedia/savedpages/PageImageUrlParserTest.java
@@ -4,11 +4,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.page.PageLead;
 import org.wikipedia.html.ImageTagParser;
 import org.wikipedia.html.PixelDensityDescriptorParser;
 import org.wikipedia.page.Section;
-import org.wikipedia.test.TestRunner;
 
 import java.util.Collections;
 import java.util.List;
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(TestRunner.class) public class PageImageUrlParserTest {
+@RunWith(RobolectricTestRunner.class) public class PageImageUrlParserTest {
     @NonNull private final PageImageUrlParser subject = new 
PageImageUrlParser(new ImageTagParser(),
             new PixelDensityDescriptorParser());
 
diff --git 
a/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java 
b/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
index 1ee2c6b..0023516 100644
--- a/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
+++ b/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.Constants;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.PageTitle;
-import org.wikipedia.test.TestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,7 +13,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-@RunWith(TestRunner.class) public class SearchResultsFilterTest {
+@RunWith(RobolectricTestRunner.class) public class SearchResultsFilterTest {
     private static final WikiSite WIKI = WikiSite.forLanguageCode("test");
 
     @Test public void testFilterNoResults() {
diff --git 
a/app/src/test/java/org/wikipedia/search/SearchResultsRedirectProcessingTest.java
 
b/app/src/test/java/org/wikipedia/search/SearchResultsRedirectProcessingTest.java
index 4984676..8f6019c 100644
--- 
a/app/src/test/java/org/wikipedia/search/SearchResultsRedirectProcessingTest.java
+++ 
b/app/src/test/java/org/wikipedia/search/SearchResultsRedirectProcessingTest.java
@@ -3,14 +3,14 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.mwapi.MwQueryResult;
 import org.wikipedia.json.GsonUtil;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class SearchResultsRedirectProcessingTest {
+@RunWith(RobolectricTestRunner.class) public class 
SearchResultsRedirectProcessingTest {
 
     private MwQueryResult result;
 
diff --git a/app/src/test/java/org/wikipedia/test/LanguageVariantTest.java 
b/app/src/test/java/org/wikipedia/test/LanguageVariantTest.java
index 282fa86..c895aa2 100644
--- a/app/src/test/java/org/wikipedia/test/LanguageVariantTest.java
+++ b/app/src/test/java/org/wikipedia/test/LanguageVariantTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.language.AppLanguageLookUpTable;
@@ -11,7 +12,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@RunWith(TestRunner.class) public class LanguageVariantTest {
+@RunWith(RobolectricTestRunner.class) public class LanguageVariantTest {
     private Locale defaultLocale;
     private String appLanguage;
 
diff --git a/app/src/test/java/org/wikipedia/test/MockWebServerTest.java 
b/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
index c38437e..103c443 100644
--- a/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
+++ b/app/src/test/java/org/wikipedia/test/MockWebServerTest.java
@@ -5,6 +5,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.okhttp.CacheControlRequestInterceptor;
 import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory;
 import org.wikipedia.json.GsonUtil;
@@ -18,7 +19,7 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public abstract class MockWebServerTest {
     private OkHttpClient okHttpClient;
     private final TestWebServer server = new TestWebServer();
diff --git a/app/src/test/java/org/wikipedia/test/ParcelableTest.java 
b/app/src/test/java/org/wikipedia/test/ParcelableTest.java
index a2ea5a0..2857411 100644
--- a/app/src/test/java/org/wikipedia/test/ParcelableTest.java
+++ b/app/src/test/java/org/wikipedia/test/ParcelableTest.java
@@ -3,13 +3,14 @@
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.page.PageProperties;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.pageimages.PageImage;
 
-@RunWith(TestRunner.class) public class ParcelableTest {
+@RunWith(RobolectricTestRunner.class) public class ParcelableTest {
     @Test public void testPageTitle() throws Throwable {
         PageTitle title = new PageTitle(null, "Test", 
WikiSite.forLanguageCode("en"));
         TestParcelUtil.test(title);
diff --git a/app/src/test/java/org/wikipedia/test/TestRunner.java 
b/app/src/test/java/org/wikipedia/test/TestRunner.java
deleted file mode 100644
index 9f7bd39..0000000
--- a/app/src/test/java/org/wikipedia/test/TestRunner.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.wikipedia.test;
-
-import android.support.annotation.NonNull;
-
-import org.junit.runners.model.InitializationError;
-import org.robolectric.RobolectricTestRunner;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/** A {@link RobolectricTestRunner} with support for loading Gradle 
properties. */
-public class TestRunner extends RobolectricTestRunner {
-    private static final String GRADLE_PROPERTIES_FILENAME = 
"gradle.properties";
-
-    public TestRunner(Class<?> testClass) throws InitializationError {
-        super(testClass);
-        initProperties();
-    }
-
-    private void initProperties() {
-        File propertiesFile = new File(GRADLE_PROPERTIES_FILENAME);
-        if (propertiesFile.isFile()) {
-            setProperties(propertiesFile);
-        }
-    }
-
-    private void setProperties(@NonNull File file) {
-        setProperties(readProperties(file));
-    }
-
-    private void setProperties(@NonNull Properties properties) {
-        for (String name : properties.stringPropertyNames()) {
-            String value = properties.getProperty(name);
-            System.setProperty(name, value);
-        }
-    }
-
-    @NonNull
-    private Properties readProperties(@NonNull File file) {
-        try {
-            return readProperties(new FileInputStream(file));
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @NonNull
-    private Properties readProperties(@NonNull InputStream inputStream) {
-        Properties properties = new Properties();
-        try {
-            properties.load(inputStream);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return properties;
-    }
-}
diff --git a/app/src/test/java/org/wikipedia/util/BatchUtilTest.java 
b/app/src/test/java/org/wikipedia/util/BatchUtilTest.java
index 5901346..efb3eec 100644
--- a/app/src/test/java/org/wikipedia/util/BatchUtilTest.java
+++ b/app/src/test/java/org/wikipedia/util/BatchUtilTest.java
@@ -5,9 +5,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.PageTitle;
-import org.wikipedia.test.TestRunner;
 import org.wikipedia.testlib.TestLatch;
 
 import java.util.ArrayList;
@@ -16,7 +16,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-@RunWith(TestRunner.class) public class BatchUtilTest {
+@RunWith(RobolectricTestRunner.class) public class BatchUtilTest {
     private ArrayList<PageTitle> titles;
     private static final int TOTAL = 120;
 
diff --git a/app/src/test/java/org/wikipedia/util/DateUtilTest.java 
b/app/src/test/java/org/wikipedia/util/DateUtilTest.java
index b047ee4..06fb110 100644
--- a/app/src/test/java/org/wikipedia/util/DateUtilTest.java
+++ b/app/src/test/java/org/wikipedia/util/DateUtilTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DateUtilTest {
     private static final String HTTP_DATE_HEADER = "Thu, 25 May 2017 21:13:47 
GMT";
 
diff --git a/app/src/test/java/org/wikipedia/util/UriUtilTest.java 
b/app/src/test/java/org/wikipedia/util/UriUtilTest.java
index cf897e7..4d2b64a 100644
--- a/app/src/test/java/org/wikipedia/util/UriUtilTest.java
+++ b/app/src/test/java/org/wikipedia/util/UriUtilTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wikipedia.test.TestRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class UriUtilTest {
     /**
      * Inspired by
diff --git 
a/app/src/test/java/org/wikipedia/zero/ZeroConfigTypeAdapterTest.java 
b/app/src/test/java/org/wikipedia/zero/ZeroConfigTypeAdapterTest.java
index 69592bb..6ef3349 100644
--- a/app/src/test/java/org/wikipedia/zero/ZeroConfigTypeAdapterTest.java
+++ b/app/src/test/java/org/wikipedia/zero/ZeroConfigTypeAdapterTest.java
@@ -5,9 +5,9 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestRunner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
@@ -15,7 +15,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 
 @SuppressWarnings("checkstyle:magicnumber")
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ZeroConfigTypeAdapterTest {
     private static final int CYAN = -16711681;
     private static final int WHITE = -1;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic63e17a66e00277bdef82a47f8bf9501ca2b25cb
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