Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to latest robolectric 3.8 and mockito 2.7.22

Browse Source 
http://robolectric.org/getting-started/#building-with-gradle
This commit is contained in:
Hans-Christoph Steiner 2018-04-19 15:45:52 +02:00
parent 14474aed01
commit a3d9850a42
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@ -49,11 +49,9 @@ dependencies {
compile 'org.bouncycastle:bcpkix-jdk15on:1.59' compile 'org.bouncycastle:bcpkix-jdk15on:1.59'
compile 'org.bouncycastle:bcprov-jdk15on:1.59' compile 'org.bouncycastle:bcprov-jdk15on:1.59'
testCompile "org.robolectric:robolectric:3.3.2" testCompile "org.robolectric:robolectric:3.8"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
// As per https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 testCompile "org.mockito:mockito-core:2.7.22"
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
testCompile "org.mockito:mockito-core:1.10.19"
androidTestCompile "com.android.support:support-annotations:25.3.1" androidTestCompile "com.android.support:support-annotations:25.3.1"
androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:runner:0.5'
@ -194,6 +192,7 @@ android {
testOptions { testOptions {
unitTests { unitTests {
includeAndroidResources = true
// prevent tests from dying on android.util.Log calls // prevent tests from dying on android.util.Log calls
returnDefaultValues = true returnDefaultValues = true
all { all {

2
app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
View File

@ -445,7 +445,7 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
if ("ro.product.cpu.abilist".equals(key)) { if ("ro.product.cpu.abilist".equals(key)) {
return "armeabi"; return "armeabi";
} }
return ShadowSystemProperties.get(key); return ShadowSystemProperties.native_get(key);
} }
} }