gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-android] branch master updated (1552f14 -> 489c480)


From: gnunet
Subject: [taler-taler-android] branch master updated (1552f14 -> 489c480)
Date: Mon, 13 Apr 2020 20:45:53 +0200

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository taler-android.

    from 1552f14  [wallet] move wallet-core library download into gradle task
     new 02a4a05  [wallet] prepare specifying wallet-core library version
     new 42079c0  [wallet] hide overhead from exchange fee structure if zero
     new e6229b3  [wallet] adapt to latest API breaking changes of wallet-core
     new 6e3e99e  [wallet] Fix HistoryEventTest and run unit tests in CI
     new 489c480  [common] run unit tests in CI

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitlab-ci.yml                                     |  1 +
 cashier/.gitlab-ci.yml                             |  2 +-
 merchant-terminal/.gitlab-ci.yml                   |  2 +-
 taler-kotlin-common/.gitlab-ci.yml                 | 11 ++++
 wallet/.gitlab-ci.yml                              |  2 +-
 wallet/build.gradle                                |  9 +--
 .../net/taler/wallet/history/HistoryAdapter.kt     |  2 +-
 .../java/net/taler/wallet/history/HistoryEvent.kt  | 11 ++--
 .../wallet/withdraw/SelectExchangeFragment.kt      | 11 +++-
 wallet/src/main/res/values/strings.xml             |  2 -
 .../net/taler/wallet/history/HistoryEventTest.kt   | 74 ++++++++++------------
 11 files changed, 69 insertions(+), 58 deletions(-)
 create mode 100644 taler-kotlin-common/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e51d33b..da3611e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ stages:
 include:
   - local: 'cashier/.gitlab-ci.yml'
   - local: 'merchant-terminal/.gitlab-ci.yml'
+  - local: 'taler-kotlin-common/.gitlab-ci.yml'
   - local: 'wallet/.gitlab-ci.yml'
 
 after_script:
diff --git a/cashier/.gitlab-ci.yml b/cashier/.gitlab-ci.yml
index e5f02ad..6a7baed 100644
--- a/cashier/.gitlab-ci.yml
+++ b/cashier/.gitlab-ci.yml
@@ -7,7 +7,7 @@ cashier_test:
       - cashier/**/*
       - taler-kotlin-common/**/*
       - build.gradle
-  script: ./gradlew :cashier:lint :cashier:assembleRelease
+  script: ./gradlew :cashier:check :cashier:assembleRelease
   artifacts:
     paths:
       - cashier/build/reports/lint-results.html
diff --git a/merchant-terminal/.gitlab-ci.yml b/merchant-terminal/.gitlab-ci.yml
index 76f25ad..034818c 100644
--- a/merchant-terminal/.gitlab-ci.yml
+++ b/merchant-terminal/.gitlab-ci.yml
@@ -5,7 +5,7 @@ merchant_test:
       - merchant-terminal/**/*
       - taler-kotlin-common/**/*
       - build.gradle
-  script: ./gradlew :merchant-terminal:lint :merchant-terminal:assembleRelease
+  script: ./gradlew :merchant-terminal:check :merchant-terminal:assembleRelease
   artifacts:
     paths:
       - merchant-terminal/build/reports/lint-results.html
diff --git a/taler-kotlin-common/.gitlab-ci.yml 
b/taler-kotlin-common/.gitlab-ci.yml
new file mode 100644
index 0000000..49d3e98
--- /dev/null
+++ b/taler-kotlin-common/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+taler_kotlin_common_test:
+  stage: test
+  only:
+    changes:
+      - taler-kotlin-common/**/*
+      - build.gradle
+  script: ./gradlew :taler-kotlin-common:check
+  artifacts:
+    paths:
+      - taler-kotlin-common/build/reports/lint-results.html
+    expire_in: 1 week
diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml
index bc7250b..75a4c20 100644
--- a/wallet/.gitlab-ci.yml
+++ b/wallet/.gitlab-ci.yml
@@ -5,7 +5,7 @@ wallet_test:
       - wallet/**/*
       - taler-kotlin-common/**/*
       - build.gradle
-  script: ./gradlew :wallet:lint :wallet:assembleRelease
+  script: ./gradlew :wallet:check :wallet:assembleRelease
   artifacts:
     paths:
       - wallet/build/reports/lint-results.html
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 0a4ad69..3d51477 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -23,6 +23,8 @@ plugins {
     id "de.undercouch.download"
 }
 
+def walletCoreVersion = "taler-wallet-android.js"
+
 android {
     compileSdkVersion 29
     //noinspection GradleDependency
@@ -90,11 +92,10 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
-def walletLibraryDir = 'src/main/assets'
-def walletLibraryFile = walletLibraryDir + '/taler-wallet-android.js'
+def walletLibraryDir = "src/main/assets"
 task downloadWalletLibrary(type: Download) {
-    src 
"https://git.taler.net/wallet-android.git/plain/taler-wallet-android.js?h=binary-deps";
-    dest walletLibraryFile
+    src 
"https://git.taler.net/wallet-android.git/plain/${walletCoreVersion}?h=binary-deps";
+    dest "${walletLibraryDir}/taler-wallet-android.js"
     onlyIfModified true
     doFirst {
         new File(walletLibraryDir).mkdirs()
diff --git a/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt 
b/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
index ede55df..b9770fb 100644
--- a/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/history/HistoryAdapter.kt
@@ -99,7 +99,7 @@ internal class HistoryAdapter(
             info.text = when (event) {
                 is ExchangeAddedEvent -> cleanExchange(event.exchangeBaseUrl)
                 is ExchangeUpdatedEvent -> cleanExchange(event.exchangeBaseUrl)
-                is ReserveBalanceUpdatedEvent -> 
event.amountReserveBalance.toString()
+                is ReserveBalanceUpdatedEvent -> 
event.reserveBalance.toString()
                 is HistoryPaymentSentEvent -> event.orderShortInfo.summary
                 is HistoryOrderAcceptedEvent -> event.orderShortInfo.summary
                 is HistoryOrderRefusedEvent -> event.orderShortInfo.summary
diff --git a/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt 
b/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
index 50a973f..af017ed 100644
--- a/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
+++ b/wallet/src/main/java/net/taler/wallet/history/HistoryEvent.kt
@@ -175,7 +175,6 @@ class ExchangeUpdatedEvent(
 @JsonTypeName("reserve-balance-updated")
 class ReserveBalanceUpdatedEvent(
     timestamp: Timestamp,
-    val newHistoryTransactions: List<ReserveTransaction>,
     /**
      * Condensed information about the reserve.
      */
@@ -183,12 +182,16 @@ class ReserveBalanceUpdatedEvent(
     /**
      * Amount currently left in the reserve.
      */
-    val amountReserveBalance: Amount,
+    val reserveBalance: Amount,
     /**
      * Amount we expected to be in the reserve at that time,
      * considering ongoing withdrawals from that reserve.
      */
-    val amountExpected: Amount
+    val reserveAwaitedAmount: Amount,
+    /**
+     * Amount that hasn't been withdrawn yet.
+     */
+    val reserveUnclaimedAmount: Amount
 ) : HistoryEvent(timestamp) {
     override val title = R.string.history_event_reserve_balance_updated
 }
@@ -204,7 +207,7 @@ class HistoryWithdrawnEvent(
      * Unique identifier for the withdrawal session, can be used to
      * query more detailed information from the wallet.
      */
-    val withdrawSessionId: String,
+    val withdrawalGroupId: String,
     val withdrawalSource: WithdrawalSource,
     /**
      * Amount that has been subtracted from the reserve's balance
diff --git 
a/wallet/src/main/java/net/taler/wallet/withdraw/SelectExchangeFragment.kt 
b/wallet/src/main/java/net/taler/wallet/withdraw/SelectExchangeFragment.kt
index 78eba53..1e7ee3a 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/SelectExchangeFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/SelectExchangeFragment.kt
@@ -19,6 +19,7 @@ package net.taler.wallet.withdraw
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat.getColor
@@ -49,8 +50,14 @@ class SelectExchangeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val fees = withdrawManager.exchangeFees ?: throw 
IllegalStateException()
-        withdrawFeeView.setAmount(fees.withdrawFee)
-        overheadView.setAmount(fees.overhead)
+        if (fees.withdrawFee.isZero()) {
+            withdrawFeeLabel.visibility = GONE
+            withdrawFeeView.visibility = GONE
+        } else withdrawFeeView.setAmount(fees.withdrawFee)
+        if (fees.overhead.isZero()) {
+            overheadLabel.visibility = GONE
+            overheadView.visibility = GONE
+        } else overheadView.setAmount(fees.overhead)
         expirationView.text = 
fees.earliestDepositExpiration.ms.toRelativeTime(requireContext())
         coinFeesList.adapter = CoinFeeAdapter(fees.coinFees)
         wireFeesList.adapter = WireFeeAdapter(fees.wireFees)
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index 8cbecb9..357aedc 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -47,7 +47,6 @@
     <string name="balances_empty_state">There is no digital cash in your 
wallet.\n\nYou can get test money from the demo 
bank:\n\nhttps://bank.demo.taler.net</string>
 
     <string name="history_title">History</string>
-    <string name="history_fee_label">Fee:</string>
     <string name="history_show_all">Show All</string>
     <string name="history_reload">Reload History</string>
     <string name="history_empty">The wallet history is empty</string>
@@ -127,7 +126,6 @@
 
     <string name="settings_version">Version Information</string>
     <string name="exchange_tos_accept">Accept Terms of Service</string>
-    <string name="exchange_tos_button_continue">Continue</string>
     <string name="settings_backups">Backups</string>
     <string name="settings_export_to_file">Export wallet to file</string>
     <string name="settings_import_from_file">Import from file</string>
diff --git a/wallet/src/test/java/net/taler/wallet/history/HistoryEventTest.kt 
b/wallet/src/test/java/net/taler/wallet/history/HistoryEventTest.kt
index c9fda3c..6b8c41a 100644
--- a/wallet/src/test/java/net/taler/wallet/history/HistoryEventTest.kt
+++ b/wallet/src/test/java/net/taler/wallet/history/HistoryEventTest.kt
@@ -19,6 +19,7 @@ package net.taler.wallet.history
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.fasterxml.jackson.module.kotlin.readValue
+import net.taler.common.Amount
 import net.taler.wallet.history.RefreshReason.PAY
 import net.taler.wallet.history.ReserveType.MANUAL
 import org.junit.Assert.assertEquals
@@ -36,7 +37,7 @@ class HistoryEventTest {
         proposalId = "EP5MH4R5C9RMNA06YS1QGEJ3EY682PY8R1SGRFRP74EV735N3ATG",
         orderId = "2019.364-01RAQ68DQ7AWR",
         merchantBaseUrl = 
"https://backend.demo.taler.net/public/instances/FSF/";,
-        amount = "KUDOS:0.5",
+        amount = Amount.fromJSONString("KUDOS:0.5"),
         summary = "Essay: Foreword"
     )
 
@@ -96,22 +97,12 @@ class HistoryEventTest {
         val json = """{
             "type": "reserve-balance-updated",
             "eventId": 
"reserve-balance-updated;K0H10Q6HB9WH0CKHQQMNH5C6GA7A9AR1E2XSS9G1KG3ZXMBVT26G",
-            "amountExpected": "TESTKUDOS:23",
-            "amountReserveBalance": "TESTKUDOS:10",
+            "reserveAwaitedAmount": "TESTKUDOS:23",
+            "reserveUnclaimedAmount": "TESTKUDOS:0.01",
+            "reserveBalance": "TESTKUDOS:10",
             "timestamp": {
                 "t_ms": $timestamp
             },
-            "newHistoryTransactions": [
-                {
-                    "amount": "TESTKUDOS:10",
-                    "sender_account_url": 
"payto:\/\/x-taler-bank\/bank.test.taler.net\/894",
-                    "timestamp": {
-                        "t_ms": $timestamp
-                    },
-                    "wire_reference": "00000000004TR",
-                    "type": "DEPOSIT"
-                }
-            ],
             "reserveShortInfo": {
                 "exchangeBaseUrl": "https:\/\/exchange.test.taler.net\/",
                 "reserveCreationDetail": {
@@ -123,10 +114,9 @@ class HistoryEventTest {
         val event: ReserveBalanceUpdatedEvent = mapper.readValue(json)
 
         assertEquals(timestamp, event.timestamp.ms)
-        assertEquals("TESTKUDOS:23", event.amountExpected)
-        assertEquals("TESTKUDOS:10", event.amountReserveBalance)
-        assertEquals(1, event.newHistoryTransactions.size)
-        assertTrue(event.newHistoryTransactions[0] is 
ReserveDepositTransaction)
+        assertEquals("TESTKUDOS:23", event.reserveAwaitedAmount.toJSONString())
+        assertEquals("TESTKUDOS:10", event.reserveBalance.toJSONString())
+        assertEquals("TESTKUDOS:0.01", 
event.reserveUnclaimedAmount.toJSONString())
         assertEquals(exchangeBaseUrl, event.reserveShortInfo.exchangeBaseUrl)
     }
 
@@ -134,7 +124,7 @@ class HistoryEventTest {
     fun `test HistoryWithdrawnEvent`() {
         val json = """{
             "type": "withdrawn",
-            "withdrawSessionId": 
"974FT7JDNR20EQKNR21G1HV9PB6T5AZHYHX9NHR51Q30ZK3T10S0",
+            "withdrawalGroupId": 
"974FT7JDNR20EQKNR21G1HV9PB6T5AZHYHX9NHR51Q30ZK3T10S0",
             "eventId": 
"withdrawn;974FT7JDNR20EQKNR21G1HV9PB6T5AZHYHX9NHR51Q30ZK3T10S0",
             "amountWithdrawnEffective": "TESTKUDOS:9.8",
             "amountWithdrawnRaw": "TESTKUDOS:10",
@@ -151,10 +141,10 @@ class HistoryEventTest {
 
         assertEquals(
             "974FT7JDNR20EQKNR21G1HV9PB6T5AZHYHX9NHR51Q30ZK3T10S0",
-            event.withdrawSessionId
+            event.withdrawalGroupId
         )
-        assertEquals("TESTKUDOS:9.8", event.amountWithdrawnEffective)
-        assertEquals("TESTKUDOS:10", event.amountWithdrawnRaw)
+        assertEquals("TESTKUDOS:9.8", 
event.amountWithdrawnEffective.toJSONString())
+        assertEquals("TESTKUDOS:10", event.amountWithdrawnRaw.toJSONString())
         assertTrue(event.withdrawalSource is WithdrawalSourceReserve)
         assertEquals(
             "BRT2P0YMQSD5F48V9XHVNH73ZTS6EZC0KCQCPGPZQWTSQB77615G",
@@ -175,7 +165,7 @@ class HistoryEventTest {
         }""".trimIndent()
         val info: OrderShortInfo = mapper.readValue(json)
 
-        assertEquals("KUDOS:0.5", info.amount)
+        assertEquals("KUDOS:0.5", info.amount.toJSONString())
         assertEquals("2019.364-01RAQ68DQ7AWR", info.orderId)
         assertEquals("Essay: Foreword", info.summary)
     }
@@ -186,7 +176,7 @@ class HistoryEventTest {
             "type": "order-accepted",
             "eventId": 
"order-accepted;EP5MH4R5C9RMNA06YS1QGEJ3EY682PY8R1SGRFRP74EV735N3ATG",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -208,7 +198,7 @@ class HistoryEventTest {
             "type": "order-refused",
             "eventId": 
"order-refused;9RJGAYXKWX0Y3V37H66606SXSA7V2CV255EBFS4G1JSH6W1EG7F0",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -230,7 +220,7 @@ class HistoryEventTest {
             "type": "payment-sent",
             "eventId": 
"payment-sent;EP5MH4R5C9RMNA06YS1QGEJ3EY682PY8R1SGRFRP74EV735N3ATG",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -249,7 +239,7 @@ class HistoryEventTest {
         assertEquals(orderShortInfo, event.orderShortInfo)
         assertEquals(false, event.replay)
         assertEquals(6, event.numCoins)
-        assertEquals("KUDOS:0.6", event.amountPaidWithFees)
+        assertEquals("KUDOS:0.6", event.amountPaidWithFees.toJSONString())
         assertEquals("e4f436c4-3c5c-4aee-81d2-26e425c09520", event.sessionId)
         assertEquals(timestamp, event.timestamp.ms)
     }
@@ -260,7 +250,7 @@ class HistoryEventTest {
             "type": "payment-sent",
             "eventId": 
"payment-sent;EP5MH4R5C9RMNA06YS1QGEJ3EY682PY8R1SGRFRP74EV735N3ATG",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -278,7 +268,7 @@ class HistoryEventTest {
         assertEquals(orderShortInfo, event.orderShortInfo)
         assertEquals(true, event.replay)
         assertEquals(6, event.numCoins)
-        assertEquals("KUDOS:0.6", event.amountPaidWithFees)
+        assertEquals("KUDOS:0.6", event.amountPaidWithFees.toJSONString())
         assertEquals(null, event.sessionId)
         assertEquals(timestamp, event.timestamp.ms)
     }
@@ -289,7 +279,7 @@ class HistoryEventTest {
             "type": "payment-aborted",
             "eventId": 
"payment-sent;898724XGQ1GGMZB4WY3KND582NSP74FZ60BX0Y87FF81H0FJ8XD0",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -303,7 +293,7 @@ class HistoryEventTest {
         val event: HistoryPaymentAbortedEvent = mapper.readValue(json)
 
         assertEquals(orderShortInfo, event.orderShortInfo)
-        assertEquals("KUDOS:0.1", event.amountLost)
+        assertEquals("KUDOS:0.1", event.amountLost.toJSONString())
         assertEquals(timestamp, event.timestamp.ms)
     }
 
@@ -324,7 +314,7 @@ class HistoryEventTest {
             
"tip-accepted;898724XGQ1GGMZB4WY3KND582NSP74FZ60BX0Y87FF81H0FJ8XD0",
             event.tipId
         )
-        assertEquals("KUDOS:4", event.tipRaw)
+        assertEquals("KUDOS:4", event.tipRaw.toJSONString())
         assertEquals(timestamp, event.timestamp.ms)
     }
 
@@ -345,7 +335,7 @@ class HistoryEventTest {
             
"tip-accepted;998724XGQ1GGMZB4WY3KND582NSP74FZ60BX0Y87FF81H0FJ8XD0",
             event.tipId
         )
-        assertEquals("KUDOS:4", event.tipAmount)
+        assertEquals("KUDOS:4", event.tipAmount.toJSONString())
         assertEquals(timestamp, event.timestamp.ms)
     }
 
@@ -356,7 +346,7 @@ class HistoryEventTest {
             "eventId": 
"refund;898724XGQ1GGMZB4WY3KND582NSP74FZ60BX0Y87FF81H0FJ8XD0",
             "refundGroupId": "refund;998724",
             "orderShortInfo": {
-                "amount": "${orderShortInfo.amount}",
+                "amount": "${orderShortInfo.amount.toJSONString()}",
                 "orderId": "${orderShortInfo.orderId}",
                 "merchantBaseUrl": "${orderShortInfo.merchantBaseUrl}",
                 "proposalId": "${orderShortInfo.proposalId}",
@@ -365,16 +355,16 @@ class HistoryEventTest {
             "timestamp": {
               "t_ms": $timestamp
             },
-            "amountRefundedRaw": "KUDOS:1.0",
+            "amountRefundedRaw": "KUDOS:1",
             "amountRefundedInvalid": "KUDOS:0.5",
             "amountRefundedEffective": "KUDOS:0.4"
           }""".trimIndent()
         val event: HistoryRefundedEvent = mapper.readValue(json)
 
         assertEquals("refund;998724", event.refundGroupId)
-        assertEquals("KUDOS:1.0", event.amountRefundedRaw)
-        assertEquals("KUDOS:0.5", event.amountRefundedInvalid)
-        assertEquals("KUDOS:0.4", event.amountRefundedEffective)
+        assertEquals("KUDOS:1", event.amountRefundedRaw.toJSONString())
+        assertEquals("KUDOS:0.5", event.amountRefundedInvalid.toJSONString())
+        assertEquals("KUDOS:0.4", event.amountRefundedEffective.toJSONString())
         assertEquals(orderShortInfo, event.orderShortInfo)
         assertEquals(timestamp, event.timestamp.ms)
     }
@@ -397,8 +387,8 @@ class HistoryEventTest {
         }""".trimIndent()
         val event: HistoryRefreshedEvent = mapper.readValue(json)
 
-        assertEquals("KUDOS:0", event.amountRefreshedEffective)
-        assertEquals("KUDOS:1", event.amountRefreshedRaw)
+        assertEquals("KUDOS:0", event.amountRefreshedEffective.toJSONString())
+        assertEquals("KUDOS:1", event.amountRefreshedRaw.toJSONString())
         assertEquals(6, event.numInputCoins)
         assertEquals(0, event.numOutputCoins)
         assertEquals(1, event.numRefreshedInputCoins)
@@ -441,7 +431,7 @@ class HistoryEventTest {
             event.alreadyPaidOrderShortInfo.merchantBaseUrl
         )
         assertEquals("2019.354-01P25CD66P8NG", 
event.alreadyPaidOrderShortInfo.orderId)
-        assertEquals("KUDOS:0.5", event.alreadyPaidOrderShortInfo.amount)
+        assertEquals("KUDOS:0.5", 
event.alreadyPaidOrderShortInfo.amount.toJSONString())
         assertEquals(
             "Essay: 1. The Free Software Definition",
             event.alreadyPaidOrderShortInfo.summary
@@ -456,7 +446,7 @@ class HistoryEventTest {
             event.newOrderShortInfo.merchantBaseUrl
         )
         assertEquals("2019.364-01M4QH6KPMJY4", event.newOrderShortInfo.orderId)
-        assertEquals("KUDOS:0.5", event.newOrderShortInfo.amount)
+        assertEquals("KUDOS:0.5", 
event.newOrderShortInfo.amount.toJSONString())
         assertEquals("Essay: 1. The Free Software Definition", 
event.newOrderShortInfo.summary)
 
         assertEquals(timestamp, event.timestamp.ms)

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]