fix tests

Author: adamint

build.gradle.kts

@@ -83,7 +83,7 @@ val dokkaJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
 kotlin {
     explicitApiWarning()
 
-    android {
+    androidTarget {
         compilations.all { kotlinOptions.jvmTarget = "1.8" }
 
         mavenPublication { setupPom(artifactId) }

settings.gradle.kts

@@ -34,4 +34,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = "spotify-web-api-kotlin"
+rootProject.name = "spotify-api-kotlin"

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/UserApi.kt

@@ -24,7 +24,7 @@ public open class UserApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
      *
      * @return All publicly-available information about the user
      */
-    public suspend fun getProfile(user: String): SpotifyPublicUser? = catch {
+    public suspend fun getProfile(user: String): SpotifyPublicUser? = catch(/* some incorrect user ids will return 500 */ catchInternalServerError = true) {
         get(endpointBuilder("/users/${UserUri(user).id.encodeUrl()}").toString())
             .toObject(SpotifyPublicUser.serializer(), api, json)
     }

src/commonMain/kotlin/com.adamratzman.spotify/utils/Utils.kt

@@ -17,7 +17,7 @@ internal expect fun formatDate(date: Long): String
 
 internal fun jsonMap(vararg pairs: Pair<String, JsonElement>) = pairs.toMap().toMutableMap()
 
-internal suspend inline fun <T> catch(crossinline function: suspend () -> T): T? {
+internal suspend inline fun <T> catch(catchInternalServerError: Boolean = false, crossinline function: suspend () -> T): T? {
     return try {
         function()
     } catch (e: SpotifyException.BadRequestException) {

src/commonTest/kotlin/com.adamratzman/spotify/AbstractTest.kt

@@ -16,6 +16,7 @@ abstract class AbstractTest<T : GenericSpotifyApi> {
 
         val api = buildSpotifyApi(testClassQualifiedName, testName)
         if (api != null && api is Z) {
+            api.spotifyApiOptions.retryOnInternalServerErrorTimes = 10
             api.spotifyApiOptions.httpResponseSubscriber = { request, response ->
                 getResponseCacher()?.cacheResponse(
                     testClassQualifiedName,

src/commonTest/kotlin/com.adamratzman/spotify/Common.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
 expect fun areLivePkceTestsEnabled(): Boolean
 expect fun arePlayerTestsEnabled(): Boolean
@@ -41,8 +42,7 @@ suspend inline fun <reified T : Throwable> assertFailsWithSuspend(crossinline bl
     }
 }
 
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> runTestOnDefaultDispatcher(block: suspend CoroutineScope.() -> T): TestResult = runTest {
+fun <T> runTestOnDefaultDispatcher(block: suspend CoroutineScope.() -> T): TestResult = runTest(timeout = 60.seconds) {
     withContext(Dispatchers.Default) {
         block()
     }

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientEpisodeApiTest.kt

@@ -30,10 +30,8 @@ class ClientEpisodeApiTest : AbstractTest<SpotifyClientApi>() {
         buildApi<SpotifyClientApi>(::testGetEpisodes.name)
         if (!isApiInitialized()) return@runTestOnDefaultDispatcher
 
-        assertFailsWith<BadRequestException> { api.episodes.getEpisodes("hi", "dad") }
-        assertFailsWith<BadRequestException> {
-            api.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j").map { it?.name }
-        }
+        assertEquals(listOf(null, null), api.episodes.getEpisodes("hi", "dad"))
+        assertEquals(null, api.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j")[1])
         assertEquals(
             listOf("The Great Inflation (Classic)"),
             api.episodes.getEpisodes("3lMZTE81Pbrp0U12WZe27l").map { it?.name }

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientShowApiTest.kt

@@ -23,6 +23,7 @@ class ClientShowApiTest : AbstractTest<SpotifyClientApi>() {
 
         assertNull(api.shows.getShow("invalid-show"))
         assertEquals("Freakonomics Radio", api.shows.getShow("spotify:show:6z4NLXyHPga1UmSJsPK7G1")?.name)
+        assertEquals("Freakonomics Radio", api.shows.getShow("spotify:show:6z4NLXyHPga1UmSJsPK7G1", Market.FROM_TOKEN)?.name)
     }
 
     @Test

src/commonTest/kotlin/com.adamratzman/spotify/pub/EpisodeApiTest.kt

@@ -10,10 +10,7 @@ import com.adamratzman.spotify.runTestOnDefaultDispatcher
 import com.adamratzman.spotify.utils.Market
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestResult
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-import kotlin.test.assertNull
+import kotlin.test.*
 
 class EpisodeApiTest : AbstractTest<GenericSpotifyApi>() {
     private val market = Market.US
@@ -33,10 +30,12 @@ class EpisodeApiTest : AbstractTest<GenericSpotifyApi>() {
     fun testGetEpisodes(): TestResult = runTestOnDefaultDispatcher {
         buildApi(::testGetEpisodes.name)
 
-        assertFailsWith<BadRequestException> { api.episodes.getEpisodes("hi", "dad", market = market) }
-        assertFailsWith<BadRequestException> {
-            api.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j", market = market).map { it?.name }
-        }
+        assertEquals(listOf(null, null),  api.episodes.getEpisodes("hi", "dad", market = market))
+
+        val firstResultNotNullSecondNull = api.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j", market = market).map { it?.name }
+        assertTrue(firstResultNotNullSecondNull[0] != null)
+        assertTrue(firstResultNotNullSecondNull[1] == null)
+
         assertEquals(
             listOf("The Great Inflation (Classic)"),
             api.episodes.getEpisodes("3lMZTE81Pbrp0U12WZe27l", market = market).map { it?.name }

src/commonTest/kotlin/com.adamratzman/spotify/pub/PublicArtistsApiTest.kt

@@ -69,6 +69,5 @@ class PublicArtistsApiTest : AbstractTest<GenericSpotifyApi>() {
         assertFailsWith<SpotifyException.BadRequestException> { api.artists.getArtistTopTracks("no") }
         assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW").isNotEmpty())
         assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW", Market.FR).isNotEmpty())
-        assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW", Market.FROM_TOKEN).isNotEmpty())
     }
 }