Tidy up warnings in the code.

pdvrieze · Jun 14, 2024 · 6e7281e · 6e7281e
1 parent 12ab73b
commit 6e7281e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/core/base/src/commonTest/kotlin/nl/adaptivity/xmlutil/TestXmlWriter.kt b/core/base/src/commonTest/kotlin/nl/adaptivity/xmlutil/TestXmlWriter.kt
@@ -238,7 +238,7 @@ class TestXmlWriter {
             }
         }
         xmlStreaming.newWriter(builder, false).use { out ->
-            val input = DomReader(dw.target)
+            val input = xmlStreaming.newReader(dw.target)
             while (input.hasNext()) {
                 input.next()
                 if (! input.eventType.isIgnorable)

diff --git a/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/MapTest.kt b/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/MapTest.kt
@@ -73,7 +73,7 @@ class MapTest : PlatformTestBase<MapTest.ListContainer>(
         assertEquals(value, xml.decodeFromString(serializer, serialized))
     }
 
-    @OptIn(ExperimentalXmlUtilApi::class)
+    @OptIn(ExperimentalXmlUtilApi::class, ExperimentalSerializationApi::class)
     @Test
     fun testSerializeNotEludingList() {
         val xml = baseXmlFormat.copy {

diff --git a/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/OptionalBooleanTest.kt b/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/OptionalBooleanTest.kt
@@ -71,12 +71,14 @@ class OptionalBooleanTest : PlatformTestBase<OptionalBooleanTest.Location>(
         var ignoredDescriptor: XmlDescriptor? = null
         var ignoredCandidates: Collection<Any>? = null
         val xml = XML {
-            unknownChildHandler = UnknownChildHandler { _, inputKind, descriptor, name, candidates ->
-                ignoredName = name
-                ignoredKind = inputKind
-                ignoredDescriptor = descriptor
-                ignoredCandidates = candidates
-                emptyList()
+            defaultPolicy {
+                unknownChildHandler = UnknownChildHandler { _, inputKind, descriptor, name, candidates ->
+                    ignoredName = name
+                    ignoredKind = inputKind
+                    ignoredDescriptor = descriptor
+                    ignoredCandidates = candidates
+                    emptyList()
+                }
             }
         }
         assertEquals(value, xml.decodeFromString(serializer, noisyXml))

diff --git a/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/RecoveryTest.kt b/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/RecoveryTest.kt
@@ -62,7 +62,7 @@ class RecoveryTest {
     @Test
     fun testDeserializeRecoveringWithParser() {
         val xml = XML {
-            policy = object: DefaultXmlSerializationPolicy(true) {
+            policy = object: DefaultXmlSerializationPolicy(Builder().apply { pedantic = true }) {
                 @ExperimentalXmlUtilApi
                 override fun handleUnknownContentRecovering(
                     input: XmlReader,

diff --git a/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/SimpleDataTest.kt b/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/SimpleDataTest.kt
@@ -65,10 +65,12 @@ class SimpleDataTest : PlatformTestBase<SimpleDataTest.Address>(
         var ignoredName: QName? = null
         var ignoredKind: InputKind? = null
         val xml = XML {
-            unknownChildHandler = UnknownChildHandler { _, inputKind, _, name, _ ->
-                ignoredName = name
-                ignoredKind = inputKind
-                emptyList()
+            defaultPolicy {
+                unknownChildHandler = UnknownChildHandler { _, inputKind, _, name, _ ->
+                    ignoredName = name
+                    ignoredKind = inputKind
+                    emptyList()
+                }
             }
         }
         assertEquals(value, xml.decodeFromString(serializer, unknownValues))

diff --git a/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/SmallTests.kt b/serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/SmallTests.kt
@@ -59,7 +59,7 @@ class SmallTests {
                 indent = 4
                 xmlDeclMode = XmlDeclMode.Charset
                 xmlVersion = XmlVersion.XML10
-                policy = object : DefaultXmlSerializationPolicy(pedantic = true, throwOnRepeatedElement = true) {
+                policy = object : DefaultXmlSerializationPolicy(Builder().apply { pedantic = true; throwOnRepeatedElement = true }) {
                     override fun effectiveOutputKind(
                         serializerParent: SafeParentInfo,
                         tagParent: SafeParentInfo,