phfroidmont/minesweeper-haskell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Board a type synonym isntead of a newtype

Browse source
This commit is contained in:
Paul-Henri Froidmont 2019-11-24 17:06:51 +01:00 • committed by Paul-Henri Froidmont
parent 4030ae7699
commit 0b20ec98e3
3 changed files with 70 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

81
test/Spec.hs
View file

@ -5,44 +5,37 @@ import Test.Tasty.HUnit
main :: IO ()
main = defaultMain $ testGroup "Minesweeper tests" [flagTileTest, revealTileTest, createBoardTest]
emptyBoard :: Board
emptyBoard = Board []
hiddenBoard :: Board
hiddenBoard =
Board
[ [Bomb Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
[ [Bomb Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
revealedBoard :: Board
revealedBoard =
Board
[ [Bomb Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 1 Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 0 Revealed, Value 0 Revealed, Value 0 Revealed]
]
[ [Bomb Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 1 Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 0 Revealed, Value 0 Revealed, Value 0 Revealed]
]
flagTileTest :: TestTree
flagTileTest =
testGroup
"Flag tile"
[ testCase "Empty board" $ flagTile (1, 1) emptyBoard @?= emptyBoard
[ testCase "Empty board" $ flagTile (1, 1) [] @?= []
, testCase "Flag bomb tile" $
flagTile (0, 0) hiddenBoard @?=
Board
[ [Bomb Flagged, Value 1 Hidden, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
[ [Bomb Flagged, Value 1 Hidden, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
, testCase "Flag value tile" $
flagTile (2, 0) hiddenBoard @?=
Board
[ [Bomb Hidden, Value 1 Hidden, Value 0 Flagged]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
[ [Bomb Hidden, Value 1 Hidden, Value 0 Flagged]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
, testCase "Flag revealed bomb tile" $ flagTile (0, 0) revealedBoard @?= revealedBoard
, testCase "Flag revealed value tile" $ flagTile (1, 2) revealedBoard @?= revealedBoard
]
@ -51,22 +44,20 @@ revealTileTest :: TestTree
revealTileTest =
testGroup
"Reveal tile"
[ testCase "Empty board" $ revealTile (1, 1) emptyBoard @?= emptyBoard
[ testCase "Empty board" $ revealTile (1, 1) [] @?= []
, testCase "Reveal bomb tile" $ revealTile (0, 0) hiddenBoard @?= revealedBoard
, testCase "Flag 0 value tile" $
revealTile (2, 0) hiddenBoard @?=
Board
[ [Bomb Hidden, Value 1 Revealed, Value 0 Revealed]
, [Value 1 Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 0 Revealed, Value 0 Revealed, Value 0 Revealed]
]
[ [Bomb Hidden, Value 1 Revealed, Value 0 Revealed]
, [Value 1 Revealed, Value 1 Revealed, Value 0 Revealed]
, [Value 0 Revealed, Value 0 Revealed, Value 0 Revealed]
]
, testCase "Flag non 0 value tile" $
revealTile (1, 0) hiddenBoard @?=
Board
[ [Bomb Hidden, Value 1 Revealed, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
[ [Bomb Hidden, Value 1 Revealed, Value 0 Hidden]
, [Value 1 Hidden, Value 1 Hidden, Value 0 Hidden]
, [Value 0 Hidden, Value 0 Hidden, Value 0 Hidden]
]
, testCase "Flag revealed bomb tile" $ revealTile (0, 0) revealedBoard @?= revealedBoard
, testCase "Flag revealed value tile" $ revealTile (1, 2) revealedBoard @?= revealedBoard
]
@ -75,20 +66,18 @@ createBoardTest :: TestTree
createBoardTest =
testGroup
"Create board"
[ testCase "Empty board" $ createBoard 0 0 [] @?= emptyBoard
[ testCase "Empty board" $ createBoard 0 0 [] @?= []
, testCase "3x3 single bomb" $ createBoard 3 3 [(0, 0)] @?= hiddenBoard
, testCase "3x3 three bombs" $
createBoard 3 3 [(0, 0), (1, 1), (2, 2)] @?=
Board
[ [Bomb Hidden, Value 2 Hidden, Value 1 Hidden]
, [Value 2 Hidden, Bomb Hidden, Value 2 Hidden]
, [Value 1 Hidden, Value 2 Hidden, Bomb Hidden]
]
[ [Bomb Hidden, Value 2 Hidden, Value 1 Hidden]
, [Value 2 Hidden, Bomb Hidden, Value 2 Hidden]
, [Value 1 Hidden, Value 2 Hidden, Bomb Hidden]
]
, testCase "3x3 four bombs" $
createBoard 3 3 [(0, 1), (1, 1), (2, 1), (1, 0)] @?=
Board
[ [Value 3 Hidden, Bomb Hidden, Value 3 Hidden]
, [Bomb Hidden, Bomb Hidden, Bomb Hidden]
, [Value 2 Hidden, Value 3 Hidden, Value 2 Hidden]
]
[ [Value 3 Hidden, Bomb Hidden, Value 3 Hidden]
, [Bomb Hidden, Bomb Hidden, Bomb Hidden]
, [Value 2 Hidden, Value 3 Hidden, Value 2 Hidden]
]
]