Просмотр исходного кода

Merge pull request #1303 from Kyle-P/patch-3

Update RaindropConverterTest.java
Sam Warner 8 лет назад
Родитель
Сommit
a8a720dbfa
Аккаунт пользователя с таким Email не найден
1 измененных файлов: 57 добавлений и 38 удалений
  1. 57
    38
      exercises/raindrops/src/test/java/RaindropConverterTest.java

+ 57
- 38
exercises/raindrops/src/test/java/RaindropConverterTest.java Просмотреть файл

1
 import org.junit.Test;
1
 import org.junit.Test;
2
 import org.junit.Ignore;
2
 import org.junit.Ignore;
3
-import org.junit.runner.RunWith;
4
-import org.junit.runners.Parameterized;
5
-import org.junit.runners.Parameterized.Parameters;
6
 
3
 
7
 import java.util.Arrays;
4
 import java.util.Arrays;
8
 import java.util.Collection;
5
 import java.util.Collection;
9
 
6
 
10
 import static org.junit.Assert.assertEquals;
7
 import static org.junit.Assert.assertEquals;
11
 
8
 
12
-@RunWith(Parameterized.class)
13
 public class RaindropConverterTest {
9
 public class RaindropConverterTest {
14
 
10
 
15
-    private int inputNumber;
16
-    private String outputFromRaindropConversion;
11
+    private RaindropConverter raindropConverter = new RaindropConverter();
17
 
12
 
18
-    @Parameters(name = "{index}: expected input number {0} to be converted to \"{1}\"")
19
-    public static Collection<Object[]> data() {
20
-        return Arrays.asList(new Object[][]{
21
-                // Non-primes
22
-                {1, "1"},
23
-                {8, "8"},
24
-                {52, "52"},
13
+    @Test
14
+    public void soundFor1Is1() {
15
+        assertEquals("1", raindropConverter.convert(1));
16
+    }
25
 
17
 
26
-                // Numbers with 3 as a prime factor
27
-                {3, "Pling"},
28
-                {6, "Pling"},
29
-                {9, "Pling"},
30
-                {27, "Pling"},
18
+    @Ignore("Remove to run test")
19
+    @Test
20
+    public void soundFor3OrNumberWithOnlyDistinctFactorOf3() {
21
+        assertEquals("Pling", raindropConverter.convert(3));
22
+        assertEquals("Pling", raindropConverter.convert(6));
23
+        assertEquals("Pling", raindropConverter.convert(9));
24
+        assertEquals("Pling", raindropConverter.convert(27));
25
+    }
31
 
26
 
32
-                // Numbers with 5 as a prime factor
33
-                {5, "Plang"},
34
-                {10, "Plang"},
35
-                {25, "Plang"},
36
-                {3125, "Plang"},
27
+    @Ignore("Remove to run test")
28
+    @Test
29
+    public void soundFor5OrNumberWithOnlyDistinctFactorOf5IsPlang() {
30
+        assertEquals("Plang", raindropConverter.convert(5));
31
+        assertEquals("Plang", raindropConverter.convert(10));
32
+        assertEquals("Plang", raindropConverter.convert(25));
33
+        assertEquals("Plang", raindropConverter.convert(3125));
34
+    }
37
 
35
 
38
-                // Numbers with 7 as a prime factor
39
-                {7, "Plong"},
40
-                {14, "Plong"},
41
-                {49, "Plong"},
36
+    @Ignore("Remove to run test")
37
+    @Test
38
+    public void soundFor7OrNumberWithOnlyDistinctFactorOf7IsPlong() {
39
+        assertEquals("Plong", raindropConverter.convert(7));
40
+        assertEquals("Plong", raindropConverter.convert(14));
41
+        assertEquals("Plong", raindropConverter.convert(49));
42
+    }
42
 
43
 
43
-                // Numbers with multiple activating prime factors
44
-                {15, "PlingPlang"},
45
-                {21, "PlingPlong"},
46
-                {35, "PlangPlong"},
47
-                {105, "PlingPlangPlong"},
48
-        });
44
+    @Ignore("Remove to run test")
45
+    @Test
46
+    public void noSoundFor2Cubed() {
47
+        assertEquals("8", raindropConverter.convert(8));
49
     }
48
     }
50
 
49
 
51
-    public RaindropConverterTest(int inputNumber, String outputFromRaindropConversion) {
52
-        this.inputNumber = inputNumber;
53
-        this.outputFromRaindropConversion = outputFromRaindropConversion;
50
+    @Ignore("Remove to run test")
51
+    @Test
52
+    public void soundFor15IsPlingPlang() {
53
+        assertEquals("PlingPlang", raindropConverter.convert(15));
54
     }
54
     }
55
 
55
 
56
+    @Ignore("Remove to run test")
57
+    @Test
58
+    public void soundFor21IsPlingPlong() {
59
+        assertEquals("PlingPlong", raindropConverter.convert(21));
60
+    }
61
+
62
+    @Ignore("Remove to run test")
63
+    @Test
64
+    public void soundFor35IsPlangPlong() {
65
+        assertEquals("PlangPlong", raindropConverter.convert(35));
66
+    }
56
 
67
 
68
+    @Ignore("Remove to run test")
57
     @Test
69
     @Test
58
-    public void test() {
59
-        assertEquals(outputFromRaindropConversion, new RaindropConverter().convert(inputNumber));
70
+    public void noSoundFor52() {
71
+        assertEquals("52", raindropConverter.convert(52));
60
     }
72
     }
73
+
74
+    @Ignore("Remove to run test")
75
+    @Test
76
+    public void soundFor105IsPlingPlangPlong() {
77
+        assertEquals("PlingPlangPlong", raindropConverter.convert(105));
78
+    }
79
+
61
 }
80
 }