From 0aa2136fec57e04f8cb5c075c635c350230cd8f1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 15 Aug 2022 09:52:41 -0700 Subject: [PATCH] Output convertion result as is --- .../net/thauvin/erik/mobibot/modules/CurrencyConverter.kt | 2 +- .../thauvin/erik/mobibot/modules/CurrencyConverterTest.kt | 4 ++++ version.properties | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt index da8844f..59baa19 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt @@ -147,7 +147,7 @@ class CurrencyConverter : ThreadedModule() { if (json.getBoolean("success")) { PublicMessage( - "${cmds[0]} ${SYMBOLS[to]} = ${json.getDouble("result")} ${SYMBOLS[from]}" + "${cmds[0]} ${SYMBOLS[to]} = ${json.get("result")} ${SYMBOLS[from]}" ) } else { ErrorMessage("Sorry, an error occurred while converting the currencies.") diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt index 4149793..05447e1 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt @@ -62,6 +62,10 @@ class CurrencyConverterTest { convertCurrency("100 USD to EUR").msg, "100 USD to EUR" ).matches("100 United States Dollar = \\d{2,3}\\.\\d+ Euro".toRegex()) + assertThat( + convertCurrency("1 USD to BTC").msg, + "1 USD to BTC" + ).matches("1 United States Dollar = 0\\.\\d+ Bitcoin".toRegex()) assertThat( convertCurrency("100,000.00 GBP to BTC").msg, "100 USD to EUR" diff --git a/version.properties b/version.properties index aab74cd..a62cc34 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Mon Aug 01 10:24:43 PDT 2022 -version.buildmeta=339 +#Mon Aug 15 09:46:49 PDT 2022 +version.buildmeta=343 version.major=0 version.minor=8 version.patch=0 version.prerelease=rc version.project=mobibot -version.semver=0.8.0-rc+339 +version.semver=0.8.0-rc+343