Parcourir la source

largest-series-product: update tests to version 1.1.0

Frida Tveit il y a 8 ans
Parent
révision
ea7a49b896

+ 1
- 3
exercises/largest-series-product/.meta/src/reference/java/LargestSeriesProductCalculator.java Voir le fichier

33
     }
33
     }
34
 
34
 
35
     private void validateStringToSearch() throws IllegalArgumentException {
35
     private void validateStringToSearch() throws IllegalArgumentException {
36
-        if (stringToSearch == null) {
37
-            throw new IllegalArgumentException("String to search must be non-null.");
38
-        } else if (!stringToSearch.chars().allMatch(Character::isDigit)) {
36
+        if (!stringToSearch.chars().allMatch(Character::isDigit)) {
39
             throw new IllegalArgumentException("String to search may only contain digits.");
37
             throw new IllegalArgumentException("String to search may only contain digits.");
40
         }
38
         }
41
     }
39
     }

+ 1
- 0
exercises/largest-series-product/.meta/version Voir le fichier

1
+1.1.0

+ 9
- 44
exercises/largest-series-product/src/test/java/LargestSeriesProductCalculatorTest.java Voir le fichier

11
     public ExpectedException expectedException = ExpectedException.none();
11
     public ExpectedException expectedException = ExpectedException.none();
12
 
12
 
13
     @Test
13
     @Test
14
-    public void testCorrectlyCalculatesLargestProductOfLengthTwoWithNumbersInOrder() {
15
-        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("0123456789");
16
-        final long expectedProduct = 72;
14
+    public void testCorrectlyCalculatesLargestProductWhenSeriesLengthEqualsStringToSearchLength() {
15
+        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("29");
16
+        final long expectedProduct = 18;
17
 
17
 
18
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
18
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
19
 
19
 
22
 
22
 
23
     @Ignore("Remove to run test")
23
     @Ignore("Remove to run test")
24
     @Test
24
     @Test
25
-    public void testCorrectlyCalculatesLargestProductOfLengthTwoWithNumbersNotInOrder() {
26
-        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("576802143");
27
-        final long expectedProduct = 48;
25
+    public void testCorrectlyCalculatesLargestProductOfLengthTwoWithNumbersInOrder() {
26
+        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("0123456789");
27
+        final long expectedProduct = 72;
28
 
28
 
29
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
29
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
30
 
30
 
33
 
33
 
34
     @Ignore("Remove to run test")
34
     @Ignore("Remove to run test")
35
     @Test
35
     @Test
36
-    public void testCorrectlyCalculatesLargestProductWhenSeriesLengthEqualsStringToSearchLength() {
37
-        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("29");
38
-        final long expectedProduct = 18;
36
+    public void testCorrectlyCalculatesLargestProductOfLengthTwoWithNumbersNotInOrder() {
37
+        final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("576802143");
38
+        final long expectedProduct = 48;
39
 
39
 
40
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
40
         final long actualProduct = calculator.calculateLargestProductForSeriesLength(2);
41
 
41
 
90
 
90
 
91
     @Ignore("Remove to run test")
91
     @Ignore("Remove to run test")
92
     @Test
92
     @Test
93
-    public void testCorrectlyCalculatesLargestProductInLongStringToSearchV2() {
94
-        final LargestSeriesProductCalculator calculator
95
-                = new LargestSeriesProductCalculator("52677741234314237566414902593461595376319419139427");
96
-
97
-        final long expectedProduct = 28350;
98
-
99
-        final long actualProduct = calculator.calculateLargestProductForSeriesLength(6);
100
-
101
-        assertEquals(expectedProduct, actualProduct);
102
-    }
103
-
104
-    @Ignore("Remove to run test")
105
-    @Test
106
-    public void testCorrectlyCalculatesLargestProductInLongStringToSearchFromProjectEuler() {
107
-        final LargestSeriesProductCalculator calculator
108
-                = new LargestSeriesProductCalculator("7316717653133062491922511967442657474235534919493496983520312774506326239578318016984801869478851843858615607891129494954595017379583319528532088055111254069874715852386305071569329096329522744304355766896648950445244523161731856403098711121722383113622298934233803081353362766142828064444866452387493035890729629049156044077239071381051585930796086670172427121883998797908792274921901699720888093776657273330010533678812202354218097512545405947522435258490771167055601360483958644670632441572215539753697817977846174064955149290862569321978468622482839722413756570560574902614079729686524145351004748216637048440319989000889524345065854122758866688116427171479924442928230863465674813919123162824586178664583591245665294765456828489128831426076900422421902267105562632111110937054421750694165896040807198403850962455444362981230987879927244284909188845801561660979191338754992005240636899125607176060588611646710940507754100225698315520005593572972571636269561882670428252483600823257530420752963450");
109
-
110
-        final long expectedProduct = 23514624000L;
111
-
112
-        final long actualProduct = calculator.calculateLargestProductForSeriesLength(13);
113
-
114
-        assertEquals(expectedProduct, actualProduct);
115
-    }
116
-
117
-    @Ignore("Remove to run test")
118
-    @Test
119
     public void testCorrectlyCalculatesLargestProductOfZeroIfAllDigitsAreZeroes() {
93
     public void testCorrectlyCalculatesLargestProductOfZeroIfAllDigitsAreZeroes() {
120
         final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("0000");
94
         final LargestSeriesProductCalculator calculator = new LargestSeriesProductCalculator("0000");
121
         final long expectedProduct = 0;
95
         final long expectedProduct = 0;
202
         calculator.calculateLargestProductForSeriesLength(-1);
176
         calculator.calculateLargestProductForSeriesLength(-1);
203
     }
177
     }
204
 
178
 
205
-    @Ignore("Remove to run test")
206
-    @Test
207
-    public void testNullStringToSearchIsRejected() {
208
-        expectedException.expect(IllegalArgumentException.class);
209
-        expectedException.expectMessage("String to search must be non-null.");
210
-
211
-        new LargestSeriesProductCalculator(null);
212
-    }
213
-
214
 }
179
 }