summaryrefslogtreecommitdiff
path: root/taler-kotlin-android/src/test/java/net/taler
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-08-24 17:10:49 -0300
committerTorsten Grote <t@grobox.de>2020-08-24 17:10:49 -0300
commit39dcd04750eef1581d0bdde394371ef9ca2808b9 (patch)
treea33a9c9f2683d911ff4fd2b691d91f15d117ce39 /taler-kotlin-android/src/test/java/net/taler
parent35bc91761ad1f8336f331c6b04cff8bf4d9ae064 (diff)
downloadtaler-android-39dcd04750eef1581d0bdde394371ef9ca2808b9.tar.gz
taler-android-39dcd04750eef1581d0bdde394371ef9ca2808b9.tar.bz2
taler-android-39dcd04750eef1581d0bdde394371ef9ca2808b9.zip
Get rid of Jackson and only use multi-platform serialization
Diffstat (limited to 'taler-kotlin-android/src/test/java/net/taler')
-rw-r--r--taler-kotlin-android/src/test/java/net/taler/common/ContractTermsTest.kt21
1 files changed, 7 insertions, 14 deletions
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)
}