#55: Change Half_up to half_even, added tests

bartgora · Jul 14, 2017 · 409c726 · 409c726
1 parent dc676a7
commit 409c726
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/test/java/com/github/bgora/rpnlibrary/AdvancedCalulatorTest2ParamFunction.java b/src/test/java/com/github/bgora/rpnlibrary/AdvancedCalulatorTest2ParamFunction.java
@@ -75,4 +75,18 @@ public void testMinMinus5() throws WrongArgumentException, NoSuchFunctionFound {
         BigDecimal result = calc.calculate("min(10, 8) -5");
         assertEquals(BigDecimal.valueOf(3), result);
     }
+
+    @Test
+    public void testMinDouble() throws WrongArgumentException, NoSuchFunctionFound {
+        BigDecimal result = calc.calculate("min(12.5, 9.4)");
+        assertEquals(BigDecimal.valueOf(12.5), result);
+    }
+
+    @Test
+    public void testMaxDouble() throws WrongArgumentException, NoSuchFunctionFound {
+        BigDecimal result = calc.calculate("max(12 345.50, 8 000.66)");
+        assertEquals(BigDecimal.valueOf(12345.50), result);
+    }
+
+
 }
diff --git a/src/test/java/com/github/bgora/rpnlibrary/CalculatorTest.java b/src/test/java/com/github/bgora/rpnlibrary/CalculatorTest.java
@@ -41,8 +41,8 @@ public void setUp() throws Exception {
 
     @Test
     public void testCalculate() throws RPNException {
-        BigDecimal result = calc.calculate("2^3*(12/6)+18/3+5.0/2");
-        assertEquals("2^3*(12/6)+18/3+5.0/2", BigDecimal.valueOf(24.5), result);
+        BigDecimal result = calc.calculate("2^3*(12/6)+18/3+5/2");
+        assertEquals("2^3*(12/6)+18/3+5/2", BigDecimal.valueOf(24.5), result);
     }
 
     @Test
@@ -91,8 +91,8 @@ public void testSub() throws RPNException {
 
     @Test
     public void testDiv() throws RPNException {
-        BigDecimal result = calc.calculate("10.0/4");
-        assertEquals("10.0/4", BigDecimal.valueOf(2.5), result);
+        BigDecimal result = calc.calculate("10/4");
+        assertEquals("10/4", BigDecimal.valueOf(2.5), result);
     }
 
     @Test