Commit 7dd5ee6c authored by Iustin Pop's avatar Iustin Pop
Browse files

tests: move the test declaration in QC.hs

This patch moves the test declaration into QC.hs, so that test.hs has to
be modified only when we add a new test category.
parent 0991ed70
module Ganeti.HTools.QC module Ganeti.HTools.QC
where ( test_PeerMap
, test_Container
, test_Instance
, test_Node
) where
import Test.QuickCheck import Test.QuickCheck
import Test.QuickCheck.Batch
import Data.Maybe import Data.Maybe
import qualified Ganeti.HTools.CLI as CLI import qualified Ganeti.HTools.CLI as CLI
import qualified Ganeti.HTools.Cluster as Cluster import qualified Ganeti.HTools.Cluster as Cluster
...@@ -81,6 +86,14 @@ prop_PeerMap_maxElem pmap = ...@@ -81,6 +86,14 @@ prop_PeerMap_maxElem pmap =
where _types = pmap::PeerMap.PeerMap where _types = pmap::PeerMap.PeerMap
puniq = PeerMap.accumArray const pmap puniq = PeerMap.accumArray const pmap
test_PeerMap =
[ run prop_PeerMap_addIdempotent
, run prop_PeerMap_removeIdempotent
, run prop_PeerMap_maxElem
, run prop_PeerMap_addFind
, run prop_PeerMap_findMissing
]
-- Container tests -- Container tests
prop_Container_addTwo cdata i1 i2 = prop_Container_addTwo cdata i1 i2 =
...@@ -91,6 +104,8 @@ prop_Container_addTwo cdata i1 i2 = ...@@ -91,6 +104,8 @@ prop_Container_addTwo cdata i1 i2 =
cont = foldl (\c x -> Container.add x x c) Container.empty cdata cont = foldl (\c x -> Container.add x x c) Container.empty cdata
fn x1 x2 = Container.addTwo x1 x1 x2 x2 fn x1 x2 = Container.addTwo x1 x1 x2 x2
test_Container =
[ run prop_Container_addTwo ]
-- Simple instance tests, we only have setter/getters -- Simple instance tests, we only have setter/getters
...@@ -115,6 +130,16 @@ prop_Instance_setBoth inst pdx sdx = ...@@ -115,6 +130,16 @@ prop_Instance_setBoth inst pdx sdx =
where _types = (inst::Instance.Instance, pdx::Types.Ndx, sdx::Types.Ndx) where _types = (inst::Instance.Instance, pdx::Types.Ndx, sdx::Types.Ndx)
si = Instance.setBoth inst pdx sdx si = Instance.setBoth inst pdx sdx
test_Instance =
[ run prop_Instance_setIdx
, run prop_Instance_setName
, run prop_Instance_setPri
, run prop_Instance_setSec
, run prop_Instance_setBoth
]
-- Node tests
-- | Check that an instance add with too high memory or disk will be rejected -- | Check that an instance add with too high memory or disk will be rejected
prop_Node_addPri node inst = (Instance.mem inst >= Node.f_mem node || prop_Node_addPri node inst = (Instance.mem inst >= Node.f_mem node ||
Instance.dsk inst >= Node.f_dsk node) && Instance.dsk inst >= Node.f_dsk node) &&
...@@ -131,3 +156,8 @@ prop_Node_addSec node inst pdx = ...@@ -131,3 +156,8 @@ prop_Node_addSec node inst pdx =
(not $ Node.failN1 node) (not $ Node.failN1 node)
==> isNothing(Node.addSec node inst pdx) ==> isNothing(Node.addSec node inst pdx)
where _types = (node::Node.Node, inst::Instance.Instance, pdx::Int) where _types = (node::Node.Node, inst::Instance.Instance, pdx::Int)
test_Node =
[ run prop_Node_addPri
, run prop_Node_addSec
]
...@@ -13,26 +13,7 @@ options = TestOptions ...@@ -13,26 +13,7 @@ options = TestOptions
, debug_tests = False } , debug_tests = False }
main = do main = do
runTests "PeerMap" options runTests "PeerMap" options test_PeerMap
[ run prop_PeerMap_addIdempotent runTests "Container" options test_Container
, run prop_PeerMap_removeIdempotent runTests "Instance" options test_Instance
, run prop_PeerMap_maxElem runTests "Node" options test_Node
, run prop_PeerMap_addFind
, run prop_PeerMap_findMissing
]
runTests "Container" options
[ run prop_Container_addTwo ]
runTests "Instance" options
[ run prop_Instance_setIdx
, run prop_Instance_setName
, run prop_Instance_setPri
, run prop_Instance_setSec
, run prop_Instance_setBoth
]
runTests "Node" options
[ run prop_Node_addPri
, run prop_Node_addSec
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment