Zaldrick 9 лет назад
Родитель
Сommit
29a77385fa
2 измененных файлов: 19 добавлений и 29 удалений
  1. 0
    10
      exercises/poker/src/main/java/Poker.java
  2. 19
    19
      exercises/poker/src/test/java/PokerTest.java

+ 0
- 10
exercises/poker/src/main/java/Poker.java Просмотреть файл

1
-import java.util.List;
2
-
3
 public class Poker {
1
 public class Poker {
4
-
5
-	Poker(List<String> hands) {
6
-        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
7
-    }
8
-
9
-	List<String> bestHands() {
10
-        throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
11
-	}
12
 }
2
 }

+ 19
- 19
exercises/poker/src/test/java/PokerTest.java Просмотреть файл

4
 
4
 
5
 import org.junit.Test;
5
 import org.junit.Test;
6
 
6
 
7
-import jdk.nashorn.internal.ir.annotations.Ignore;
7
+import org.junit.Ignore;
8
 
8
 
9
 public class PokerTest {
9
 public class PokerTest {
10
     @Test
10
     @Test
14
     }
14
     }
15
 
15
 
16
     @Test
16
     @Test
17
-    @Ignore
17
+    @Ignore("Remove to run test")
18
     public void nothingVsOnePair() {
18
     public void nothingVsOnePair() {
19
         final String nothing = "4S 5H 6S 8D JH";
19
         final String nothing = "4S 5H 6S 8D JH";
20
         final String pairOf4 = "2S 4H 6S 4D JH";
20
         final String pairOf4 = "2S 4H 6S 4D JH";
22
     }
22
     }
23
 
23
 
24
     @Test
24
     @Test
25
-    @Ignore
25
+    @Ignore("Remove to run test")
26
     public void twoPairs() {
26
     public void twoPairs() {
27
         final String pairOf2 = "4S 2H 6S 2D JH";
27
         final String pairOf2 = "4S 2H 6S 2D JH";
28
         final String pairOf4 = "2S 4H 6S 4D JH";
28
         final String pairOf4 = "2S 4H 6S 4D JH";
30
     }
30
     }
31
 
31
 
32
     @Test
32
     @Test
33
-    @Ignore
33
+    @Ignore("Remove to run test")
34
     public void onePairVsDoublePair() {
34
     public void onePairVsDoublePair() {
35
         final String pairOf8 = "2S 8H 6S 8D JH";
35
         final String pairOf8 = "2S 8H 6S 8D JH";
36
         final String doublePair = "4S 5H 4S 8D 5H";
36
         final String doublePair = "4S 5H 4S 8D 5H";
38
     }
38
     }
39
 
39
 
40
     @Test
40
     @Test
41
-    @Ignore
41
+    @Ignore("Remove to run test")
42
     public void twoDoublePairs() {
42
     public void twoDoublePairs() {
43
         final String doublePair2And8 = "2S 8H 2S 8D JH";
43
         final String doublePair2And8 = "2S 8H 2S 8D JH";
44
         final String doublePair4And5 = "4S 5H 4S 8D 5H";
44
         final String doublePair4And5 = "4S 5H 4S 8D 5H";
46
     }
46
     }
47
 
47
 
48
     @Test
48
     @Test
49
-    @Ignore
49
+    @Ignore("Remove to run test")
50
     public void doublePairVsThree() {
50
     public void doublePairVsThree() {
51
         final String doublePair2And8 = "2S 8H 2S 8D JH";
51
         final String doublePair2And8 = "2S 8H 2S 8D JH";
52
         final String threeOf4 = "4S 5H 4S 8D 4H";
52
         final String threeOf4 = "4S 5H 4S 8D 4H";
54
     }
54
     }
55
 
55
 
56
     @Test
56
     @Test
57
-    @Ignore
57
+    @Ignore("Remove to run test")
58
     public void twoThrees() {
58
     public void twoThrees() {
59
         final String threeOf2 = "2S 2H 2S 8D JH";
59
         final String threeOf2 = "2S 2H 2S 8D JH";
60
         final String threeOf1 = "4S AH AS 8D AH";
60
         final String threeOf1 = "4S AH AS 8D AH";
62
     }
62
     }
63
 
63
 
64
     @Test
64
     @Test
65
-    @Ignore
65
+    @Ignore("Remove to run test")
66
     public void threeVsStraight() {
66
     public void threeVsStraight() {
67
         final String threeOf4 = "4S 5H 4S 8D 4H";
67
         final String threeOf4 = "4S 5H 4S 8D 4H";
68
         final String straight = "3S 4H 2S 6D 5H";
68
         final String straight = "3S 4H 2S 6D 5H";
70
     }
70
     }
71
 
71
 
72
     @Test
72
     @Test
73
-    @Ignore
73
+    @Ignore("Remove to run test")
74
     public void twoStraights() {
74
     public void twoStraights() {
75
         final String straightTo8 = "4S 6H 7S 8D 5H";
75
         final String straightTo8 = "4S 6H 7S 8D 5H";
76
         final String straightTo9 = "5S 7H 8S 9D 6H";
76
         final String straightTo9 = "5S 7H 8S 9D 6H";
82
     }
82
     }
83
 
83
 
84
     @Test
84
     @Test
85
-    @Ignore
85
+    @Ignore("Remove to run test")
86
     public void straightVsFlush() {
86
     public void straightVsFlush() {
87
         final String straightTo8 = "4S 6H 7S 8D 5H";
87
         final String straightTo8 = "4S 6H 7S 8D 5H";
88
         final String flushTo7 = "2S 4S 5S 6S 7S";
88
         final String flushTo7 = "2S 4S 5S 6S 7S";
90
     }
90
     }
91
 
91
 
92
     @Test
92
     @Test
93
-    @Ignore
93
+    @Ignore("Remove to run test")
94
     public void twoFlushes() {
94
     public void twoFlushes() {
95
         final String flushTo8 = "3H 6H 7H 8H 5H";
95
         final String flushTo8 = "3H 6H 7H 8H 5H";
96
         final String flushTo7 = "2S 4S 5S 6S 7S";
96
         final String flushTo7 = "2S 4S 5S 6S 7S";
98
     }
98
     }
99
 
99
 
100
     @Test
100
     @Test
101
-    @Ignore
101
+    @Ignore("Remove to run test")
102
     public void flushVsFull() {
102
     public void flushVsFull() {
103
         final String flushTo8 = "3H 6H 7H 8H 5H";
103
         final String flushTo8 = "3H 6H 7H 8H 5H";
104
         final String full = "4S 5H 4S 5D 4H";
104
         final String full = "4S 5H 4S 5D 4H";
106
     }
106
     }
107
 
107
 
108
     @Test
108
     @Test
109
-    @Ignore
109
+    @Ignore("Remove to run test")
110
     public void twoFulls() {
110
     public void twoFulls() {
111
         final String fullOf4By9 = "4H 4S 4D 9S 9D";
111
         final String fullOf4By9 = "4H 4S 4D 9S 9D";
112
         final String fullOf5By8 = "5H 5S 5D 8S 8D";
112
         final String fullOf5By8 = "5H 5S 5D 8S 8D";
114
     }
114
     }
115
 
115
 
116
     @Test
116
     @Test
117
-    @Ignore
117
+    @Ignore("Remove to run test")
118
     public void fullVsSquare() {
118
     public void fullVsSquare() {
119
         final String full = "4S 5H 4S 5D 4H";
119
         final String full = "4S 5H 4S 5D 4H";
120
         final String squareOf3 = "3S 3H 2S 3D 3H";
120
         final String squareOf3 = "3S 3H 2S 3D 3H";
122
     }
122
     }
123
 
123
 
124
     @Test
124
     @Test
125
-    @Ignore
125
+    @Ignore("Remove to run test")
126
     public void twoSquares() {
126
     public void twoSquares() {
127
         final String squareOf2 = "2S 2H 2S 8D 2H";
127
         final String squareOf2 = "2S 2H 2S 8D 2H";
128
         final String squareOf5 = "4S 5H 5S 5D 5H";
128
         final String squareOf5 = "4S 5H 5S 5D 5H";
130
     }
130
     }
131
 
131
 
132
     @Test
132
     @Test
133
-    @Ignore
133
+    @Ignore("Remove to run test")
134
     public void squareVsStraightFlush() {
134
     public void squareVsStraightFlush() {
135
         final String squareOf5 = "4S 5H 5S 5D 5H";
135
         final String squareOf5 = "4S 5H 5S 5D 5H";
136
         final String straightFlushTo9 = "5S 7S 8S 9S 6S";
136
         final String straightFlushTo9 = "5S 7S 8S 9S 6S";
138
     }
138
     }
139
 
139
 
140
     @Test
140
     @Test
141
-    @Ignore
141
+    @Ignore("Remove to run test")
142
     public void twoStraightFlushes() {
142
     public void twoStraightFlushes() {
143
         final String straightFlushTo8 = "4H 6H 7H 8H 5H";
143
         final String straightFlushTo8 = "4H 6H 7H 8H 5H";
144
         final String straightFlushTo9 = "5S 7S 8S 9S 6S";
144
         final String straightFlushTo9 = "5S 7S 8S 9S 6S";
146
     }
146
     }
147
 
147
 
148
     @Test
148
     @Test
149
-    @Ignore
149
+    @Ignore("Remove to run test")
150
     public void threeHandWithTie() {
150
     public void threeHandWithTie() {
151
         final String spadeStraightTo9 = "9S 8S 7S 6S 5S";
151
         final String spadeStraightTo9 = "9S 8S 7S 6S 5S";
152
         final String diamondStraightTo9 = "9D 8D 7D 6D 5D";
152
         final String diamondStraightTo9 = "9D 8D 7D 6D 5D";
155
     }
155
     }
156
 
156
 
157
     @Test
157
     @Test
158
-    @Ignore
158
+    @Ignore("Remove to run test")
159
     public void straightTo5AgainstAPairOfJacks() {
159
     public void straightTo5AgainstAPairOfJacks() {
160
         final String straightTo5 = "2S 4D 5C 3S AS";
160
         final String straightTo5 = "2S 4D 5C 3S AS";
161
         final String twoJacks = "JD 8D 7D JC 5D";
161
         final String twoJacks = "JD 8D 7D JC 5D";