Merge branch 'master' of https://github.com/RaulGracia/playground

src/main/java/MyCalculator.java

@@ -15,9 +15,22 @@ public double divide (int a, int b) {
         return ((double)a)/b;
     }
 
-    public int multilply (int a, int b) {
+    public int multiply(int a, int b) {
         return a*b;
     }
 
+    public double sum (double a, double b) {
+        return a+b;
+    }
+
+    public double subtract (double a, double b) {
+        return a-b;
+    }
+
+    public double divide (double a, double b) { return a/b;}
+
+    public double multiply(double a, double b) {
+        return a*b;
+    }
 
 }

src/test/java/MyCalculatorTest.java

@@ -34,7 +34,31 @@ public void divideTest() {
     @Test
     public void multiplyTest() {
         int a = 2, b = 2;
-        assert calculator.multilply(a, b)==(a*b);
+        assert calculator.multiply(a, b)==(a*b);
+    }
+
+    @Test
+    public void sumTestDouble() {
+        double a = 2, b = 2;
+        assert calculator.sum(a, b)==(a+b);
+    }
+
+    @Test
+    public void subtractTestDouble() {
+        double a = 2, b = 2;
+        assert calculator.subtract(a, b)==(a-b);
+    }
+
+    @Test
+    public void divideTestDouble() {
+        double a = 2, b = 3;
+        assert calculator.divide(a, b)==(((double)a)/b);
+    }
+
+    @Test
+    public void multiplyTestDouble() {
+        double a = 2, b = 2;
+        assert calculator.multiply(a, b)==(a*b);
     }
 
 }