Skip to content

Commit 372542c

Browse files
committed
update robolectric 3.0.rc-2 -> 3.1
1 parent 22cfddb commit 372542c

File tree

10 files changed

+11
-22
lines changed

10 files changed

+11
-22
lines changed

test/build.gradle

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,17 @@ android {
1515
versionCode 1
1616
versionName '0.1'
1717
}
18-
buildTypes {
19-
debug {
20-
buildConfigField "int", "MIN_SDK_VERSION", Integer.toString(android.defaultConfig.minSdkVersion.apiLevel)
21-
}
22-
release {
23-
buildConfigField "int", "MIN_SDK_VERSION", Integer.toString(android.defaultConfig.minSdkVersion.apiLevel)
24-
}
25-
}
2618
compileOptions {
2719
sourceCompatibility JavaVersion.VERSION_1_7
2820
targetCompatibility JavaVersion.VERSION_1_7
2921
}
3022
}
3123

3224
dependencies {
33-
compile project (':library')
25+
compile project(':library')
3426

3527
testCompile 'junit:junit:4.12'
36-
testCompile('org.robolectric:robolectric:3.0-rc2') {
37-
exclude group: 'commons-logging', module: 'commons-logging'
38-
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
39-
}
28+
testCompile 'org.robolectric:robolectric:3.1'
4029
testCompile 'com.squareup:fest-android:1.0.0'
4130
testCompile 'com.google.guava:guava-jdk5:17.0'
4231
testCompile('com.danikula:android-garden:2.1.4') {

test/src/test/java/com/danikula/videocache/FileNameGeneratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @author Alexey Danilov ([email protected]).
2121
*/
2222
@RunWith(RobolectricGradleTestRunner.class)
23-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
23+
@Config(constants = BuildConfig.class)
2424
public class FileNameGeneratorTest {
2525

2626
@Test

test/src/test/java/com/danikula/videocache/GetRequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Alexey Danilov ([email protected]).
1818
*/
1919
@RunWith(RobolectricGradleTestRunner.class)
20-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
20+
@Config(constants = BuildConfig.class)
2121
public class GetRequestTest {
2222

2323
@Test

test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* @author Alexey Danilov ([email protected]).
4242
*/
4343
@RunWith(RobolectricGradleTestRunner.class)
44-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
44+
@Config(constants = BuildConfig.class)
4545
public class HttpProxyCacheServerTest {
4646

4747
private File cacheFolder;

test/src/test/java/com/danikula/videocache/HttpProxyCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @author Alexey Danilov ([email protected]).
4444
*/
4545
@RunWith(RobolectricGradleTestRunner.class)
46-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
46+
@Config(constants = BuildConfig.class)
4747
public class HttpProxyCacheTest {
4848

4949
@Test

test/src/test/java/com/danikula/videocache/HttpUrlSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Alexey Danilov ([email protected]).
3030
*/
3131
@RunWith(RobolectricGradleTestRunner.class)
32-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
32+
@Config(constants = BuildConfig.class)
3333
public class HttpUrlSourceTest {
3434

3535
@Test

test/src/test/java/com/danikula/videocache/ProxyCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Alexey Danilov ([email protected]).
3030
*/
3131
@RunWith(RobolectricGradleTestRunner.class)
32-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
32+
@Config(constants = BuildConfig.class)
3333
public class ProxyCacheTest {
3434

3535
@Test

test/src/test/java/com/danikula/videocache/file/DiskUsageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @author Alexey Danilov ([email protected]).
2323
*/
2424
@RunWith(RobolectricGradleTestRunner.class)
25-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
25+
@Config(constants = BuildConfig.class)
2626
public class DiskUsageTest {
2727

2828
private File cacheFolder;

test/src/test/java/com/danikula/videocache/file/FileCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Alexey Danilov ([email protected]).
2929
*/
3030
@RunWith(RobolectricGradleTestRunner.class)
31-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
31+
@Config(constants = BuildConfig.class)
3232
public class FileCacheTest {
3333

3434
@Test

test/src/test/java/com/danikula/videocache/file/FilesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Alexey Danilov ([email protected]).
1919
*/
2020
@RunWith(RobolectricGradleTestRunner.class)
21-
@Config(constants = BuildConfig.class, emulateSdk = BuildConfig.MIN_SDK_VERSION)
21+
@Config(constants = BuildConfig.class)
2222
public class FilesTest {
2323

2424
@Test

0 commit comments

Comments
 (0)