test things a little bit more

Author: MaximilianAlgehed

test/Constrained/GraphSpec.hs

@@ -22,6 +22,10 @@ instance Arbitrary Node where
   arbitrary = Node <$> choose (0, 20)
   shrink (Node n) = Node <$> shrink n
 
+prop_arbitrary_reasonable_distribution :: Graph Node -> Property
+prop_arbitrary_reasonable_distribution g =
+  cover 60 (isRight $ topsort g) "has topsort" True
+
 prop_no_dependencies_topsort :: Set Node -> Property
 prop_no_dependencies_topsort = property . isRight . topsort . noDependencies
 
@@ -37,13 +41,11 @@ prop_delete_topsort g n =
 
 prop_op_topsort :: Graph Node -> Property
 prop_op_topsort g =
-  cover 60 (isRight (topsort g)) "has topsort" $
-    isRight (topsort g) == isRight (topsort $ opGraph g)
+  isRight (topsort g) === isRight (topsort $ opGraph g)
 
 prop_trC_topsort :: Graph Node -> Property
 prop_trC_topsort g =
-  cover 60 (isRight (topsort g)) "has topsort" $
-    isRight (topsort g) == isRight (topsort $ transitiveClosure g)
+  isRight (topsort g) === isRight (topsort $ transitiveClosure g)
 
 prop_trC_opgraph_commute :: Graph Node -> Property
 prop_trC_opgraph_commute g =
@@ -60,17 +62,21 @@ prop_topsort_all_nodes :: Graph Node -> Property
 prop_topsort_all_nodes g =
   case topsort g of
     Left{} -> discard
-    Right o -> cover 60 True "has topsort" $ Set.fromList o === nodes g
+    Right o -> Set.fromList o === nodes g
 
 prop_topsort_sound :: Graph Node -> Property
 prop_topsort_sound g =
   case topsort g of
     Left{} -> discard
-    Right o -> cover 60 True "has topsort" $ property $ go o
+    Right o -> property $ go o
   where
     go [] = True
     go (n : ns) = all (\n' -> not $ dependsOn n n' g) ns && go ns
 
+prop_topsort_complete :: Graph Node -> Property
+prop_topsort_complete g =
+  isLeft (topsort g) === any (\ n -> not . null $ findCycle g n) (nodes g)
+
 prop_find_cycle_sound :: Property
 prop_find_cycle_sound =
   forAllShrink (mkGraph @Node <$> arbitrary) shrink $ \ g ->
@@ -92,14 +98,19 @@ prop_find_cycle_loops =
 tests :: Bool -> Spec
 tests _nightly =
   describe "Graph tests" $ do
-    prop "prop_no_dependencies_topsort" $ checkCoverage $ withMaxSuccess 10000 prop_no_dependencies_topsort
-    prop "prop_subtract_topsort"        $ checkCoverage $ withMaxSuccess 10000 prop_subtract_topsort
-    prop "prop_delete_topsort"          $ checkCoverage $ withMaxSuccess 10000 prop_delete_topsort
-    prop "prop_op_topsort"              $ checkCoverage $ withMaxSuccess 10000 prop_op_topsort
-    prop "prop_trC_topsort"             $ checkCoverage $ withMaxSuccess 10000 prop_trC_topsort
-    prop "prop_trC_opgraph_commute"     $ checkCoverage $ withMaxSuccess 10000 prop_trC_opgraph_commute
-    prop "prop_depends_grows"           $ checkCoverage $ withMaxSuccess 10000 prop_depends_grows
-    prop "prop_topsort_all_nodes"       $ checkCoverage $ withMaxSuccess 10000 prop_topsort_all_nodes
-    prop "prop_topsort_sound"           $ checkCoverage $ withMaxSuccess 10000 prop_topsort_sound
-    prop "prop_find_cycle_sound"        $ checkCoverage $ withMaxSuccess 10000 prop_find_cycle_sound
-    prop "prop_find_cycle_loops"        $ checkCoverage $ withMaxSuccess 10000 prop_find_cycle_loops
+    prop "prop_arbitrary_reasonable_distribution" $ checkCoverage $ prop_arbitrary_reasonable_distribution
+    prop "prop_no_dependencies_topsort"           $ checkCoverage $ prop_no_dependencies_topsort
+    prop "prop_subtract_topsort"                  $ checkCoverage $ prop_subtract_topsort
+    prop "prop_delete_topsort"                    $ checkCoverage $ prop_delete_topsort
+    prop "prop_op_topsort"                        $ checkCoverage $ prop_op_topsort
+    prop "prop_trC_topsort"                       $ checkCoverage $ prop_trC_topsort
+    prop "prop_trC_opgraph_commute"               $ checkCoverage $ prop_trC_opgraph_commute
+    prop "prop_depends_grows"                     $ checkCoverage $ prop_depends_grows
+    prop "prop_topsort_all_nodes"                 $ checkCoverage $ prop_topsort_all_nodes
+    prop "prop_topsort_sound"                     $ checkCoverage $ prop_topsort_sound
+    prop "prop_topsort_complete"                  $ checkCoverage $ prop_topsort_complete
+    prop "prop_find_cycle_sound"                  $ checkCoverage $ prop_find_cycle_sound
+    prop "prop_find_cycle_loops"                  $ checkCoverage $ prop_find_cycle_loops
+
+runTests :: IO ()
+runTests = hspec $ tests False