~move generic override test directly into kotlinx-serialization test suite

Author: sandwwraith

formats/json-tests/commonTest/src/kotlinx/serialization/GenericOverrideTest.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.serialization
+
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.json.*
+import kotlin.test.Test
+
+class GenericOverrideTest: JsonTestBase() {
+
+    @Serializable
+    sealed class TypedSealedClass<T>(val a: T) {
+        @Serializable
+        @SerialName("child")
+        data class Child(val y: Int) : TypedSealedClass<String>("10") {
+            override fun toString(): String = "Child($a, $y)"
+        }
+    }
+
+    @Test
+    fun testAinChildSerializesAsString() = parametrizedTest { mode ->
+        val encodedChild = """{"a":"10","y":42}"""
+        assertJsonFormAndRestored(TypedSealedClass.Child.serializer(), TypedSealedClass.Child(42), encodedChild)
+    }
+
+    @Test
+    fun testSerializeAsBaseClass() = parametrizedTest { mode ->
+        val encodedChild = """{"type":"child","a":"10","y":42}"""
+        assertJsonFormAndRestored(TypedSealedClass.serializer(String.serializer()), TypedSealedClass.Child(42), encodedChild)
+    }
+}

integration-test/src/commonMain/kotlin/sample/MultiFileHierarchyModuleA.kt

@@ -34,15 +34,6 @@ open class GenericBox<E> {
     var contents: Map<String, E>? = null
 }
 
-// From #1264
-@Serializable
-sealed class TypedSealedClass<T>(val a: T) {
-    @Serializable
-    class Child(val y: Int) : TypedSealedClass<String>("10") {
-        override fun toString(): String = "Child($a, $y)"
-    }
-}
-
 // From #KT-43910
 @Serializable
 open class ValidatableValue<T : Any, V: Any>(

integration-test/src/commonTest/kotlin/sample/MultiFileHierarchyTest.kt

@@ -75,14 +75,6 @@ class AbstractBaseTest {
         assertStringFormAndRestored("""{"b":"val b","a":"val a","c":"val c"}""", NotInConstructorTest(), NotInConstructorTest.serializer())
     }
 
-    @Test
-    fun testSimpleChild() {
-        val encodedChild = """{"a":"11","y":42}"""
-        val decodedChild = Json.decodeFromString<TypedSealedClass.Child>(encodedChild)
-        assertEquals("Child(11, 42)", decodedChild.toString())
-        assertEquals(encodedChild, Json.encodeToString(decodedChild))
-    }
-
     @Test
     fun testDoubleGeneric() {
         val email = Email<Int>().apply {