Merge pull request #398 from FridaTveit/DifferenceOfSquaresUseInstanceMethod

difference-of-squares: adjust API to use instance method [Fix #253]

exercises/difference-of-squares/src/example/java/Difference.java → exercises/difference-of-squares/src/example/java/DifferenceOfSquaresCalculator.java

@@ -1,19 +1,19 @@
 import java.util.stream.IntStream;
 
-public final class Difference {
+public final class DifferenceOfSquaresCalculator {
 
-    public static int computeSquareOfSumTo(final int input) {
+    public int computeSquareOfSumTo(final int input) {
         final int sum = input * (input + 1) / 2;
         return (int) Math.pow(sum, 2);
     }
 
-    public static int computeSumOfSquaresTo(final int input) {
+    public int computeSumOfSquaresTo(final int input) {
         return IntStream.rangeClosed(1, input)
                 .map(i -> (int) Math.pow(i, 2))
                 .sum();
     }
 
-    public static int betweenSquareOfSumAndSumOfSquaresTo(final int input) {
+    public int computeDifferenceOfSquares(final int input) {
         return computeSquareOfSumTo(input) - computeSumOfSquaresTo(input);
     }
 

exercises/difference-of-squares/src/main/java/Difference.java

@@ -1,5 +0,0 @@
-public final class Difference {
-    
-
-
-}

exercises/difference-of-squares/src/main/java/DifferenceOfSquaresCalculator.java

@@ -0,0 +1,5 @@
+public final class DifferenceOfSquaresCalculator {
+    
+
+
+}

exercises/difference-of-squares/src/test/java/DifferenceTest.java → exercises/difference-of-squares/src/test/java/DifferenceOfSquaresCalculatorTest.java

@@ -1,14 +1,21 @@
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public final class DifferenceTest {
+public final class DifferenceOfSquaresCalculatorTest {
+    private DifferenceOfSquaresCalculator calculator;
+
+    @Before
+    public void setUp() {
+        calculator = new DifferenceOfSquaresCalculator();
+    }
 
     @Test
     public void testSquareOfSum5() {
         final int expected = 225;
-        final int actual = Difference.computeSquareOfSumTo(5);
+        final int actual = calculator.computeSquareOfSumTo(5);
         assertEquals(expected, actual);
     }
 
@@ -16,7 +23,7 @@ public final class DifferenceTest {
     @Test
     public void testSquareOfSum10() {
         final int expected = 3025;
-        final int actual = Difference.computeSquareOfSumTo(10);
+        final int actual = calculator.computeSquareOfSumTo(10);
         assertEquals(expected, actual);
     }
 
@@ -24,7 +31,7 @@ public final class DifferenceTest {
     @Test
     public void testSquareOfSum100() {
         final int expected = 25502500;
-        final int actual = Difference.computeSquareOfSumTo(100);
+        final int actual = calculator.computeSquareOfSumTo(100);
         assertEquals(expected, actual);
     }
 
@@ -32,7 +39,7 @@ public final class DifferenceTest {
     @Test
     public void testSumOfSquares5() {
         final int expected = 55;
-        final int actual = Difference.computeSumOfSquaresTo(5);
+        final int actual = calculator.computeSumOfSquaresTo(5);
         assertEquals(expected, actual);
     }
 
@@ -40,7 +47,7 @@ public final class DifferenceTest {
     @Test
     public void testSumOfSquares10() {
         final int expected = 385;
-        final int actual = Difference.computeSumOfSquaresTo(10);
+        final int actual = calculator.computeSumOfSquaresTo(10);
         assertEquals(expected, actual);
     }
 
@@ -48,7 +55,7 @@ public final class DifferenceTest {
     @Test
     public void testSumOfSquares100() {
         final int expected = 338350;
-        final int actual = Difference.computeSumOfSquaresTo(100);
+        final int actual = calculator.computeSumOfSquaresTo(100);
         assertEquals(expected, actual);
     }
 
@@ -56,7 +63,7 @@ public final class DifferenceTest {
     @Test
     public void testDifferenceOfSquares0() {
         final int expected = 0;
-        final int actual = Difference.betweenSquareOfSumAndSumOfSquaresTo(0);
+        final int actual = calculator.computeDifferenceOfSquares(0);
         assertEquals(expected, actual);
     }
 
@@ -64,7 +71,7 @@ public final class DifferenceTest {
     @Test
     public void testDifferenceOfSquares5() {
         final int expected = 170;
-        final int actual = Difference.betweenSquareOfSumAndSumOfSquaresTo(5);
+        final int actual = calculator.computeDifferenceOfSquares(5);
         assertEquals(expected, actual);
     }
 
@@ -72,7 +79,7 @@ public final class DifferenceTest {
     @Test
     public void testDifferenceOfSquares10() {
         final int expected = 2640;
-        final int actual = Difference.betweenSquareOfSumAndSumOfSquaresTo(10);
+        final int actual = calculator.computeDifferenceOfSquares(10);
         assertEquals(expected, actual);
     }
 
@@ -80,7 +87,7 @@ public final class DifferenceTest {
     @Test
     public void testDifferenceOfSquares100() {
         final int expected = 25164150;
-        final int actual = Difference.betweenSquareOfSumAndSumOfSquaresTo(100);
+        final int actual = calculator.computeDifferenceOfSquares(100);
         assertEquals(expected, actual);
     }