fix tests

This commit is contained in:
Gregor Kleen 2019-05-20 14:37:52 +02:00
parent 88b9110865
commit 8152b3b5ca

View File

@ -9,7 +9,6 @@ import Handler.Utils.Submission
import ModelSpec () import ModelSpec ()
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Map ((!?))
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.List (genericLength) import Data.List (genericLength)
@ -21,7 +20,7 @@ import System.IO.Unsafe
import System.Random.Shuffle import System.Random.Shuffle
import Control.Monad.Random.Class import Control.Monad.Random.Class
import Database.Persist.Sql (toSqlKey, fromSqlKey) import Database.Persist.Sql (fromSqlKey)
import qualified Database.Esqueleto as E import qualified Database.Esqueleto as E
@ -180,7 +179,7 @@ spec = withApp . describe "Submission distribution" $ do
let countResult = Map.map Set.size result let countResult = Map.map Set.size result
countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
countResult' `shouldNotSatisfy` Map.member Nothing countResult' `shouldNotSatisfy` Map.member Nothing
countResult' `shouldSatisfy` all (\(Just (corr, prop), subsSet) -> fromIntegral subsSet == 50 * prop) . Map.toList countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> fromIntegral subsSet == 50 * prop) . Map.toList
-- -- Does not currently work, because `User`s are reused within `distributionExample`, so submissions end up having more associated course-tutors, because the same user might be a member of a tutorial created for another submission -- -- Does not currently work, because `User`s are reused within `distributionExample`, so submissions end up having more associated course-tutors, because the same user might be a member of a tutorial created for another submission
-- --