jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404755 )
Change subject: Update Robolectric to 3.6.1.
......................................................................
Update Robolectric to 3.6.1.
Change-Id: I0b79bf1b587393953b8a8ccd985f230caadd134a
---
M app/build.gradle
M
app/src/test/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
M app/src/test/resources/robolectric.properties
3 files changed, 19 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/build.gradle b/app/build.gradle
index 08955b3..191f680 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,6 +153,12 @@
exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
}
+
+ testOptions {
+ unitTests {
+ includeAndroidResources = true
+ }
+ }
}
apply from: '../gradle/src/test.gradle'
@@ -223,7 +229,7 @@
testImplementation 'junit:junit:4.12'
testImplementation mockitoCore
- testImplementation 'org.robolectric:robolectric:3.3.2'
+ testImplementation 'org.robolectric:robolectric:3.6.1'
testImplementation "com.squareup.okhttp3:mockwebserver:$okHttpVersion"
androidTestImplementation mockitoCore
diff --git
a/app/src/test/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
b/app/src/test/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
index 102a521..059f7c7 100644
---
a/app/src/test/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
+++
b/app/src/test/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
@@ -3,18 +3,26 @@
import junit.framework.Assert;
import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.PageTitle;
-import org.wikipedia.test.TestRunner;
import java.util.ArrayList;
import java.util.List;
-@RunWith(TestRunner.class)
+@RunWith(RobolectricTestRunner.class)
+@Config(application = WikipediaApp.class)
public class ReadingListDbHelperTest {
- private ReadingListDbHelper readingListDbHelper =
ReadingListDbHelper.instance();
+ private ReadingListDbHelper readingListDbHelper;
+
+ @Before
+ public void setup() {
+ readingListDbHelper = ReadingListDbHelper.instance();
+ }
@Test
public void testGetAllListsForFullList() {
@@ -193,6 +201,7 @@
Assert.assertTrue(numOfPages != 0);
}
+
public boolean hasTitle(List<ReadingList> lists, String title) {
List<String> titles = new ArrayList<>();
for (ReadingList readingList : lists) {
diff --git a/app/src/test/resources/robolectric.properties
b/app/src/test/resources/robolectric.properties
index 7e2f5c7..b480995 100644
--- a/app/src/test/resources/robolectric.properties
+++ b/app/src/test/resources/robolectric.properties
@@ -1,3 +1,2 @@
# suppress inspection "UnusedProperty" for whole file
sdk=24
-manifest=src/main/AndroidManifest.xml
--
To view, visit https://gerrit.wikimedia.org/r/404755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b79bf1b587393953b8a8ccd985f230caadd134a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
