diff options
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java b/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java index 9b64c7d3..84834c57 100644 --- a/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java +++ b/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java @@ -7,21 +7,20 @@ public class CalculatorTest { @Test void testCalculator() { //check the magnitudes are working - Assertions.assertEquals(Calculator.calculate("1k"),1000); - Assertions.assertEquals(Calculator.calculate("0.12k"),120); - Assertions.assertEquals(Calculator.calculate("1k + 0.12k"),1120); - Assertions.assertEquals(Calculator.calculate("1 + 1s + 1k + 1m + 1b"),1001001065); + Assertions.assertEquals(Calculator.calculate("1k"), 1000); + Assertions.assertEquals(Calculator.calculate("0.12k"), 120); + Assertions.assertEquals(Calculator.calculate("1k + 0.12k"), 1120); + Assertions.assertEquals(Calculator.calculate("1 + 1s + 1k + 1m + 1b"), 1001001065); //check precedence works - Assertions.assertEquals(Calculator.calculate("5 + 2 * 2"),9); - Assertions.assertEquals(Calculator.calculate("5 - 2 / 2"),4); - Assertions.assertEquals(Calculator.calculate("5 * (1 + 2)"),15); + Assertions.assertEquals(Calculator.calculate("5 + 2 * 2"), 9); + Assertions.assertEquals(Calculator.calculate("5 - 2 / 2"), 4); + Assertions.assertEquals(Calculator.calculate("5 * (1 + 2)"), 15); //check implicit multiplication - Assertions.assertEquals(Calculator.calculate("5(2 + 2)"),20); + Assertions.assertEquals(Calculator.calculate("5(2 + 2)"), 20); //check unclosed parenthesis work - Assertions.assertEquals(Calculator.calculate("5(2 + 2"),20); + Assertions.assertEquals(Calculator.calculate("5(2 + 2"), 20); } - } |