Browse Source

Remove final keyword from variables (#1433)

* Remove final keyword from variables

* Remove final keyword from tests
Scott Ertel 6 years ago
parent
commit
d38d1c6ba4

+ 14
- 14
exercises/phone-number/src/test/java/PhoneNumberTest.java View File

6
 import static org.junit.Assert.assertEquals;
6
 import static org.junit.Assert.assertEquals;
7
 
7
 
8
 public class PhoneNumberTest {
8
 public class PhoneNumberTest {
9
-    private final static String wrongLengthExceptionMessage = "Number must be 10 or 11 digits";
10
-    private final static String numberIs11DigitsButDoesNotStartWith1ExceptionMessage =
9
+    private static String wrongLengthExceptionMessage = "Number must be 10 or 11 digits";
10
+    private static String numberIs11DigitsButDoesNotStartWith1ExceptionMessage =
11
             "Can only have 11 digits if number starts with '1'";
11
             "Can only have 11 digits if number starts with '1'";
12
-    private final static String illegalCharacterExceptionMessage =
12
+    private static String illegalCharacterExceptionMessage =
13
             "Illegal character in phone number. Only digits, spaces, parentheses, hyphens or dots accepted.";
13
             "Illegal character in phone number. Only digits, spaces, parentheses, hyphens or dots accepted.";
14
-    private final static String illegalAreaOrExchangeCodeMessage =
14
+    private static String illegalAreaOrExchangeCodeMessage =
15
             "Illegal Area Or Exchange Code. Only 2-9 are valid digits";
15
             "Illegal Area Or Exchange Code. Only 2-9 are valid digits";
16
 
16
 
17
     @Rule
17
     @Rule
19
 
19
 
20
     @Test
20
     @Test
21
     public void cleansTheNumber() {
21
     public void cleansTheNumber() {
22
-        final String expectedNumber = "2234567890";
23
-        final String actualNumber = new PhoneNumber("(223) 456-7890").getNumber();
22
+        String expectedNumber = "2234567890";
23
+        String actualNumber = new PhoneNumber("(223) 456-7890").getNumber();
24
 
24
 
25
         assertEquals(
25
         assertEquals(
26
                 expectedNumber, actualNumber
26
                 expectedNumber, actualNumber
30
     @Ignore("Remove to run test")
30
     @Ignore("Remove to run test")
31
     @Test
31
     @Test
32
     public void cleansNumbersWithDots() {
32
     public void cleansNumbersWithDots() {
33
-        final String expectedNumber = "2234567890";
34
-        final String actualNumber = new PhoneNumber("223.456.7890").getNumber();
33
+        String expectedNumber = "2234567890";
34
+        String actualNumber = new PhoneNumber("223.456.7890").getNumber();
35
 
35
 
36
         assertEquals(
36
         assertEquals(
37
                 expectedNumber, actualNumber
37
                 expectedNumber, actualNumber
41
     @Ignore("Remove to run test")
41
     @Ignore("Remove to run test")
42
     @Test
42
     @Test
43
     public void cleansNumbersWithMultipleSpaces() {
43
     public void cleansNumbersWithMultipleSpaces() {
44
-        final String expectedNumber = "2234567890";
45
-        final String actualNumber = new PhoneNumber("223 456   7890   ").getNumber();
44
+        String expectedNumber = "2234567890";
45
+        String actualNumber = new PhoneNumber("223 456   7890   ").getNumber();
46
 
46
 
47
         assertEquals(
47
         assertEquals(
48
                 expectedNumber, actualNumber
48
                 expectedNumber, actualNumber
68
     @Ignore("Remove to run test")
68
     @Ignore("Remove to run test")
69
     @Test
69
     @Test
70
     public void validWhen11DigitsAndStartingWith1() {
70
     public void validWhen11DigitsAndStartingWith1() {
71
-        final String expectedNumber = "2234567890";
72
-        final String actualNumber = new PhoneNumber("12234567890").getNumber();
71
+        String expectedNumber = "2234567890";
72
+        String actualNumber = new PhoneNumber("12234567890").getNumber();
73
 
73
 
74
         assertEquals(
74
         assertEquals(
75
                 expectedNumber, actualNumber
75
                 expectedNumber, actualNumber
79
     @Ignore("Remove to run test")
79
     @Ignore("Remove to run test")
80
     @Test
80
     @Test
81
     public void validWhen11DigitsAndStartingWith1EvenWithPunctuation() {
81
     public void validWhen11DigitsAndStartingWith1EvenWithPunctuation() {
82
-        final String expectedNumber = "2234567890";
83
-        final String actualNumber = new PhoneNumber("+1 (223) 456-7890").getNumber();
82
+        String expectedNumber = "2234567890";
83
+        String actualNumber = new PhoneNumber("+1 (223) 456-7890").getNumber();
84
 
84
 
85
         assertEquals(
85
         assertEquals(
86
                 expectedNumber, actualNumber
86
                 expectedNumber, actualNumber

+ 10
- 10
exercises/pythagorean-triplet/src/test/java/PythagoreanTripletTest.java View File

15
     @Test
15
     @Test
16
     public void shouldCalculateSum() {
16
     public void shouldCalculateSum() {
17
         PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
17
         PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
18
-        final int expected = 12;
19
-        final int actual = triplet.calculateSum();
18
+        int expected = 12;
19
+        int actual = triplet.calculateSum();
20
         assertEquals(expected, actual);
20
         assertEquals(expected, actual);
21
     }
21
     }
22
 
22
 
24
     @Test
24
     @Test
25
     public void shouldCalculateProduct() {
25
     public void shouldCalculateProduct() {
26
         PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
26
         PythagoreanTriplet triplet = new PythagoreanTriplet(3, 4, 5);
27
-        final long expected = 60l;
28
-        final long actual = triplet.calculateProduct();
27
+        long expected = 60l;
28
+        long actual = triplet.calculateProduct();
29
         assertEquals(expected, actual);
29
         assertEquals(expected, actual);
30
     }
30
     }
31
 
31
 
46
     @Ignore("Remove to run test")
46
     @Ignore("Remove to run test")
47
     @Test
47
     @Test
48
     public void shouldMakeTripletsUpToTen() {
48
     public void shouldMakeTripletsUpToTen() {
49
-        final List<Long> actual
49
+        List<Long> actual
50
                 = PythagoreanTriplet
50
                 = PythagoreanTriplet
51
                         .makeTripletsList()
51
                         .makeTripletsList()
52
                         .withFactorsLessThanOrEqualTo(10)
52
                         .withFactorsLessThanOrEqualTo(10)
55
                         .map(t -> t.calculateProduct())
55
                         .map(t -> t.calculateProduct())
56
                         .sorted()
56
                         .sorted()
57
                         .collect(Collectors.toList());
57
                         .collect(Collectors.toList());
58
-        final List<Long> expected = Arrays.asList(60l, 480l);
58
+        List<Long> expected = Arrays.asList(60l, 480l);
59
         assertEquals(expected, actual);
59
         assertEquals(expected, actual);
60
     }
60
     }
61
 
61
 
62
     @Ignore("Remove to run test")
62
     @Ignore("Remove to run test")
63
     @Test
63
     @Test
64
     public void shouldMakeTripletsElevenToTwenty() {
64
     public void shouldMakeTripletsElevenToTwenty() {
65
-        final List<Long> actual
65
+        List<Long> actual
66
                 = PythagoreanTriplet
66
                 = PythagoreanTriplet
67
                         .makeTripletsList()
67
                         .makeTripletsList()
68
                         .withFactorsGreaterThanOrEqualTo(11)
68
                         .withFactorsGreaterThanOrEqualTo(11)
72
                         .map(t -> t.calculateProduct())
72
                         .map(t -> t.calculateProduct())
73
                         .sorted((p1, p2) -> Double.compare(p1, p2))
73
                         .sorted((p1, p2) -> Double.compare(p1, p2))
74
                         .collect(Collectors.toList());
74
                         .collect(Collectors.toList());
75
-        final List<Long> expected = Arrays.asList(3840l);
75
+        List<Long> expected = Arrays.asList(3840l);
76
         assertEquals(expected, actual);
76
         assertEquals(expected, actual);
77
     }
77
     }
78
 
78
 
79
     @Ignore("Remove to run test")
79
     @Ignore("Remove to run test")
80
     @Test
80
     @Test
81
     public void shouldMakeTripletsAndFilterOnSum() {
81
     public void shouldMakeTripletsAndFilterOnSum() {
82
-        final List<Long> actual
82
+        List<Long> actual
83
                 = PythagoreanTriplet
83
                 = PythagoreanTriplet
84
                         .makeTripletsList()
84
                         .makeTripletsList()
85
                         .withFactorsLessThanOrEqualTo(100)
85
                         .withFactorsLessThanOrEqualTo(100)
89
                         .map(t -> t.calculateProduct())
89
                         .map(t -> t.calculateProduct())
90
                         .sorted((p1, p2) -> Double.compare(p1, p2))
90
                         .sorted((p1, p2) -> Double.compare(p1, p2))
91
                         .collect(Collectors.toList());
91
                         .collect(Collectors.toList());
92
-        final List<Long> expected = Arrays.asList(118080l, 168480l, 202500l);
92
+        List<Long> expected = Arrays.asList(118080l, 168480l, 202500l);
93
         assertEquals(expected, actual);
93
         assertEquals(expected, actual);
94
     }
94
     }
95
 }
95
 }