Replace hamcrest with assertj. ChaptersSubject now uses only one observeOn.

This commit is contained in:
inorichi
2016-01-06 16:08:15 +01:00
parent dd833852ad
commit 73aa93773c
4 changed files with 26 additions and 34 deletions

View File

@@ -76,7 +76,6 @@ android {
dependencies {
final SUPPORT_LIBRARY_VERSION = '23.1.1'
final DAGGER_VERSION = '2.0.2'
final HAMCREST_VERSION = '1.3'
final MOCKITO_VERSION = '1.10.19'
final STORIO_VERSION = '1.7.0'
final ICEPICK_VERSION = '3.1.0'
@@ -128,9 +127,7 @@ dependencies {
}
testCompile 'junit:junit:4.12'
testCompile "org.hamcrest:hamcrest-core:$HAMCREST_VERSION"
testCompile "org.hamcrest:hamcrest-library:$HAMCREST_VERSION"
testCompile "org.hamcrest:hamcrest-integration:$HAMCREST_VERSION"
testCompile 'org.assertj:assertj-core:2.3.0'
testCompile "org.mockito:mockito-core:$MOCKITO_VERSION"
testCompile('org.robolectric:robolectric:3.0') {
exclude group: 'commons-logging', module: 'commons-logging'