erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Changed decimal formatting

Browse source
This commit is contained in:
Erik C. Thauvin 2023-10-13 12:37:55 -07:00
parent b562b674a7
commit 5a3b1d3f19
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
View file

@ -133,7 +133,7 @@ class CurrencyConverter : AbstractModule() {
private val SYMBOLS: TreeMap<String, String> = TreeMap() private val SYMBOLS: TreeMap<String, String> = TreeMap()
// Decimal format // Decimal format
private val DECIMAL_FORMAT = DecimalFormat("0.00") private val DECIMAL_FORMAT = DecimalFormat("0.00#")
/** /**
* Converts from a currency to another. * Converts from a currency to another.

6
src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
View file

@ -64,15 +64,15 @@ class CurrencyConverterTest: LocalProperties() {
assertThat( assertThat(
convertCurrency(apiKey,"100 USD to EUR").msg, convertCurrency(apiKey,"100 USD to EUR").msg,
"convertCurrency(100 USD to EUR)" "convertCurrency(100 USD to EUR)"
).matches("100 United States Dollar = \\d{2,3}\\.\\d+ Euro".toRegex()) ).matches("100 United States Dollar = \\d{2,3}\\.\\d{2,3} Euro".toRegex())
assertThat( assertThat(
convertCurrency(apiKey,"1 USD to GBP").msg, convertCurrency(apiKey,"1 USD to GBP").msg,
"convertCurrency(1 USD to BGP)" "convertCurrency(1 USD to BGP)"
).matches("1 United States Dollar = 0\\.\\d+ Pound Sterling".toRegex()) ).matches("1 United States Dollar = 0\\.\\d{2,3} Pound Sterling".toRegex())
assertThat( assertThat(
convertCurrency(apiKey,"100,000.00 CAD to USD").msg, convertCurrency(apiKey,"100,000.00 CAD to USD").msg,
"convertCurrency(100,000.00 GBP to USD)" "convertCurrency(100,000.00 GBP to USD)"
).matches("100,000.00 Canadian Dollar = \\d+\\.\\d+ United States Dollar".toRegex()) ).matches("100,000.00 Canadian Dollar = \\d+\\.\\d{2,3} United States Dollar".toRegex())
assertThat(convertCurrency(apiKey,"100 USD to USD"), "convertCurrency(100 USD to USD)").all { assertThat(convertCurrency(apiKey,"100 USD to USD"), "convertCurrency(100 USD to USD)").all {
prop(Message::msg).contains("You're kidding, right?") prop(Message::msg).contains("You're kidding, right?")
isInstanceOf(PublicMessage::class.java) isInstanceOf(PublicMessage::class.java)