Fix invalid equation text and refactor

1 files changed, 10 insertions, 5 deletions

diff --git a/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java b/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java
index 84834c57..c29efdf2 100644
--- a/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java
+++ b/src/test/java/de/hysky/skyblocker/utils/CalculatorTest.java
@@ -5,22 +5,27 @@ import org.junit.jupiter.api.Test;
 
 public class CalculatorTest {
     @Test
-    void testCalculator() {
-        //check the magnitudes are working
+    void testShorthands() {
         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
+    @Test
+    void testPrecedence() {
         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
+    @Test
+    void testImplicitMultiplication() {
         Assertions.assertEquals(Calculator.calculate("5(2 + 2)"), 20);
+    }
 
-        //check unclosed parenthesis work
+    @Test
+    void testImplicitClosingParenthesis() {
         Assertions.assertEquals(Calculator.calculate("5(2 + 2"), 20);
     }
 }