Browse Source

Corrected test parameter order (fixes #34)

Piet van Dongen 11 years ago
parent
commit
7407b1e680

+ 5
- 5
gigasecond/src/test/java/GigasecondTest.java View File

@@ -12,34 +12,34 @@ public class GigasecondTest {
12 12
     public void modernTime() {
13 13
         Gigasecond gigaSecond = new Gigasecond(LocalDate.of(2011, Month.APRIL, 25));
14 14
 
15
-        assertEquals(gigaSecond.getDate(), LocalDateTime.of(2043, Month.JANUARY, 1, 1, 46, 40));
15
+        assertEquals(LocalDateTime.of(2043, Month.JANUARY, 1, 1, 46, 40), gigaSecond.getDate());
16 16
     }
17 17
 
18 18
     @Test
19 19
     public void afterEpochTime() {
20 20
         Gigasecond gigaSecond = new Gigasecond(LocalDate.of(1977, Month.JUNE, 13));
21 21
 
22
-        assertEquals(gigaSecond.getDate(), LocalDateTime.of(2009, Month.FEBRUARY, 19, 1, 46, 40));
22
+        assertEquals(LocalDateTime.of(2009, Month.FEBRUARY, 19, 1, 46, 40), gigaSecond.getDate());
23 23
     }
24 24
 
25 25
     @Test
26 26
     public void beforeEpochTime() {
27 27
         Gigasecond gigaSecond = new Gigasecond(LocalDate.of(1959, Month.JULY, 19));
28 28
 
29
-        assertEquals(gigaSecond.getDate(), LocalDateTime.of(1991, Month.MARCH, 27, 1, 46, 40));
29
+        assertEquals(LocalDateTime.of(1991, Month.MARCH, 27, 1, 46, 40), gigaSecond.getDate());
30 30
     }
31 31
 
32 32
     @Test
33 33
     public void withFullTimeSpecified() {
34 34
         Gigasecond gigaSecond = new Gigasecond(LocalDateTime.of(2015, Month.JANUARY, 24, 22, 0, 0));
35 35
 
36
-        assertEquals(gigaSecond.getDate(), LocalDateTime.of(2046, Month.OCTOBER, 2, 23, 46, 40));
36
+        assertEquals(LocalDateTime.of(2046, Month.OCTOBER, 2, 23, 46, 40), gigaSecond.getDate());
37 37
     }
38 38
 
39 39
     @Test
40 40
     public void withFullTimeSpecifiedAndDayRollover() {
41 41
         Gigasecond gigaSecond = new Gigasecond(LocalDateTime.of(2015, Month.JANUARY, 24, 23, 59, 59));
42 42
 
43
-        assertEquals(gigaSecond.getDate(), LocalDateTime.of(2046, Month.OCTOBER, 3, 1, 46, 39));
43
+        assertEquals(LocalDateTime.of(2046, Month.OCTOBER, 3, 1, 46, 39), gigaSecond.getDate());
44 44
     }
45 45
 }

+ 2
- 0
hamming/src/main/java/Hamming.java View File

@@ -0,0 +1,2 @@
1
+public class Hamming {
2
+}

+ 1
- 1
roman-numerals/src/test/java/RomanNumeralsTest.java View File

@@ -48,6 +48,6 @@ public class RomanNumeralsTest {
48 48
     public void convertArabicNumberalToRomanNumeral() {
49 49
         RomanNumeral romanNumeral = new RomanNumeral(input);
50 50
 
51
-        assertEquals(romanNumeral.getRomanNumeral(), expectedOutput);
51
+        assertEquals(expectedOutput, romanNumeral.getRomanNumeral());
52 52
     }
53 53
 }

+ 28
- 53
scrabble-score/src/test/java/ScrabbleScoreTest.java View File

@@ -1,67 +1,42 @@
1 1
 import org.junit.Test;
2
+import org.junit.runner.RunWith;
3
+import org.junit.runners.Parameterized;
2 4
 
3
-public class ScrabbleScoreTest {
4
-
5
-    @Test
6
-    public void emptyWordScoresZero() {
7
-        Scrabble scrabble = new Scrabble("");
8
-
9
-        assertEquals(scrabble.getScore(), 0);
10
-    }
11
-
12
-    @Test
13
-    public void whitespaceWordScoresZero() {
14
-        Scrabble scrabble = new Scrabble(" \t\n");
5
+import java.util.Arrays;
6
+import java.util.Collection;
15 7
 
16
-        assertEquals(scrabble.getScore(), 0);
17
-    }
18
-
19
-    @Test
20
-    public void nullScoresZero() {
21
-        Scrabble scrabble = new Scrabble(null);
22
-
23
-        assertEquals(scrabble.getScore(), 0);
24
-    }
25
-
26
-    @Test
27
-    public void scoresVeryShortWord() {
28
-        Scrabble scrabble = new Scrabble("a");
8
+import static org.junit.Assert.assertEquals;
29 9
 
30
-        assertEquals(scrabble.getScore(), 1);
31
-    }
32
-
33
-    @Test
34
-    public void scoresAnotherVeryShortWord() {
35
-        Scrabble scrabble = new Scrabble("f");
36
-
37
-        assertEquals(scrabble.getScore(), 4);
38
-    }
39
-
40
-    @Test
41
-    public void simpleWordScoresTheNumberOfLetters() {
42
-        Scrabble scrabble = new Scrabble("street");
43
-
44
-        assertEquals(scrabble.getScore(), 6);
45
-    }
10
+@RunWith(Parameterized.class)
11
+public class ScrabbleScoreTest {
46 12
 
47
-    @Test
48
-    public void complicatedWordScoresMore() {
49
-        Scrabble scrabble = new Scrabble("quirky");
13
+    private String input;
14
+    private int expectedOutput;
50 15
 
51
-        assertEquals(scrabble.getScore(), 22);
16
+    @Parameterized.Parameters
17
+    public static Collection<Object[]> data() {
18
+        return Arrays.asList(new Object[][]{
19
+                {"", 0},
20
+                {" \t\n", 0},
21
+                {null, 0},
22
+                {"a", 1},
23
+                {"f", 4},
24
+                {"street", 6},
25
+                {"quirky", 22},
26
+                {"MULTIBILLIONAIRE", 20},
27
+                {"alacrity", 13},
28
+        });
52 29
     }
53 30
 
54
-    @Test
55
-    public void scoresAreCaseInsensitive() {
56
-        Scrabble scrabble = new Scrabble("MULTIBILLIONAIRE");
57
-
58
-        assertEquals(scrabble.getScore(), 20);
31
+    public ScrabbleScoreTest(String input, int expectedOutput) {
32
+        this.input = input;
33
+        this.expectedOutput = expectedOutput;
59 34
     }
60 35
 
61 36
     @Test
62
-    public void convenientScoring() {
63
-        Scrabble scrabble = new Scrabble("alacrity");
37
+    public void test() {
38
+        Scrabble scrabble = new Scrabble(input);
64 39
 
65
-        assertEquals(scrabble.getScore(), 13);
40
+        assertEquals(expectedOutput, scrabble.getScore());
66 41
     }
67 42
 }

+ 18
- 16
space-age/src/test/java/SpaceAgeTest.java View File

@@ -1,5 +1,7 @@
1 1
 import org.junit.Test;
2 2
 
3
+import static org.junit.Assert.assertEquals;
4
+
3 5
 public class SpaceAgeTest {
4 6
 
5 7
     private static final double MAXIMUM_DELTA = 1E-02;
@@ -8,69 +10,69 @@ public class SpaceAgeTest {
8 10
     public void ageInSeconds() {
9 11
         SpaceAge age = new SpaceAge(1000000);
10 12
 
11
-        assertEquals(age.getSeconds(), 1000000, MAXIMUM_DELTA);
13
+        assertEquals(1000000, age.getSeconds(), MAXIMUM_DELTA);
12 14
     }
13 15
 
14 16
     @Test
15 17
     public void ageOnEarth() {
16 18
         SpaceAge age = new SpaceAge(1000000000);
17 19
 
18
-        assertEquals(age.onEarth(), 31.69, MAXIMUM_DELTA);
20
+        assertEquals(31.69, age.onEarth(), MAXIMUM_DELTA);
19 21
     }
20 22
 
21 23
     @Test
22 24
     public void ageOnMercury() {
23 25
         SpaceAge age = new SpaceAge(2134835688);
24 26
 
25
-        assertEquals(age.onEarth(), 67.65, MAXIMUM_DELTA);
26
-        assertEquals(age.onMercury(), 280.88, MAXIMUM_DELTA);
27
+        assertEquals(67.65, age.onEarth(), MAXIMUM_DELTA);
28
+        assertEquals(280.88, age.onMercury(), MAXIMUM_DELTA);
27 29
     }
28 30
 
29 31
     @Test
30 32
     public void ageOnVenus() {
31 33
         SpaceAge age = new SpaceAge(189839836);
32 34
 
33
-        assertEquals(age.onEarth(), 6.02, MAXIMUM_DELTA);
34
-        assertEquals(age.onVenus(), 9.78, MAXIMUM_DELTA);
35
+        assertEquals(6.02, age.onEarth(), MAXIMUM_DELTA);
36
+        assertEquals(9.78, age.onVenus(), MAXIMUM_DELTA);
35 37
     }
36 38
 
37 39
     @Test
38 40
     public void ageOnMars() {
39 41
         SpaceAge age = new SpaceAge(2329871239L);
40 42
 
41
-        assertEquals(age.onEarth(), 73.83, MAXIMUM_DELTA);
42
-        assertEquals(age.onMars(), 39.25, MAXIMUM_DELTA);
43
+        assertEquals(73.83, age.onEarth(), MAXIMUM_DELTA);
44
+        assertEquals(39.25, age.onMars(), MAXIMUM_DELTA);
43 45
     }
44 46
 
45 47
     @Test
46 48
     public void ageOnJupiter() {
47 49
         SpaceAge age = new SpaceAge(901876382);
48 50
 
49
-        assertEquals(age.onEarth(), 28.58, MAXIMUM_DELTA);
50
-        assertEquals(age.onJupiter(), 2.41, MAXIMUM_DELTA);
51
+        assertEquals(28.58, age.onEarth(), MAXIMUM_DELTA);
52
+        assertEquals(2.41, age.onJupiter(), MAXIMUM_DELTA);
51 53
     }
52 54
 
53 55
     @Test
54 56
     public void ageOnSaturn() {
55 57
         SpaceAge age = new SpaceAge(3000000000L);
56 58
 
57
-        assertEquals(age.onEarth(), 95.06, MAXIMUM_DELTA);
58
-        assertEquals(age.onSaturn(), 3.23, MAXIMUM_DELTA);
59
+        assertEquals(95.06, age.onEarth(), MAXIMUM_DELTA);
60
+        assertEquals(3.23, age.onSaturn(), MAXIMUM_DELTA);
59 61
     }
60 62
 
61 63
     @Test
62 64
     public void ageOnUranus() {
63 65
         SpaceAge age = new SpaceAge(3210123456L);
64 66
 
65
-        assertEquals(age.onEarth(), 101.72, MAXIMUM_DELTA);
66
-        assertEquals(age.onUranus(), 1.21, MAXIMUM_DELTA);
67
+        assertEquals(101.72, age.onEarth(), MAXIMUM_DELTA);
68
+        assertEquals(1.21, age.onUranus(), MAXIMUM_DELTA);
67 69
     }
68 70
 
69 71
     @Test
70 72
     public void ageOnNeptune() {
71 73
         SpaceAge age = new SpaceAge(8210123456L);
72 74
 
73
-        assertEquals(age.onEarth(), 260.16, MAXIMUM_DELTA);
74
-        assertEquals(age.onNeptune(), 1.58, MAXIMUM_DELTA);
75
+        assertEquals(260.16, age.onEarth(), MAXIMUM_DELTA);
76
+        assertEquals(1.58, age.onNeptune(), MAXIMUM_DELTA);
75 77
     }
76 78
 }

+ 10
- 10
triangle/src/test/java/TriangleTest.java View File

@@ -8,70 +8,70 @@ public class TriangleTest {
8 8
     public void equilateralTriangleHaveEqualSides() throws Exception {
9 9
         Triangle triangle = new Triangle(2, 2, 2);
10 10
 
11
-        assertEquals(triangle.getKind(), TriangleKind.EQUILATERAL);
11
+        assertEquals(TriangleKind.EQUILATERAL, triangle.getKind());
12 12
     }
13 13
 
14 14
     @Test
15 15
     public void largerEquilateralTrianglesAlsoHaveEqualSides() throws Exception {
16 16
         Triangle triangle = new Triangle(10, 10, 10);
17 17
 
18
-        assertEquals(triangle.getKind(), TriangleKind.EQUILATERAL);
18
+        assertEquals(TriangleKind.EQUILATERAL, triangle.getKind());
19 19
     }
20 20
 
21 21
     @Test
22 22
     public void isoscelesTrianglesHaveLastTwoSidesEqual() throws Exception {
23 23
         Triangle triangle = new Triangle(3, 4, 4);
24 24
 
25
-        assertEquals(triangle.getKind(), TriangleKind.ISOSCELES);
25
+        assertEquals(TriangleKind.ISOSCELES, triangle.getKind());
26 26
     }
27 27
 
28 28
     @Test
29 29
     public void isoscelesTrianglesHaveFirstAndLastSidesEqual() throws Exception {
30 30
         Triangle triangle = new Triangle(4, 3, 4);
31 31
 
32
-        assertEquals(triangle.getKind(), TriangleKind.ISOSCELES);
32
+        assertEquals(TriangleKind.ISOSCELES, triangle.getKind());
33 33
     }
34 34
 
35 35
     @Test
36 36
     public void isoscelesTrianglesHaveTwoFirstSidesEqual() throws Exception {
37 37
         Triangle triangle = new Triangle(4, 4, 3);
38 38
 
39
-        assertEquals(triangle.getKind(), TriangleKind.ISOSCELES);
39
+        assertEquals(TriangleKind.ISOSCELES, triangle.getKind());
40 40
     }
41 41
 
42 42
     @Test
43 43
     public void isoscelesTrianglesHaveInFactExactlyTwoSidesEqual() throws Exception {
44 44
         Triangle triangle = new Triangle(10, 10, 2);
45 45
 
46
-        assertEquals(triangle.getKind(), TriangleKind.ISOSCELES);
46
+        assertEquals(TriangleKind.ISOSCELES, triangle.getKind());
47 47
     }
48 48
 
49 49
     @Test
50 50
     public void scaleneTrianglesHaveNoEqualSides() throws Exception {
51 51
         Triangle triangle = new Triangle(3, 4, 5);
52 52
 
53
-        assertEquals(triangle.getKind(), TriangleKind.SCALENE);
53
+        assertEquals(TriangleKind.SCALENE, triangle.getKind());
54 54
     }
55 55
 
56 56
     @Test
57 57
     public void scaleneTrianglesHaveNoEqualSidesAtLargerScaleEither() throws Exception {
58 58
         Triangle triangle = new Triangle(10, 11, 12);
59 59
 
60
-        assertEquals(triangle.getKind(), TriangleKind.SCALENE);
60
+        assertEquals(TriangleKind.SCALENE, triangle.getKind());
61 61
     }
62 62
 
63 63
     @Test
64 64
     public void scaleneTrianglesHaveNoEqualSidesInDescendingOrderEither() throws Exception {
65 65
         Triangle triangle = new Triangle(5, 4, 2);
66 66
 
67
-        assertEquals(triangle.getKind(), TriangleKind.SCALENE);
67
+        assertEquals(TriangleKind.SCALENE, triangle.getKind());
68 68
     }
69 69
 
70 70
     @Test
71 71
     public void verySmallTrianglesAreLegal() throws Exception {
72 72
         Triangle triangle = new Triangle(0.4, 0.6, 0.3);
73 73
 
74
-        assertEquals(triangle.getKind(), TriangleKind.SCALENE);
74
+        assertEquals(TriangleKind.SCALENE, triangle.getKind());
75 75
     }
76 76
 
77 77
     @Test(expected = TriangleException.class)