Merge remote-tracking branch 'upstream/master'

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);
     }
 

exercises/sieve/src/test/java/SieveTest.java

@@ -2,6 +2,7 @@ import org.junit.Test;
 import org.junit.Ignore;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -12,7 +13,7 @@ public class SieveTest {
     @Test
     public void findFirstPrime() {
         Sieve sieve = new Sieve(2);
-        List<Integer> expectedOutput = Arrays.asList(new Integer[]{2});
+        List<Integer> expectedOutput = Collections.singletonList(2);
 
         assertEquals(expectedOutput, sieve.getPrimes());
     }

exercises/sum-of-multiples/src/example/java/SumOfMultiples.java

@@ -1,26 +1,34 @@
 public class SumOfMultiples {
-    
-    
-    public static int sum(int number, int[] set) {
-        
+    private final int sum;
+
+    public SumOfMultiples(int number, int[] set) {
+        sum = calculateSum(number, set);
+    }
+
+    public int getSum() {
+        return sum;
+    }
+
+    private int calculateSum(int number, int[] set) {
+
         int sum = 0;
         int count = 0;
-        
+
         for (int i = 1; i < number; i++) {
-            
+
             for (int j = 0; j < set.length; j++) {
                 if (i % set[j] == 0) {
                     count++;
                 }
             }
-            
+
             if (count > 0) {
                 sum = sum + i;
                 count = 0;
             }
         }
-        
+
         return sum;
     }
-    
+
 }

exercises/sum-of-multiples/src/test/java/SumOfMultiplesTest.java

@@ -1,175 +1,160 @@
-import static org.junit.Assert.*;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class SumOfMultiplesTest {
-    
-    
+
     @Test
     public void testSumOfMultiplesOf3and4UpToOne() {
-        
+
         int[] set = {
-            3,
-            5
+                3,
+                5
         };
-        int output = SumOfMultiples.sum(1, set);
+        int output = new SumOfMultiples(1, set).getSum();
         assertEquals(0, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf3and5UpToFour() {
-        
+
         int[] set = {
-            3,
-            5
+                3,
+                5
         };
-        int output = SumOfMultiples.sum(4, set);
+        int output = new SumOfMultiples(4, set).getSum();
         assertEquals(3, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf3and5UpToTen() {
-        
+
         int[] set = {
-            3,
-            5
+                3,
+                5
         };
-        int output = SumOfMultiples.sum(10, set);
+        int output = new SumOfMultiples(10, set).getSum();
         assertEquals(23, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf3and5UpToOneHundred() {
-        
+
         int[] set = {
-            3,
-            5
+                3,
+                5
         };
-        int output = SumOfMultiples.sum(100, set);
+        int output = new SumOfMultiples(100, set).getSum();
         assertEquals(2318, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf3and5UpToOneThousand() {
-        
+
         int[] set = {
-            3,
-            5
+                3,
+                5
         };
-        int output = SumOfMultiples.sum(1000, set);
+        int output = new SumOfMultiples(1000, set).getSum();
         assertEquals(233168, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf7and13and17UpToTwenty() {
-        
+
         int[] set = {
-            7,
-            13,
-            17
+                7,
+                13,
+                17
         };
-        int output = SumOfMultiples.sum(20, set);
+        int output = new SumOfMultiples(20, set).getSum();
         assertEquals(51, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf4and6UpToFifteen() {
-        
+
         int[] set = {
-            4,
-            6
+                4,
+                6
         };
-        int output = SumOfMultiples.sum(15, set);
+        int output = new SumOfMultiples(15, set).getSum();
         assertEquals(30, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf5and6and8UpToOneHundredFifty() {
-        
+
         int[] set = {
-            5,
-            6,
-            8
+                5,
+                6,
+                8
         };
-        int output = SumOfMultiples.sum(150, set);
+        int output = new SumOfMultiples(150, set).getSum();
         assertEquals(4419, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf5and25UpToTwoHundredSeventyFive() {
-        
+
         int[] set = {
-            5,
-            25
+                5,
+                25
         };
-        int output = SumOfMultiples.sum(51, set);
+        int output = new SumOfMultiples(51, set).getSum();
         assertEquals(275, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOf43and47UpToTenThousand() {
-        
+
         int[] set = {
-            43,
-            47
+                43,
+                47
         };
-        int output = SumOfMultiples.sum(10000, set);
+        int output = new SumOfMultiples(10000, set).getSum();
         assertEquals(2203160, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOfOneUpToOneHundred() {
-        
+
         int[] set = {
-            1
+                1
         };
-        int output = SumOfMultiples.sum(100, set);
+        int output = new SumOfMultiples(100, set).getSum();
         assertEquals(4950, output);
-        
+
     }
-    
-    
+
     @Test
     @Ignore
     public void testSumOfMultiplesOfNoneUpToTenThousand() {
-        
+
         int[] set = {};
-        int output = SumOfMultiples.sum(10000, set);
+        int output = new SumOfMultiples(10000, set).getSum();
         assertEquals(0, output);
-        
+
     }
-    
-    
-    
 }