Switch primitives and retrofit packages to kotlin-test

sipgate · Apr 24, 2024 · 198d87d · 198d87d
1 parent 960e821
commit 198d87d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/BooleanExtTest.kt b/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/BooleanExtTest.kt
@@ -1,7 +1,8 @@
 package de.sipgate.dachlatten.primitives
 
-import org.junit.jupiter.api.Assertions.*
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class BooleanExtTest {
     @Test

diff --git a/...ten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/BooleanNullableExtTest.kt b/...ten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/BooleanNullableExtTest.kt
@@ -1,8 +1,8 @@
 package de.sipgate.dachlatten.primitives
 
-import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class BooleanNullableExtTest {
     @Test
@@ -39,4 +39,4 @@ class BooleanNullableExtTest {
         val emptyList = arrayOf<Boolean?>()
         assertTrue(emptyList.allTrue)
     }
-}
+}
diff --git a/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/EnumExtTest.kt b/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/EnumExtTest.kt
@@ -3,9 +3,9 @@ package de.sipgate.dachlatten.primitives
 import de.sipgate.dachlatten.primitives.EnumExtTest.SomeValues.A
 import de.sipgate.dachlatten.primitives.EnumExtTest.SomeValues.B
 import de.sipgate.dachlatten.primitives.EnumExtTest.SomeValues.C
-import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class EnumExtTest {
     enum class SomeValues {

diff --git a/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/StringExtTest.kt b/dachlatten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/StringExtTest.kt
@@ -1,7 +1,7 @@
 package de.sipgate.dachlatten.primitives
 
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class StringExtTest {
     @Test

diff --git a/...atten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/filter/PredicateTest.kt b/...atten-primitives/src/test/kotlin/de/sipgate/dachlatten/primitives/filter/PredicateTest.kt
@@ -1,9 +1,9 @@
 package de.sipgate.dachlatten.primitives.filter
 
 import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class PredicateTest {
     private val truePredicate = object : Predicate<Any> {

diff --git a/...st/kotlin/de/sipgate/dachlatten/retrofit/KotlinSerializationConverterFactoryStringTest.kt b/...st/kotlin/de/sipgate/dachlatten/retrofit/KotlinSerializationConverterFactoryStringTest.kt
@@ -6,9 +6,8 @@ import kotlinx.serialization.json.Json
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import mockwebserver3.junit5.internal.MockWebServerExtension
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.ExperimentalOkHttpApi
-import org.junit.jupiter.api.Assertions.assertEquals
+import okhttp3.MediaType.Companion.toMediaType
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -17,6 +16,7 @@ import retrofit2.Retrofit
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
+import kotlin.test.assertEquals
 
 @OptIn(ExperimentalSerializationApi::class, ExperimentalOkHttpApi::class)
 @ExtendWith(MockWebServerExtension::class)