Uncomment all stale tests that depended on Kotlin upgrade (#2147)

Author: sandwwraith

core/commonTest/src/kotlinx/serialization/CachedSerializersTest.kt

@@ -5,7 +5,7 @@
 package kotlinx.serialization
 
 import kotlinx.serialization.modules.*
-import kotlinx.serialization.test.noJsLegacy
+import kotlinx.serialization.test.*
 import kotlin.test.*
 import kotlin.time.*
 
@@ -65,8 +65,7 @@ class CachedSerializersTest {
 
     @OptIn(ExperimentalTime::class)
     @Test
-    @Ignore // TODO: Unignore after 1.8.0 update
-    fun testSerializersAreIntrinsified() {
+    fun testSerializersAreIntrinsified() = jvmOnly {
         val m = SerializersModule {  }
         val direct = measureTime {
             Object.serializer()

formats/json-tests/commonTest/src/kotlinx/serialization/features/DurationTest.kt

@@ -11,17 +11,15 @@ import kotlin.time.Duration
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
-
 class DurationTest : JsonTestBase() {
-// TODO uncomment when Kotlin 1.7.20 is released
-//    @Serializable
-//    data class DurationHolder(val duration: Duration)
-//    @Test
-//    fun testDuration() {
-//        assertJsonFormAndRestored(
-//            DurationHolder.serializer(),
-//            DurationHolder(1000.toDuration(DurationUnit.SECONDS)),
-//            """{"duration":"PT16M40S"}"""
-//        )
-//    }
+    @Serializable
+    data class DurationHolder(val duration: Duration)
+    @Test
+    fun testDuration() {
+        assertJsonFormAndRestored(
+            DurationHolder.serializer(),
+            DurationHolder(1000.toDuration(DurationUnit.SECONDS)),
+            """{"duration":"PT16M40S"}"""
+        )
+    }
 }

formats/json-tests/commonTest/src/kotlinx/serialization/features/inline/UnsignedIntegersTest.kt

@@ -21,36 +21,36 @@ class UnsignedIntegersTest : JsonTestBase() {
         val double: Double
     )
 
-//    TODO uncomment when Kotlin 1.8.0 is released
-//    @Serializable
-//    data class UnsignedArrays(
-//        val uByte: UByteArray,
-//        val uShort: UShortArray,
-//        val uInt: UIntArray,
-//        val uLong: ULongArray
-//    ) {
-//        override fun equals(other: Any?): Boolean {
-//            if (this === other) return true
-//            if (other == null || this::class != other::class) return false
-//
-//            other as UnsignedArrays
-//
-//            if (!uByte.contentEquals(other.uByte)) return false
-//            if (!uShort.contentEquals(other.uShort)) return false
-//            if (!uInt.contentEquals(other.uInt)) return false
-//            if (!uLong.contentEquals(other.uLong)) return false
-//
-//            return true
-//        }
-//
-//        override fun hashCode(): Int {
-//            var result = uByte.contentHashCode()
-//            result = 31 * result + uShort.contentHashCode()
-//            result = 31 * result + uInt.contentHashCode()
-//            result = 31 * result + uLong.contentHashCode()
-//            return result
-//        }
-//    }
+    @ExperimentalUnsignedTypes
+    @Serializable
+    data class UnsignedArrays(
+        val uByte: UByteArray,
+        val uShort: UShortArray,
+        val uInt: UIntArray,
+        val uLong: ULongArray
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || this::class != other::class) return false
+
+            other as UnsignedArrays
+
+            if (!uByte.contentEquals(other.uByte)) return false
+            if (!uShort.contentEquals(other.uShort)) return false
+            if (!uInt.contentEquals(other.uInt)) return false
+            if (!uLong.contentEquals(other.uLong)) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = uByte.contentHashCode()
+            result = 31 * result + uShort.contentHashCode()
+            result = 31 * result + uInt.contentHashCode()
+            result = 31 * result + uLong.contentHashCode()
+            return result
+        }
+    }
 
     @Serializable
     data class UnsignedWithoutLong(val uInt: UInt, val uByte: UByte, val uShort: UShort)
@@ -123,18 +123,18 @@ class UnsignedIntegersTest : JsonTestBase() {
         ) { l, r -> l.contentEquals(r) }
     }
 
-//    TODO uncomment when Kotlin 1.8.0 is released
-//    @OptIn(ExperimentalUnsignedTypes::class)
-//    fun testArrays() {
-//        val data = UnsignedArrays(
-//            ubyteArrayOf(1U, 220U),
-//            ushortArrayOf(1U, 65000U),
-//            uintArrayOf(1U, 2147483657U),
-//            ulongArrayOf(1U, 9223372036854775817U)
-//        )
-//        val json = """{"uByte":[1,220],uShort:[1,65000],uInt:[1,2147483657],uLong:[1,9223372036854775817]}"""
-//
-//        assertJsonFormAndRestored(UnsignedArrays.serializer(), data, json)
-//    }
+    @OptIn(ExperimentalUnsignedTypes::class)
+    @Test
+    fun testArrays() {
+        val data = UnsignedArrays(
+            ubyteArrayOf(1U, 220U),
+            ushortArrayOf(1U, 65000U),
+            uintArrayOf(1U, 2147483657U),
+            ulongArrayOf(1U, 9223372036854775817U)
+        )
+        val json = """{"uByte":[1,220],"uShort":[1,65000],"uInt":[1,2147483657],"uLong":[1,9223372036854775817]}"""
+
+        assertJsonFormAndRestored(UnsignedArrays.serializer(), data, json)
+    }
 
 }

formats/json-tests/jvmTest/src/kotlinx/serialization/features/SerializerByTypeTest.kt

@@ -287,7 +287,6 @@ class SerializerByTypeTest {
 
     @OptIn(ExperimentalTime::class)
     @Test
-    @Ignore // TODO: Unignore after 1.8.0 update
     fun testSerializersAreIntrinsified() {
         val direct = measureTime {
             Json.encodeToString(IntData.serializer(), IntData(10))