Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 jlamothe
|
855854cd42 | ||
|
jlamothe
|
da6d01b258 |
Vendored
-10
@@ -1,10 +0,0 @@
|
||||
# -*- mode: ruby -*-
|
||||
# vi: set ft=ruby :
|
||||
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = "ubuntu/xenial64"
|
||||
config.vm.provision "shell", path: "vagrant/provision.sh"
|
||||
config.vm.provider :virtualbox do |v|
|
||||
v.customize ["modifyvm", :id, "--memory", 4096]
|
||||
end
|
||||
end
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+2
-3
@@ -1,10 +1,9 @@
|
||||
name: mtlstats
|
||||
version: 0.16.1
|
||||
github: "mtlstats/mtlstats"
|
||||
license: GPL-3
|
||||
license: GPL-3.0-or-later
|
||||
author: "Jonathan Lamothe"
|
||||
maintainer: "jlamothe1980@gmail.com"
|
||||
copyright: "Rhéal Lamothe"
|
||||
copyright: "1984, 1985, 2019-2021, 2023 Rhéal Lamothe"
|
||||
|
||||
extra-source-files:
|
||||
- README.md
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{- |
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
# This file was autogenerated by Stack.
|
||||
# You should not edit this file by hand.
|
||||
# For more information, please see the documentation at:
|
||||
# https://docs.haskellstack.org/en/stable/lock_files
|
||||
|
||||
packages:
|
||||
- completed:
|
||||
hackage: ncurses-0.2.16@sha256:8ad9fe6562a80d28166d76adbac1eb4d40c6511fe4e9272ed6e1166dc2f1cdf1,3575
|
||||
pantry-tree:
|
||||
size: 674
|
||||
sha256: 093bdc85ed518c81724f5b6b81c24ab4ebdd231551861f4feaa43361136f70b7
|
||||
original:
|
||||
hackage: ncurses-0.2.16@sha256:8ad9fe6562a80d28166d76adbac1eb4d40c6511fe4e9272ed6e1166dc2f1cdf1,3575
|
||||
snapshots:
|
||||
- completed:
|
||||
size: 523443
|
||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/0.yaml
|
||||
sha256: 283773e7120f5446d961eab35ea95c9af9c24187cc178537bd29273200a05171
|
||||
original: lts-14.0
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@@ -22,11 +22,13 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
module Actions.NewGame.GoalieInputSpec (spec) where
|
||||
|
||||
import qualified Data.Map as M
|
||||
import Data.Maybe (fromJust)
|
||||
import Lens.Micro ((^.), (&), (.~), (?~), (%~))
|
||||
import Test.Hspec (Spec, context, describe, it, shouldBe)
|
||||
|
||||
import Mtlstats.Actions.NewGame.GoalieInput
|
||||
import Mtlstats.Types
|
||||
import Mtlstats.Util
|
||||
|
||||
import qualified TypesSpec as TS
|
||||
|
||||
@@ -77,58 +79,133 @@ finishGoalieEntrySpec = describe "finishGoalieEntry" $ mapM_
|
||||
bobStats = (1, newGoalieStats)
|
||||
|
||||
recordGoalieStatsSpec :: Spec
|
||||
recordGoalieStatsSpec = describe "recordGoalieStats" $ mapM_
|
||||
( \(label, input, expected) ->
|
||||
context label $ do
|
||||
let ps = recordGoalieStats input
|
||||
ps `TS.compareTest` expected
|
||||
)
|
||||
recordGoalieStatsSpec = describe "recordGoalieStats" $ let
|
||||
goalieStats games mins goals = newGoalieStats
|
||||
& gsGames .~ games
|
||||
& gsMinsPlayed .~ mins
|
||||
& gsGoalsAllowed .~ goals
|
||||
|
||||
[ ( "No goalie"
|
||||
, noGoalie
|
||||
, noGoalie
|
||||
)
|
||||
joe = newGoalie 2 "Joe"
|
||||
& gYtd .~ goalieStats 10 11 12
|
||||
& gLifetime .~ goalieStats 20 21 22
|
||||
|
||||
, ( "Missing goalie"
|
||||
, missingGoalie
|
||||
, missingGoalie
|
||||
)
|
||||
]
|
||||
bob = newGoalie 3 "Bob"
|
||||
& gYtd .~ goalieStats 30 31 32
|
||||
& gLifetime .~ goalieStats 40 41 42
|
||||
|
||||
where
|
||||
noGoalie = defProgState
|
||||
gameState n mins goals = newGameState
|
||||
& gameGoalieStats .~ M.fromList [(1, goalieStats 1 2 3)]
|
||||
& gameSelectedGoalie .~ n
|
||||
& gameGoalieMinsPlayed .~ mins
|
||||
& gameGoalsAllowed .~ goals
|
||||
|
||||
missingGoalie = defProgState
|
||||
& progMode.gameStateL.gameSelectedGoalie ?~ 99
|
||||
progState n mins goals = newProgState
|
||||
& database.dbGoalies .~ [joe, bob]
|
||||
& progMode.gameStateL .~ gameState n mins goals
|
||||
|
||||
defProgState = newProgState
|
||||
& progMode.gameStateL
|
||||
%~ ( gameType ?~ HomeGame )
|
||||
. ( homeScore ?~ 2 )
|
||||
. ( awayScore ?~ 1 )
|
||||
& database.dbGoalies .~ [jim, bob, steve]
|
||||
in mapM_
|
||||
(\(setName, setGid, mins, goals, joeData, bobData, reset) -> let
|
||||
s = recordGoalieStats $ progState setGid mins goals
|
||||
in context setName $ do
|
||||
|
||||
jim = mkGoalie 2 "Jim" 1
|
||||
bob = mkGoalie 3 "Bob" 2
|
||||
steve = mkGoalie 5 "Steve" 3
|
||||
mapM_
|
||||
(\( chkName
|
||||
, chkGid
|
||||
, ( gGames
|
||||
, gMins
|
||||
, gGoals
|
||||
, ytdGames
|
||||
, ytdMins
|
||||
, ytdGoals
|
||||
, ltGames
|
||||
, ltMins
|
||||
, ltGoals
|
||||
)
|
||||
) -> context chkName $ do
|
||||
let
|
||||
gs = s^.progMode.gameStateL.gameGoalieStats
|
||||
game = M.findWithDefault newGoalieStats chkGid gs
|
||||
goalie = fromJust $ nth chkGid $ s^.database.dbGoalies
|
||||
ytd = goalie^.gYtd
|
||||
lt = goalie^.gLifetime
|
||||
|
||||
mkGoalie num name n = newGoalie num name
|
||||
& gYtd
|
||||
%~ ( gsGames .~ n )
|
||||
. ( gsMinsPlayed .~ n + 1 )
|
||||
. ( gsGoalsAllowed .~ n + 2 )
|
||||
. ( gsShutouts .~ n + 3 )
|
||||
. ( gsWins .~ n + 4 )
|
||||
. ( gsLosses .~ n + 5 )
|
||||
. ( gsTies .~ n + 6 )
|
||||
& gLifetime
|
||||
%~ ( gsGames .~ n + 7 )
|
||||
. ( gsMinsPlayed .~ n + 8 )
|
||||
. ( gsGoalsAllowed .~ n + 9 )
|
||||
. ( gsShutouts .~ n + 10 )
|
||||
. ( gsWins .~ n + 11 )
|
||||
. ( gsLosses .~ n + 12 )
|
||||
. ( gsTies .~ n + 13 )
|
||||
context "game" $
|
||||
game `TS.compareTest` goalieStats gGames gMins gGoals
|
||||
|
||||
context "year-to-date" $
|
||||
ytd `TS.compareTest` goalieStats ytdGames ytdMins ytdGoals
|
||||
|
||||
context "lifetime" $
|
||||
lt `TS.compareTest` goalieStats ltGames ltMins ltGoals)
|
||||
|
||||
[ ( "checking Joe", 0, joeData )
|
||||
, ( "checking Bob", 1, bobData )
|
||||
]
|
||||
|
||||
context "selected goalie" $ let
|
||||
expected = if reset then Nothing else setGid
|
||||
in it ("should be " ++ show expected) $
|
||||
(s^.progMode.gameStateL.gameSelectedGoalie) `shouldBe` expected
|
||||
|
||||
context "minutes played" $ let
|
||||
expected = if reset then Nothing else mins
|
||||
in it ("should be " ++ show expected) $
|
||||
(s^.progMode.gameStateL.gameGoalieMinsPlayed) `shouldBe` expected
|
||||
|
||||
context "goals allowed" $ let
|
||||
expected = if reset then Nothing else goals
|
||||
in it ("should be " ++ show expected) $
|
||||
(s^.progMode.gameStateL.gameGoalsAllowed) `shouldBe` expected)
|
||||
|
||||
[ ( "updating Joe"
|
||||
, Just 0
|
||||
, Just 1
|
||||
, Just 2
|
||||
, (1, 1, 2, 11, 12, 14, 21, 22, 24)
|
||||
, (1, 2, 3, 30, 31, 32, 40, 41, 42)
|
||||
, True
|
||||
)
|
||||
, ( "updating Bob"
|
||||
, Just 1
|
||||
, Just 1
|
||||
, Just 2
|
||||
, (0, 0, 0, 10, 11, 12, 20, 21, 22)
|
||||
, (1, 3, 5, 30, 32, 34, 40, 42, 44)
|
||||
, True
|
||||
)
|
||||
, ( "goalie out of bounds"
|
||||
, Just 2
|
||||
, Just 1
|
||||
, Just 2
|
||||
, (0, 0, 0, 10, 11, 12, 20, 21, 22)
|
||||
, (1, 2, 3, 30, 31, 32, 40, 41, 42)
|
||||
, False
|
||||
)
|
||||
, ( "missing goalie"
|
||||
, Nothing
|
||||
, Just 1
|
||||
, Just 2
|
||||
, (0, 0, 0, 10, 11, 12, 20, 21, 22)
|
||||
, (1, 2, 3, 30, 31, 32, 40, 41, 42)
|
||||
, False
|
||||
)
|
||||
, ( "missing minutes"
|
||||
, Just 0
|
||||
, Nothing
|
||||
, Just 1
|
||||
, (0, 0, 0, 10, 11, 12, 20, 21, 22)
|
||||
, (1, 2, 3, 30, 31, 32, 40, 41, 42)
|
||||
, False
|
||||
)
|
||||
, ( "missing goals"
|
||||
, Just 0
|
||||
, Just 1
|
||||
, Nothing
|
||||
, (0, 0, 0, 10, 11, 12, 20, 21, 22)
|
||||
, (1, 2, 3, 30, 31, 32, 40, 41, 42)
|
||||
, False
|
||||
)
|
||||
]
|
||||
|
||||
setGameGoalieSpec :: Spec
|
||||
setGameGoalieSpec = describe "setGameGoalie" $ mapM_
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
+91
-202
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@@ -38,14 +38,7 @@ import qualified Data.HashMap.Strict as HM
|
||||
import Data.Ratio ((%))
|
||||
import Lens.Micro (Lens', (&), (^.), (.~), (?~))
|
||||
import System.Random (randomIO, randomRIO)
|
||||
import Test.Hspec
|
||||
( Spec
|
||||
, context
|
||||
, describe
|
||||
, expectationFailure
|
||||
, it
|
||||
, shouldBe
|
||||
)
|
||||
import Test.Hspec (Spec, context, describe, it, shouldBe)
|
||||
|
||||
import Mtlstats.Config
|
||||
import Mtlstats.Types
|
||||
@@ -979,223 +972,119 @@ makeBool = randomIO
|
||||
makeName :: IO String
|
||||
makeName = replicateM 10 $ randomRIO ('A', 'Z')
|
||||
|
||||
instance Comparable ProgState where
|
||||
compareTest act expect = do
|
||||
compareLenses "database" database act expect
|
||||
compareLenses "progMode" progMode act expect
|
||||
compareLenses "dbName" dbName act expect
|
||||
compareLenses "inputBuffer" inputBuffer act expect
|
||||
compareLenses "scrollOffset" scrollOffset act expect
|
||||
|
||||
instance Comparable ProgMode where
|
||||
compareTest TitleScreen TitleScreen = return ()
|
||||
compareTest MainMenu MainMenu = return ()
|
||||
|
||||
compareTest (NewSeason act) (NewSeason expect) =
|
||||
context "NewSeason flag" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest (NewGame act) (NewGame expect) =
|
||||
context "NewGame GameState" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest EditMenu EditMenu = return ()
|
||||
|
||||
compareTest (CreatePlayer act) (CreatePlayer expect) =
|
||||
context "CreatePlayer CreatePlayerState" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest (CreateGoalie act) (CreateGoalie expect) =
|
||||
context "CreateGoalie CreateGoalieState" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest (EditPlayer act) (EditPlayer expect) =
|
||||
context "EditPlayer EditPlayerState" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest (EditGoalie act) (EditGoalie expect) =
|
||||
context "EditGoalie EditGoalieState" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest (EditStandings act) (EditStandings expect) =
|
||||
context "EditStandings EditStandingsMode" $
|
||||
act `compareTest` expect
|
||||
|
||||
compareTest _ _ = it "should be the expected mode" $
|
||||
expectationFailure "ProgMode mismatch"
|
||||
instance Comparable GoalieStats where
|
||||
compareTest actual expected = mapM_
|
||||
(\(name, lens) -> describe name $
|
||||
it ("should be " ++ show (expected^.lens)) $
|
||||
actual^.lens `shouldBe` expected^.lens)
|
||||
-- name, lens
|
||||
[ ( "gsGames", gsGames )
|
||||
, ( "gsMinsPlayed", gsMinsPlayed )
|
||||
, ( "gsGoalsAllowed", gsGoalsAllowed )
|
||||
, ( "gsWins", gsWins )
|
||||
, ( "gsLosses", gsLosses )
|
||||
, ( "gsTies", gsTies )
|
||||
]
|
||||
|
||||
instance Comparable GameState where
|
||||
compareTest act expect = do
|
||||
compareLenses "gameYear" gameYear act expect
|
||||
compareLenses "gameMonth" gameMonth act expect
|
||||
compareLenses "gameDay" gameDay act expect
|
||||
compareLenses "gameType" gameType act expect
|
||||
compareLenses "otherTeam" otherTeam act expect
|
||||
compareLenses "homeScore" homeScore act expect
|
||||
compareLenses "awayScore" awayScore act expect
|
||||
compareLenses "overtimeFlag" overtimeFlag act expect
|
||||
compareLenses "dataVerified" dataVerified act expect
|
||||
compareLenses "pointsAccounted" pointsAccounted act expect
|
||||
compareLenses "goalBy" goalBy act expect
|
||||
compareLenses "assistsBy" assistsBy act expect
|
||||
compareLenses "gamePlayerStats" gamePlayerStats act expect
|
||||
compareLenses "confirmGoalDataGlag" confirmGoalDataFlag act expect
|
||||
compareLenses "gameSelectedPlayer" gameSelectedPlayer act expect
|
||||
compareLenses "gamePMinsRecorded" gamePMinsRecorded act expect
|
||||
compareLenses "gameGoalieStats" gameGoalieStats act expect
|
||||
compareLenses "gameSelectedGoalie" gameSelectedGoalie act expect
|
||||
compareLenses "gameGoalieMinsPlayed" gameGoalieMinsPlayed act expect
|
||||
compareLenses "gameGoalsAllowed" gameGoalsAllowed act expect
|
||||
compareLenses "gameGoaliesRecorded" gameGoaliesRecorded act expect
|
||||
compareLenses "gameGoalieAssigned" gameGoalieAssigned act expect
|
||||
|
||||
instance Comparable Database where
|
||||
compareTest act expect = do
|
||||
compareLenses "dbPlayers" dbPlayers act expect
|
||||
compareLenses "dbGoalies" dbGoalies act expect
|
||||
compareLenses "dbGames" dbGames act expect
|
||||
compareLenses "dbHomeGameStats" dbHomeGameStats act expect
|
||||
compareLenses "dbAwayGameStats" dbAwayGameStats act expect
|
||||
|
||||
instance Comparable Player where
|
||||
compareTest act expect = do
|
||||
compareLenses "pNumber" pNumber act expect
|
||||
compareLenses "pName" pName act expect
|
||||
compareLenses "pPosition" pPosition act expect
|
||||
compareLenses "pRookie" pRookie act expect
|
||||
compareLenses "pActive" pActive act expect
|
||||
compareLenses "pYtd" pYtd act expect
|
||||
compareLenses "pLifetime" pLifetime act expect
|
||||
|
||||
instance Comparable [Player] where
|
||||
compareTest = compareLists
|
||||
|
||||
instance Comparable PlayerStats where
|
||||
compareTest act expect = do
|
||||
compareLenses "psGoals" psGoals act expect
|
||||
compareLenses "psAssists" psAssists act expect
|
||||
compareLenses "psPMin" psPMin act expect
|
||||
|
||||
instance Comparable Goalie where
|
||||
compareTest act expect = do
|
||||
compareLenses "gNumber" gNumber act expect
|
||||
compareLenses "gName" gName act expect
|
||||
compareLenses "gRookie" gRookie act expect
|
||||
compareLenses "gActive" gActive act expect
|
||||
compareLenses "gYtd" gYtd act expect
|
||||
compareLenses "gLifetime" gLifetime act expect
|
||||
|
||||
instance Comparable [Goalie] where
|
||||
compareTest = compareLists
|
||||
|
||||
instance Comparable GoalieStats where
|
||||
compareTest act expect = do
|
||||
compareLenses "gsGames" gsGames act expect
|
||||
compareLenses "gsMisPlayed" gsMinsPlayed act expect
|
||||
compareLenses "gsGoalsAllowed" gsGoalsAllowed act expect
|
||||
compareLenses "gsWins" gsWins act expect
|
||||
compareLenses "gsLosses" gsLosses act expect
|
||||
compareLenses "gsTies" gsTies act expect
|
||||
|
||||
instance Comparable GameStats where
|
||||
compareTest act expect = do
|
||||
compareLenses "gmsWins" gmsWins act expect
|
||||
compareLenses "gmsLosses" gmsLosses act expect
|
||||
compareLenses "gmsOvertime" gmsOvertime act expect
|
||||
compareLenses "gmsGoalsFor" gmsGoalsFor act expect
|
||||
compareLenses "gmsGoalsAgainst" gmsGoalsAgainst act expect
|
||||
|
||||
instance Comparable GameType where
|
||||
compareTest = compareVals
|
||||
compareTest actual expected =
|
||||
it ("should be " ++ show expected) $
|
||||
actual `shouldBe` expected
|
||||
|
||||
instance Comparable CreatePlayerState where
|
||||
compareTest act expect = do
|
||||
compareLenses "cpsNumber" cpsNumber act expect
|
||||
compareLenses "cpsName" cpsName act expect
|
||||
compareLenses "cpsPosition" cpsPosition act expect
|
||||
compareTest actual expected = do
|
||||
|
||||
describe "cpsNumber" $
|
||||
it ("should be " ++ show (expected^.cpsNumber)) $
|
||||
actual^.cpsNumber `shouldBe` expected^.cpsNumber
|
||||
|
||||
describe "cpsName" $
|
||||
it ("should be " ++ expected^.cpsName) $
|
||||
actual^.cpsName `shouldBe` expected^.cpsName
|
||||
|
||||
describe "cpsPosition" $
|
||||
it ("should be " ++ expected^.cpsPosition) $
|
||||
actual^.cpsPosition `shouldBe` expected^.cpsPosition
|
||||
|
||||
instance Comparable EditPlayerState where
|
||||
compareTest act expect = do
|
||||
compareLenses "epsSelectedPlayer" epsSelectedPlayer act expect
|
||||
compareLenses "epsMode" epsMode act expect
|
||||
compareTest actual expected = do
|
||||
|
||||
instance Comparable EditPlayerMode where
|
||||
compareTest = compareVals
|
||||
describe "epsSelectedPlayer" $
|
||||
it ("should be " ++ show (expected^.epsSelectedPlayer)) $
|
||||
actual^.epsSelectedPlayer `shouldBe` expected^.epsSelectedPlayer
|
||||
|
||||
describe "epsMode" $
|
||||
it ("should be " ++ show (expected^.epsMode)) $
|
||||
actual^.epsMode `shouldBe` expected^.epsMode
|
||||
|
||||
instance Comparable EditGoalieState where
|
||||
compareTest act expect = do
|
||||
compareLenses "egsSelectedGoalie" egsSelectedGoalie act expect
|
||||
compareLenses "egsMode" egsMode act expect
|
||||
compareTest actual expected = do
|
||||
|
||||
instance Comparable EditGoalieMode where
|
||||
compareTest = compareVals
|
||||
describe "egsSelectedGoalie" $
|
||||
it ("should be " ++ show (expected^.egsSelectedGoalie)) $
|
||||
actual^.egsSelectedGoalie `shouldBe` expected^.egsSelectedGoalie
|
||||
|
||||
describe "egsMode" $
|
||||
it ("should be " ++ show (expected^.egsMode)) $
|
||||
actual^.egsMode `shouldBe` expected^.egsMode
|
||||
|
||||
instance Comparable CreateGoalieState where
|
||||
compareTest act expect = do
|
||||
compareLenses "cgsNumber" cgsNumber act expect
|
||||
compareLenses "cgsName" cgsName act expect
|
||||
compareTest actual expected = do
|
||||
|
||||
describe "cgsNuber" $
|
||||
it("should be " ++ show (expected^.cgsNumber)) $
|
||||
actual^.cgsNumber `shouldBe` expected^.cgsNumber
|
||||
|
||||
describe "cgsName" $
|
||||
it ("should be " ++ expected^.cgsName) $
|
||||
actual^.cgsName `shouldBe` expected^.cgsName
|
||||
|
||||
instance Comparable EditStandingsMode where
|
||||
compareTest = compareVals
|
||||
compareTest actual expected =
|
||||
it ("should be " ++ show expected) $
|
||||
actual `shouldBe` expected
|
||||
|
||||
instance Comparable Int where
|
||||
compareTest = compareVals
|
||||
instance Comparable Goalie where
|
||||
compareTest actual expected = do
|
||||
|
||||
instance Comparable Bool where
|
||||
compareTest = compareVals
|
||||
describe "gNumber" $
|
||||
it ("should be " ++ show (expected^.gNumber)) $
|
||||
actual^.gNumber `shouldBe` expected^.gNumber
|
||||
|
||||
instance Comparable String where
|
||||
compareTest = compareVals
|
||||
describe "gName" $
|
||||
it ("should be " ++ show (expected^.gName)) $
|
||||
actual^.gName `shouldBe` expected^.gName
|
||||
|
||||
instance Comparable [Int] where
|
||||
compareTest = compareLists
|
||||
describe "gRookie" $
|
||||
it ("should be " ++ show (expected^.gRookie)) $
|
||||
actual^.gRookie `shouldBe` expected^.gRookie
|
||||
|
||||
instance Comparable a => Comparable (Maybe a) where
|
||||
compareTest Nothing Nothing = return ()
|
||||
compareTest (Just a) (Just e) = a `compareTest` e
|
||||
compareTest Nothing (Just _) = error "Unexpectedly received a value"
|
||||
compareTest (Just _) Nothing = error "Received Nothing"
|
||||
describe "gActive" $
|
||||
it ("should be " ++ show (expected^.gActive)) $
|
||||
actual^.gActive `shouldBe` expected^.gActive
|
||||
|
||||
instance (Ord k, Show k, Comparable v) => Comparable (M.Map k v) where
|
||||
compareTest actM expectM = do
|
||||
context "number of elements" $
|
||||
length actM `compareVals` length expectM
|
||||
describe "gYtd" $
|
||||
(actual^.gYtd) `compareTest` (expected^.gYtd)
|
||||
|
||||
context "check values" $
|
||||
mapM_
|
||||
( \k -> context (show k) $
|
||||
M.lookup k actM `compareTest` M.lookup k expectM
|
||||
) $ M.keys actM
|
||||
describe "gLifetime" $
|
||||
(actual^.gLifetime) `compareTest` (expected^.gLifetime)
|
||||
|
||||
instance Comparable (M.Map Int GoalieStats) where
|
||||
compareTest actual expected = do
|
||||
|
||||
compareLists :: (Comparable a) => [a] -> [a] -> Spec
|
||||
compareLists acts expects = do
|
||||
let
|
||||
aLen = length acts
|
||||
eLen = length expects
|
||||
aList = M.toList actual
|
||||
eList = M.toList expected
|
||||
|
||||
context "count elements" $
|
||||
it ("should be " ++ show eLen) $
|
||||
aLen `shouldBe` eLen
|
||||
it "should have the correct number of elements" $
|
||||
length aList `shouldBe` length eList
|
||||
|
||||
context "compare elements" $
|
||||
mapM_
|
||||
( \(n, act, expect) ->
|
||||
context ("element " ++ show n) $
|
||||
expect `compareTest` act
|
||||
) $ zip3 ([0..] :: [Int]) acts expects
|
||||
mapM_
|
||||
(\(n, (ka, va), (ke, ve)) -> context ("element " ++ show n) $ do
|
||||
|
||||
compareVals :: (Eq a, Show a) => a -> a -> Spec
|
||||
compareVals expect act =
|
||||
it ("should be " ++ show expect) $
|
||||
act `shouldBe` expect
|
||||
context "key" $
|
||||
it ("should be " ++ show ke) $
|
||||
ka `shouldBe` ke
|
||||
|
||||
compareLenses
|
||||
:: Comparable b
|
||||
=> String
|
||||
-> Lens' a b
|
||||
-> a
|
||||
-> a
|
||||
-> Spec
|
||||
compareLenses label lens act expect =
|
||||
describe label $
|
||||
(act^.lens) `compareTest` (expect^.lens)
|
||||
context "value" $ va `compareTest` ve)
|
||||
(zip3 ([0..] :: [Int]) aList eList)
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{-
|
||||
|
||||
mtlstats
|
||||
Copyright (C) 1984, 1985, 2019, 2020, 2021 Rhéal Lamothe
|
||||
Copyright (C) Rhéal Lamothe
|
||||
<rheal.lamothe@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "export PATH=\"$HOME/.local/bin:$PATH\"" >>~vagrant/.bashrc
|
||||
mkdir /vagrant/data
|
||||
ln -s /vagrant/data ~vagrant/.mtlstats
|
||||
|
||||
cd /vagrant
|
||||
stack install
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
apt-get update
|
||||
apt-get upgrade
|
||||
apt-get -y install libghc-ncurses-dev
|
||||
wget -qO- https://get.haskellstack.org/ | sh
|
||||
|
||||
export HOME=/home/vagrant
|
||||
|
||||
sudo -u vagrant /vagrant/vagrant/as_user.sh
|
||||
Reference in New Issue
Block a user