fix: robolectrics Tests

irgaly · irgaly · commit b2d309a94652 · 2021-08-06T16:30:54.000+09:00
diff --git a/buildSrc/src/main/java/dependencies/Depends.kt b/buildSrc/src/main/java/dependencies/Depends.kt
@@ -8,10 +8,10 @@ object Depends {
     }
 
     object Test {
-        const val junit = "junit:junit:4.12"
-        const val testRunner = "androidx.test:runner:1.1.0"
+        const val junit = "junit:junit:4.13.2"
+        const val testRunner = "androidx.test:runner:1.4.0"
         const val mockitoKotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0"
-        const val robolectric = "org.robolectric:robolectric:3.5.1"
+        const val robolectric = "org.robolectric:robolectric:4.6.1"
 
         object Espresso {
             const val core = "androidx.test.espresso:espresso-core:3.1.0-alpha4"
diff --git a/example/src/test/java/co/kyash/vtl/example/testing/RxImmediateSchedulerRule.kt b/example/src/test/java/co/kyash/vtl/example/testing/RxImmediateSchedulerRule.kt
@@ -1,7 +1,7 @@
 package co.kyash.vtl.example.testing
 
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
@@ -26,4 +26,4 @@ class RxImmediateSchedulerRule : TestRule {
         }
     }
 
-}
+}
diff --git a/example/src/test/java/co/kyash/vtl/example/validators/MaterialDesignColorsValidatorTest.kt b/example/src/test/java/co/kyash/vtl/example/validators/MaterialDesignColorsValidatorTest.kt
@@ -6,7 +6,7 @@ import co.kyash.vtl.example.testing.RxImmediateSchedulerRule
 import co.kyash.vtl.validators.VtlValidator
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
@@ -67,8 +67,10 @@ class MaterialDesignColorsValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError {
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/library/build.gradle b/library/build.gradle
@@ -30,6 +30,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+    }
 }
 
 afterEvaluate {
diff --git a/library/src/test/java/co/kyash/vtl/testing/RxImmediateSchedulerRule.kt b/library/src/test/java/co/kyash/vtl/testing/RxImmediateSchedulerRule.kt
@@ -1,7 +1,7 @@
 package co.kyash.vtl.testing
 
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
@@ -26,4 +26,4 @@ class RxImmediateSchedulerRule : TestRule {
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/AlphabetOnlyValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/AlphabetOnlyValidatorTest.kt
@@ -68,8 +68,10 @@ class AlphabetOnlyValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/AsciiOnlyValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/AsciiOnlyValidatorTest.kt
@@ -65,8 +65,10 @@ class AsciiOnlyValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/EmailValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/EmailValidatorTest.kt
@@ -61,8 +61,10 @@ class EmailValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/HiraganaOnlyValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/HiraganaOnlyValidatorTest.kt
@@ -62,8 +62,10 @@ class HiraganaOnlyValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/KatakanaOnlyValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/KatakanaOnlyValidatorTest.kt
@@ -62,8 +62,10 @@ class KatakanaOnlyValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/MinLengthValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/MinLengthValidatorTest.kt
@@ -64,8 +64,10 @@ class MinLengthValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/NoSpecialCharacterValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/NoSpecialCharacterValidatorTest.kt
@@ -71,7 +71,9 @@ class NoSpecialCharacterValidatorTest(
         if (errorMessage == null) {
             validator.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            validator.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            validator.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 }
diff --git a/library/src/test/java/co/kyash/vtl/validators/NumberOnlyValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/NumberOnlyValidatorTest.kt
@@ -59,8 +59,10 @@ class NumberOnlyValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}
diff --git a/library/src/test/java/co/kyash/vtl/validators/RequiredValidatorTest.kt b/library/src/test/java/co/kyash/vtl/validators/RequiredValidatorTest.kt
@@ -63,8 +63,10 @@ class RequiredValidatorTest(
         if (errorMessage == null) {
             subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()
         } else {
-            subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)
+            subject.validateAsCompletable(context, text).test().assertError { it ->
+                it.message == errorMessage
+            }
         }
     }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package co.kyash.vtl.example.testing`
`2`	`2`
`3`		`-import io.reactivex.plugins.RxJavaPlugins`
`4`		`-import io.reactivex.schedulers.Schedulers`
	`3`	`+import io.reactivex.rxjava3.plugins.RxJavaPlugins`
	`4`	`+import io.reactivex.rxjava3.schedulers.Schedulers`
`5`	`5`	`import org.junit.rules.TestRule`
`6`	`6`	`import org.junit.runner.Description`
`7`	`7`	`import org.junit.runners.model.Statement`
`@@ -26,4 +26,4 @@ class RxImmediateSchedulerRule : TestRule {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-}`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`org.gradle.jvmargs=-Xmx1536m`
`2`	`2`	`android.useAndroidX=true`
`3`		`-android.enableJetifier=true`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ android {`
`30`	`30`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ testOptions {`
	`35`	`+ unitTests.includeAndroidResources = true`
	`36`	`+ }`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`afterEvaluate {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package co.kyash.vtl.testing`
`2`	`2`
`3`		`-import io.reactivex.plugins.RxJavaPlugins`
`4`		`-import io.reactivex.schedulers.Schedulers`
	`3`	`+import io.reactivex.rxjava3.plugins.RxJavaPlugins`
	`4`	`+import io.reactivex.rxjava3.schedulers.Schedulers`
`5`	`5`	`import org.junit.rules.TestRule`
`6`	`6`	`import org.junit.runner.Description`
`7`	`7`	`import org.junit.runners.model.Statement`
`@@ -26,4 +26,4 @@ class RxImmediateSchedulerRule : TestRule {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-}`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,10 @@ class AlphabetOnlyValidatorTest(`
`68`	`68`	`if (errorMessage == null) {`
`69`	`69`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`70`	`70`	`} else {`
`71`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`71`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`72`	`+ it.message == errorMessage`
	`73`	`+ }`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`
`75`		`-}`
	`77`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,10 @@ class AsciiOnlyValidatorTest(`
`65`	`65`	`if (errorMessage == null) {`
`66`	`66`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`67`	`67`	`} else {`
`68`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`68`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`69`	`+ it.message == errorMessage`
	`70`	`+ }`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`
`72`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,10 @@ class EmailValidatorTest(`
`61`	`61`	`if (errorMessage == null) {`
`62`	`62`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`63`	`63`	`} else {`
`64`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`64`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`65`	`+ it.message == errorMessage`
	`66`	`+ }`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`
`68`		`-}`
	`70`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ class HiraganaOnlyValidatorTest(`
`62`	`62`	`if (errorMessage == null) {`
`63`	`63`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`64`	`64`	`} else {`
`65`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`65`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`66`	`+ it.message == errorMessage`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
`69`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ class KatakanaOnlyValidatorTest(`
`62`	`62`	`if (errorMessage == null) {`
`63`	`63`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`64`	`64`	`} else {`
`65`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`65`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`66`	`+ it.message == errorMessage`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
`69`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,10 @@ class MinLengthValidatorTest(`
`64`	`64`	`if (errorMessage == null) {`
`65`	`65`	`subject.validateAsCompletable(context, text).test().assertNoErrors().assertComplete()`
`66`	`66`	`} else {`
`67`		`- subject.validateAsCompletable(context, text).test().assertErrorMessage(errorMessage)`
	`67`	`+ subject.validateAsCompletable(context, text).test().assertError { it ->`
	`68`	`+ it.message == errorMessage`
	`69`	`+ }`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`71`		`-}`
	`73`	`+}`