diff --git a/src/main/java/com/ap/BasicCalculator.java b/src/main/java/com/ap/BasicCalculator.java index 4852598..dc7220e 100644 --- a/src/main/java/com/ap/BasicCalculator.java +++ b/src/main/java/com/ap/BasicCalculator.java @@ -12,7 +12,12 @@ public class BasicCalculator implements Calculator { } @Override - public int multiply(int a, int b) { + public int product(int a, int b) { + return a * b; + } + + @Override + public double calculateArea(double a, double b) { return a * b; } } \ No newline at end of file diff --git a/src/main/java/com/ap/Calculator.java b/src/main/java/com/ap/Calculator.java index 0220dcb..7e75f89 100644 --- a/src/main/java/com/ap/Calculator.java +++ b/src/main/java/com/ap/Calculator.java @@ -3,5 +3,6 @@ package com.ap; public interface Calculator { int add(int a, int b); int subtract(int a, int b); - int multiply(int a, int b); + int product(int a, int b); + double calculateArea(double a, double b); } \ No newline at end of file diff --git a/src/main/java/com/ap/MathHelper.java b/src/main/java/com/ap/MathHelper.java index d624768..405afae 100644 --- a/src/main/java/com/ap/MathHelper.java +++ b/src/main/java/com/ap/MathHelper.java @@ -1,7 +1,7 @@ package com.ap; public class MathHelper { - public static int multiply(int a, int b) { + public static int product(int a, int b) { return a * b; } diff --git a/src/main/java/com/ap/ReportGenerator.java b/src/main/java/com/ap/ReportGenerator.java index 2201769..16282d5 100644 --- a/src/main/java/com/ap/ReportGenerator.java +++ b/src/main/java/com/ap/ReportGenerator.java @@ -5,7 +5,7 @@ public class ReportGenerator { Calculator calc = new BasicCalculator(); int sum = calc.add(x, y); int diff = calc.subtract(x, y); - int product = calc.multiply(x, y); + int product = calc.product(x, y); int max = MathHelper.max(x, y); System.out.println("Sum: " + sum + ", Diff: " + diff + ", Product: " + product + ", Max: " + max); diff --git a/src/test/java/CalculatorTest.java b/src/test/java/CalculatorTest.java index 93d2bbf..65c4056 100644 --- a/src/test/java/CalculatorTest.java +++ b/src/test/java/CalculatorTest.java @@ -19,8 +19,8 @@ public class CalculatorTest { } @Test - void testMultiply() { + void testProduct() { Calculator calc = new BasicCalculator(); - assertEquals(6, calc.multiply(2, 3)); + assertEquals(6, calc.product(2, 3)); } } \ No newline at end of file