From b9b4ce1937f94c4a85005df92afa44adb6371c92 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 6 Aug 2021 22:31:51 +0100 Subject: [PATCH] Fixed NumberUtils --- .../main/java/com/willfp/eco/util/NumberUtils.java | 2 +- eco-api/src/test/java/NumberUtilsTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java b/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java index 15508e80..ce15ef7b 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java @@ -131,7 +131,7 @@ public class NumberUtils { if (numeral.isEmpty()) { return 0; } - for (Map.Entry entry : NUMERALS.entrySet()) { + for (Map.Entry entry : NUMERALS.descendingMap().entrySet()) { if (numeral.startsWith(entry.getValue())) { return entry.getKey() + fromNumeral(numeral.substring(entry.getValue().length())); } diff --git a/eco-api/src/test/java/NumberUtilsTest.java b/eco-api/src/test/java/NumberUtilsTest.java index 22fc23d4..e2d6078e 100644 --- a/eco-api/src/test/java/NumberUtilsTest.java +++ b/eco-api/src/test/java/NumberUtilsTest.java @@ -5,20 +5,20 @@ import org.junit.jupiter.api.Test; public class NumberUtilsTest { @Test public void testFormatDouble() { - Assertions.assertEquals(NumberUtils.format(3.0D), "3"); - Assertions.assertEquals(NumberUtils.format(3.2D), "3.20"); + Assertions.assertEquals("3", NumberUtils.format(3.0D)); + Assertions.assertEquals("3.20", NumberUtils.format(3.2D)); } @Test public void testLog2() { - Assertions.assertEquals(NumberUtils.log2(2), 1); + Assertions.assertEquals(1, NumberUtils.log2(2)); } @Test public void testNumerals() { - Assertions.assertEquals(NumberUtils.fromNumeral("IV"), 4); - Assertions.assertEquals(NumberUtils.fromNumeral("IX"), 9); - Assertions.assertEquals(NumberUtils.toNumeral(14), "XIV"); - Assertions.assertEquals(NumberUtils.toNumeral(21), "XXI"); + Assertions.assertEquals(4, NumberUtils.fromNumeral("IV")); + Assertions.assertEquals(9, NumberUtils.fromNumeral("IX")); + Assertions.assertEquals("XIV", NumberUtils.toNumeral(14)); + Assertions.assertEquals("XXI", NumberUtils.toNumeral(21)); } }