Test against API 30. (coil-kt#452)

* Test against API 30. * Use google_apis target. * Update asset. * Fix test. * Increase API level. * Sleep a little longer.
stfnt · Jul 7, 2020 · be9edd9 · be9edd9
1 parent 32fad36
commit be9edd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                api-level: [15, 19, 21, 25, 29]
+                api-level: [15, 19, 21, 25, 30]
         steps:
             - uses: actions/checkout@v2
             - uses: gradle/wrapper-validation-action@v1
@@ -74,6 +74,7 @@ jobs:
                   api-level: ${{ matrix.api-level }}
                   arch: x86
                   script: ./gradlew connectedDebugAndroidTest
+                  target: google_apis
 
     deploy-snapshot:
         name: Deploy snapshot

diff --git a/coil-base/src/androidTest/java/coil/fetch/ContentUriFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/ContentUriFetcherTest.kt
@@ -115,7 +115,7 @@ class ContentUriFetcherTest {
         }
 
         // Wait for the display image to be parsed by the system.
-        Thread.sleep(1000)
+        Thread.sleep(2000)
 
         return id
     }

diff --git a/coil-base/src/androidTest/java/coil/fetch/ResourceUriFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/ResourceUriFetcherTest.kt
@@ -67,8 +67,9 @@ class ResourceUriFetcherTest {
 
     @Test
     fun externalPackageRasterDrawable() {
-        // https://android.googlesource.com/platform/packages/apps/Settings/+/master/res/drawable-xhdpi/ic_power_system.png
-        val rawUri = "$SCHEME_ANDROID_RESOURCE://com.android.settings/drawable/ic_power_system".toUri()
+        // https://android.googlesource.com/platform/packages/apps/Settings/+/master/res/drawable-xhdpi
+        val resource = if (SDK_INT >= 23) "msg_bubble_incoming" else "ic_power_system"
+        val rawUri = "$SCHEME_ANDROID_RESOURCE://com.android.settings/drawable/$resource".toUri()
         val uri = ResourceUriMapper(context).map(rawUri)
 
         assertTrue(fetcher.handles(uri))