From 39dcd04750eef1581d0bdde394371ef9ca2808b9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 24 Aug 2020 17:10:49 -0300
Subject: Get rid of Jackson and only use multi-platform serialization

---
 .../test/java/net/taler/common/ContractTermsTest.kt | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'taler-kotlin-android/src/test/java')

diff --git a/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt b/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt
index 0e410ca..3a2cdb4 100644
--- a/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt
+++ b/taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt
@@ -16,28 +16,21 @@
 
 package net.taler.common
 
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
-import com.fasterxml.jackson.module.kotlin.readValue
-import net.taler.lib.common.Amount
-import net.taler.lib.common.AmountMixin
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import net.taler.lib.common.Timestamp
-import net.taler.lib.common.TimestampMixin
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class ContractTermsTest {
 
-    private val mapper = ObjectMapper()
-        .registerModule(KotlinModule())
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-        .addMixIn(Amount::class.java, AmountMixin::class.java)
-        .addMixIn(Timestamp::class.java, TimestampMixin::class.java)
+    private val json = Json {
+        ignoreUnknownKeys = true
+    }
 
     @Test
     fun test() {
-        val json = """
+        val jsonStr = """
             {
               "amount":"TESTKUDOS:0.5",
               "extra":{
@@ -72,7 +65,7 @@ class ContractTermsTest {
                 "nonce":"FK8ZKJRV6VX6YFAG4CDSC6W0DWD084Q09DP81ANF30GRFQYM2KPG"
               }
         """.trimIndent()
-        val contractTerms: ContractTerms = mapper.readValue(json)
+        val contractTerms: ContractTerms = json.decodeFromString(jsonStr)
         assertEquals("Essay: 1. The Free Software Definition", contractTerms.summary)
         assertEquals(Timestamp.never(), contractTerms.refundDeadline)
     }
-- 
cgit v1.2.3