Skip to content

Commit 77e17ad

Browse files
Sprootchlapin
Sprootch
and
lapin
authored
Fix StateOfTicTacToe tests (#1323)
* Fix StateOfTicTacToe tests * Update Example.fs gamestate -> gameState --------- Co-authored-by: lapin <[email protected]>
1 parent 4846ed3 commit 77e17ad

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎exercises/practice/state-of-tic-tac-toe/.meta/Example.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let won (player: Cell) (board: Board) =
2323
|| Array.init 3 (fun i -> board[*, i])
2424
|> Array.contains winning
2525

26-
let gamestate (board: Board) =
26+
let gameState (board: Board) =
2727
let numCells cell =
2828
board
2929
|> Seq.cast

‎exercises/practice/state-of-tic-tac-toe/StateOfTicTacToeTests.fs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let ``Finished game where X won via left column victory`` () =
1212
['X'; ' '; ' '];
1313
['X'; ' '; ' '] ]
1414
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
15-
gamestate board |> should equal expected
15+
gameState board |> should equal expected
1616

1717
[<Fact(Skip = "Remove this Skip property to run this test")>]
1818
let ``Finished game where X won via middle column victory`` () =
@@ -21,7 +21,7 @@ let ``Finished game where X won via middle column victory`` () =
2121
[' '; 'X'; ' '];
2222
[' '; 'X'; ' '] ]
2323
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
24-
gamestate board |> should equal expected
24+
gameState board |> should equal expected
2525

2626
[<Fact(Skip = "Remove this Skip property to run this test")>]
2727
let ``Finished game where X won via right column victory`` () =
@@ -30,7 +30,7 @@ let ``Finished game where X won via right column victory`` () =
3030
[' '; ' '; 'X'];
3131
[' '; ' '; 'X'] ]
3232
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
33-
gamestate board |> should equal expected
33+
gameState board |> should equal expected
3434

3535
[<Fact(Skip = "Remove this Skip property to run this test")>]
3636
let ``Finished game where O won via left column victory`` () =
@@ -39,7 +39,7 @@ let ``Finished game where O won via left column victory`` () =
3939
['O'; 'X'; ' '];
4040
['O'; ' '; ' '] ]
4141
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
42-
gamestate board |> should equal expected
42+
gameState board |> should equal expected
4343

4444
[<Fact(Skip = "Remove this Skip property to run this test")>]
4545
let ``Finished game where O won via middle column victory`` () =
@@ -48,7 +48,7 @@ let ``Finished game where O won via middle column victory`` () =
4848
[' '; 'O'; 'X'];
4949
[' '; 'O'; ' '] ]
5050
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
51-
gamestate board |> should equal expected
51+
gameState board |> should equal expected
5252

5353
[<Fact(Skip = "Remove this Skip property to run this test")>]
5454
let ``Finished game where O won via right column victory`` () =
@@ -57,7 +57,7 @@ let ``Finished game where O won via right column victory`` () =
5757
[' '; 'X'; 'O'];
5858
[' '; ' '; 'O'] ]
5959
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
60-
gamestate board |> should equal expected
60+
gameState board |> should equal expected
6161

6262
[<Fact(Skip = "Remove this Skip property to run this test")>]
6363
let ``Finished game where X won via top row victory`` () =
@@ -66,7 +66,7 @@ let ``Finished game where X won via top row victory`` () =
6666
['X'; 'O'; 'O'];
6767
['O'; ' '; ' '] ]
6868
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
69-
gamestate board |> should equal expected
69+
gameState board |> should equal expected
7070

7171
[<Fact(Skip = "Remove this Skip property to run this test")>]
7272
let ``Finished game where X won via middle row victory`` () =
@@ -75,7 +75,7 @@ let ``Finished game where X won via middle row victory`` () =
7575
['X'; 'X'; 'X'];
7676
[' '; 'O'; ' '] ]
7777
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
78-
gamestate board |> should equal expected
78+
gameState board |> should equal expected
7979

8080
[<Fact(Skip = "Remove this Skip property to run this test")>]
8181
let ``Finished game where X won via bottom row victory`` () =
@@ -84,7 +84,7 @@ let ``Finished game where X won via bottom row victory`` () =
8484
['O'; ' '; 'X'];
8585
['X'; 'X'; 'X'] ]
8686
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
87-
gamestate board |> should equal expected
87+
gameState board |> should equal expected
8888

8989
[<Fact(Skip = "Remove this Skip property to run this test")>]
9090
let ``Finished game where O won via top row victory`` () =
@@ -93,7 +93,7 @@ let ``Finished game where O won via top row victory`` () =
9393
['X'; 'X'; 'O'];
9494
['X'; 'X'; ' '] ]
9595
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
96-
gamestate board |> should equal expected
96+
gameState board |> should equal expected
9797

9898
[<Fact(Skip = "Remove this Skip property to run this test")>]
9999
let ``Finished game where O won via middle row victory`` () =
@@ -102,7 +102,7 @@ let ``Finished game where O won via middle row victory`` () =
102102
['O'; 'O'; 'O'];
103103
['X'; ' '; ' '] ]
104104
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
105-
gamestate board |> should equal expected
105+
gameState board |> should equal expected
106106

107107
[<Fact(Skip = "Remove this Skip property to run this test")>]
108108
let ``Finished game where O won via bottom row victory`` () =
@@ -111,7 +111,7 @@ let ``Finished game where O won via bottom row victory`` () =
111111
[' '; 'X'; 'X'];
112112
['O'; 'O'; 'O'] ]
113113
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
114-
gamestate board |> should equal expected
114+
gameState board |> should equal expected
115115

116116
[<Fact(Skip = "Remove this Skip property to run this test")>]
117117
let ``Finished game where X won via falling diagonal victory`` () =
@@ -120,7 +120,7 @@ let ``Finished game where X won via falling diagonal victory`` () =
120120
[' '; 'X'; ' '];
121121
[' '; ' '; 'X'] ]
122122
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
123-
gamestate board |> should equal expected
123+
gameState board |> should equal expected
124124

125125
[<Fact(Skip = "Remove this Skip property to run this test")>]
126126
let ``Finished game where X won via rising diagonal victory`` () =
@@ -129,7 +129,7 @@ let ``Finished game where X won via rising diagonal victory`` () =
129129
['O'; 'X'; ' '];
130130
['X'; ' '; ' '] ]
131131
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
132-
gamestate board |> should equal expected
132+
gameState board |> should equal expected
133133

134134
[<Fact(Skip = "Remove this Skip property to run this test")>]
135135
let ``Finished game where O won via falling diagonal victory`` () =
@@ -138,7 +138,7 @@ let ``Finished game where O won via falling diagonal victory`` () =
138138
['O'; 'O'; 'X'];
139139
['X'; ' '; 'O'] ]
140140
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
141-
gamestate board |> should equal expected
141+
gameState board |> should equal expected
142142

143143
[<Fact(Skip = "Remove this Skip property to run this test")>]
144144
let ``Finished game where O won via rising diagonal victory`` () =
@@ -147,7 +147,7 @@ let ``Finished game where O won via rising diagonal victory`` () =
147147
[' '; 'O'; 'X'];
148148
['O'; 'X'; 'X'] ]
149149
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
150-
gamestate board |> should equal expected
150+
gameState board |> should equal expected
151151

152152
[<Fact(Skip = "Remove this Skip property to run this test")>]
153153
let ``Finished game where X won via a row and a column victory`` () =
@@ -156,7 +156,7 @@ let ``Finished game where X won via a row and a column victory`` () =
156156
['X'; 'O'; 'O'];
157157
['X'; 'O'; 'O'] ]
158158
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
159-
gamestate board |> should equal expected
159+
gameState board |> should equal expected
160160

161161
[<Fact(Skip = "Remove this Skip property to run this test")>]
162162
let ``Finished game where X won via two diagonal victories`` () =
@@ -165,7 +165,7 @@ let ``Finished game where X won via two diagonal victories`` () =
165165
['O'; 'X'; 'O'];
166166
['X'; 'O'; 'X'] ]
167167
let expected: Result<EndGameState, GameError> = Ok EndGameState.Win
168-
gamestate board |> should equal expected
168+
gameState board |> should equal expected
169169

170170
[<Fact(Skip = "Remove this Skip property to run this test")>]
171171
let ``Draw`` () =
@@ -174,7 +174,7 @@ let ``Draw`` () =
174174
['X'; 'X'; 'O'];
175175
['O'; 'X'; 'O'] ]
176176
let expected: Result<EndGameState, GameError> = Ok EndGameState.Draw
177-
gamestate board |> should equal expected
177+
gameState board |> should equal expected
178178

179179
[<Fact(Skip = "Remove this Skip property to run this test")>]
180180
let ``Another draw`` () =
@@ -183,7 +183,7 @@ let ``Another draw`` () =
183183
['O'; 'X'; 'X'];
184184
['X'; 'O'; 'O'] ]
185185
let expected: Result<EndGameState, GameError> = Ok EndGameState.Draw
186-
gamestate board |> should equal expected
186+
gameState board |> should equal expected
187187

188188
[<Fact(Skip = "Remove this Skip property to run this test")>]
189189
let ``Ongoing game: one move in`` () =
@@ -192,7 +192,7 @@ let ``Ongoing game: one move in`` () =
192192
['X'; ' '; ' '];
193193
[' '; ' '; ' '] ]
194194
let expected: Result<EndGameState, GameError> = Ok EndGameState.Ongoing
195-
gamestate board |> should equal expected
195+
gameState board |> should equal expected
196196

197197
[<Fact(Skip = "Remove this Skip property to run this test")>]
198198
let ``Ongoing game: two moves in`` () =
@@ -201,7 +201,7 @@ let ``Ongoing game: two moves in`` () =
201201
[' '; 'X'; ' '];
202202
[' '; ' '; ' '] ]
203203
let expected: Result<EndGameState, GameError> = Ok EndGameState.Ongoing
204-
gamestate board |> should equal expected
204+
gameState board |> should equal expected
205205

206206
[<Fact(Skip = "Remove this Skip property to run this test")>]
207207
let ``Ongoing game: five moves in`` () =
@@ -210,7 +210,7 @@ let ``Ongoing game: five moves in`` () =
210210
[' '; 'X'; 'O'];
211211
['O'; 'X'; ' '] ]
212212
let expected: Result<EndGameState, GameError> = Ok EndGameState.Ongoing
213-
gamestate board |> should equal expected
213+
gameState board |> should equal expected
214214

215215
[<Fact(Skip = "Remove this Skip property to run this test")>]
216216
let ``Invalid board: X went twice`` () =
@@ -219,7 +219,7 @@ let ``Invalid board: X went twice`` () =
219219
[' '; ' '; ' '];
220220
[' '; ' '; ' '] ]
221221
let expected: Result<EndGameState, GameError> = Error ConsecutiveMovesBySamePlayer
222-
gamestate board |> should equal expected
222+
gameState board |> should equal expected
223223

224224
[<Fact(Skip = "Remove this Skip property to run this test")>]
225225
let ``Invalid board: O started`` () =
@@ -228,7 +228,7 @@ let ``Invalid board: O started`` () =
228228
[' '; ' '; ' '];
229229
[' '; ' '; ' '] ]
230230
let expected: Result<EndGameState, GameError> = Error WrongPlayerStarted
231-
gamestate board |> should equal expected
231+
gameState board |> should equal expected
232232

233233
[<Fact(Skip = "Remove this Skip property to run this test")>]
234234
let ``Invalid board: X won and O kept playing`` () =
@@ -237,7 +237,7 @@ let ``Invalid board: X won and O kept playing`` () =
237237
['O'; 'O'; 'O'];
238238
[' '; ' '; ' '] ]
239239
let expected: Result<EndGameState, GameError> = Error MoveMadeAfterGameWasDone
240-
gamestate board |> should equal expected
240+
gameState board |> should equal expected
241241

242242
[<Fact(Skip = "Remove this Skip property to run this test")>]
243243
let ``Invalid board: players kept playing after a win`` () =
@@ -246,5 +246,5 @@ let ``Invalid board: players kept playing after a win`` () =
246246
['O'; 'O'; 'O'];
247247
['X'; 'O'; 'X'] ]
248248
let expected: Result<EndGameState, GameError> = Error MoveMadeAfterGameWasDone
249-
gamestate board |> should equal expected
249+
gameState board |> should equal expected
250250

0 commit comments

Comments
 (0)