diff --git a/src/testsuite/Testsuite.ml b/src/testsuite/Testsuite.ml index fecf354509f055c1f7aed5524dcc7bc01ed7a264..2b1dc921fb3bb15fc988e9a5ca52b74c6bf99b7e 100644 --- a/src/testsuite/Testsuite.ml +++ b/src/testsuite/Testsuite.ml @@ -52,10 +52,8 @@ let runSatCheckVerbose (sc:satCheck) = let res = runSatCheck sc in if (res = expectation) then PF.printf "%s\n" (cs "1;32" "Yes") - else PF.printf "%s\n -> %s: Expected %s but got %s!\n" + else PF.printf "%s, it is %s\n" (cs "1;31" "No") - (cs "1;31" "Failure") - (sotr expectation) (sotr res) diff --git a/src/testsuite/cool-testsuite.ml b/src/testsuite/cool-testsuite.ml index 2d610c36c16ae09e61225382a7a436add3544aa7..8961a2360998c11cd2faa4a970a6f6f97b554929 100644 --- a/src/testsuite/cool-testsuite.ml +++ b/src/testsuite/cool-testsuite.ml @@ -17,11 +17,32 @@ let k_testcases: satCheck list = ; c Unsat "False" ; c ParseError "{Fsdf" (*; c ParseError "Fsdf}" *) + ; c Unsat "<R> True & [R] False" + ; c Unsat "C |- <R> ~C" + ; c Sat "C |- [R] ~C" + ] + +let kd_testcases = + let c a b = (a,kd,b) in + [ c Sat "True" + ; c Unsat "False" + ; c ParseError "{Fsdf" + (*; c ParseError "Fsdf}" *) + ; c Unsat "<R> True & [R] False" + ; c Unsat "C |- <R> ~C" + ; c Unsat "C |- [R] ~C" + ] + +let testcases = + let c name table = (name,table) in + [ c "K" k_testcases + ; c "KD" kd_testcases ] let main = - foreach_l k_testcases (fun tc -> - runSatCheckVerbose tc + foreach_l testcases (fun (name,table) -> + Printf.printf "\n==== Testing logic %s ====\n" name; + foreach_l table runSatCheckVerbose ) let _ = main