Skip to content

Commit f34cf05

Browse files
Add all tests
1 parent 7d5ff74 commit f34cf05

File tree

1 file changed

+34
-2
lines changed

1 file changed

+34
-2
lines changed
Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package calculator;
22

3-
import static org.junit.Assert.*;
3+
import static org.junit.Assert.assertEquals;
44

55
import org.junit.Test;
66

@@ -9,6 +9,38 @@ public class CalculatorTest {
99

1010
@Test
1111
public void testAdd() {
12-
assertEquals(new Calculator().add(1, 1), 2, DELTA);
12+
assertEquals(Calculator.add(1, 2), 3.0, DELTA);
13+
assertEquals(Calculator.add(1.0, 2.0), 3.0, DELTA);
14+
assertEquals(Calculator.add(0, 2.0), 2.0, DELTA);
15+
assertEquals(Calculator.add(2.0, 0), 2.0, DELTA);
16+
assertEquals(Calculator.add(-4, 2.0), -2.0, DELTA);
17+
}
18+
19+
@Test
20+
public void testSubtract() {
21+
assertEquals(Calculator.subtract(1, 2), -1.0, DELTA);
22+
assertEquals(Calculator.subtract(2, 1), 1.0, DELTA);
23+
assertEquals(Calculator.subtract(1.0, 2.0), -1.0, DELTA);
24+
assertEquals(Calculator.subtract(0, 2.0), -2.0, DELTA);
25+
assertEquals(Calculator.subtract(2.0, 0), 2.0, DELTA);
26+
assertEquals(Calculator.subtract(-4, 2.0), -6.0, DELTA);
27+
}
28+
29+
@Test
30+
public void testMultiply() {
31+
assertEquals(Calculator.multiply(1, 2), 2.0, DELTA);
32+
assertEquals(Calculator.multiply(1.0, 2.0), 2.0, DELTA);
33+
assertEquals(Calculator.multiply(0, 2.0), 0.0, DELTA);
34+
assertEquals(Calculator.multiply(2.0, 0), 0.0, DELTA);
35+
assertEquals(Calculator.multiply(-4, 2.0), -8.0, DELTA);
36+
}
37+
38+
@Test
39+
public void testDivide() {
40+
assertEquals(Calculator.divide(1, 2), 0.5, DELTA);
41+
assertEquals(Calculator.divide(1.0, 2.0), 0.5, DELTA);
42+
assertEquals(Calculator.divide(0, 2.0), 0, DELTA);
43+
assertEquals(Calculator.divide(-4, 2.0), -2.0, DELTA);
44+
// assertEquals(Calculator.divide(2.0, 0), 0.0, DELTA);
1345
}
1446
}

0 commit comments

Comments
 (0)