Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5097265ee3 |
@@ -12,7 +12,8 @@ public class BasicCalculator implements Calculator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int product(int a, int b) {
|
public int multiply(int a, int b) {
|
||||||
return a * b;
|
int m = a * b;
|
||||||
|
return m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,5 +3,5 @@ package com.ap;
|
|||||||
public interface Calculator {
|
public interface Calculator {
|
||||||
int add(int a, int b);
|
int add(int a, int b);
|
||||||
int subtract(int a, int b);
|
int subtract(int a, int b);
|
||||||
int product(int a, int b);
|
int multiply(int a, int b);
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.ap;
|
package com.ap;
|
||||||
|
|
||||||
public class MathHelper {
|
public class MathHelper {
|
||||||
public static int product(int a, int b) {
|
public static int multiply(int a, int b) {
|
||||||
return a * b;
|
return a * b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ public class ReportGenerator {
|
|||||||
Calculator calc = new BasicCalculator();
|
Calculator calc = new BasicCalculator();
|
||||||
int sum = calc.add(x, y);
|
int sum = calc.add(x, y);
|
||||||
int diff = calc.subtract(x, y);
|
int diff = calc.subtract(x, y);
|
||||||
int product = calc.product(x, y);
|
int product = calc.multiply(x, y);
|
||||||
int max = MathHelper.max(x, y);
|
int max = MathHelper.max(x, y);
|
||||||
System.out.println("Sum: " + sum + ", Diff: " + diff +
|
System.out.println("Sum: " + sum + ", Diff: " + diff +
|
||||||
", Product: " + product + ", Max: " + max);
|
", Product: " + product + ", Max: " + max);
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ public class CalculatorTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testProduct() {
|
void testMultiply() {
|
||||||
Calculator calc = new BasicCalculator();
|
Calculator calc = new BasicCalculator();
|
||||||
assertEquals(6, calc.product(2, 3));
|
assertEquals(6, calc.multiply(2, 3));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user