From: Mart Lubbers Date: Sun, 17 Apr 2016 17:04:07 +0000 (+0200) Subject: added exhaustive tests X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=259ed7dfe69f50fd1b4967b272b094f1b2b50493;p=mc1516pa.git added exhaustive tests --- diff --git a/modelchecker/test.sh b/modelchecker/test.sh index 205c472..e34ffae 100755 --- a/modelchecker/test.sh +++ b/modelchecker/test.sh @@ -1,15 +1,16 @@ #!/bin/bash +TOTAL=0 +PASSED=0 for testscreen in tests/*; do NUM="$(basename "$(echo $testscreen | cut -d'.' -f1)")" OUT="$(./main "$testscreen" 2>&1| grep -Po "(?<=Satcount: )\d+(?=\.)")" - echo "Output: $OUT" if [ "$NUM" -ne "$OUT" ]; then - echo "$testscreen failed" - echo "Expected: $NUM" - echo "Got: $OUT" + echo "$testscreen failed, expected: $NUM, got: $OUT." cat "$testscreen" else - echo "$testscreen passed" + PASSED=$((PASSED+1)) fi + TOTAL=$((TOTAL+1)) done +echo "$PASSED/$TOTAL passed" diff --git a/modelchecker/tests/1.aq b/modelchecker/tests/1.aq new file mode 100644 index 0000000..bfb63f5 --- /dev/null +++ b/modelchecker/tests/1.aq @@ -0,0 +1 @@ +@2294 diff --git a/modelchecker/tests/1.ar b/modelchecker/tests/1.ar new file mode 100644 index 0000000..2beede7 --- /dev/null +++ b/modelchecker/tests/1.ar @@ -0,0 +1 @@ ++2294 diff --git a/modelchecker/tests/1.as b/modelchecker/tests/1.as new file mode 100644 index 0000000..857f13a --- /dev/null +++ b/modelchecker/tests/1.as @@ -0,0 +1 @@ +$ diff --git a/modelchecker/tests/1.at b/modelchecker/tests/1.at new file mode 100644 index 0000000..dd17080 --- /dev/null +++ b/modelchecker/tests/1.at @@ -0,0 +1 @@ +$+$ diff --git a/modelchecker/tests/1.au b/modelchecker/tests/1.au new file mode 100644 index 0000000..b46fdb6 --- /dev/null +++ b/modelchecker/tests/1.au @@ -0,0 +1 @@ +2294@ diff --git a/modelchecker/tests/1.av b/modelchecker/tests/1.av new file mode 100644 index 0000000..61b71ef --- /dev/null +++ b/modelchecker/tests/1.av @@ -0,0 +1 @@ +2294+ diff --git a/modelchecker/tests/1.aw b/modelchecker/tests/1.aw new file mode 100644 index 0000000..d27d6a3 --- /dev/null +++ b/modelchecker/tests/1.aw @@ -0,0 +1 @@ +@** diff --git a/modelchecker/tests/1.ax b/modelchecker/tests/1.ax new file mode 100644 index 0000000..25e4d31 --- /dev/null +++ b/modelchecker/tests/1.ax @@ -0,0 +1 @@ ++** diff --git a/modelchecker/tests/1.ay b/modelchecker/tests/1.ay new file mode 100644 index 0000000..b9b5457 --- /dev/null +++ b/modelchecker/tests/1.ay @@ -0,0 +1 @@ +*@* diff --git a/modelchecker/tests/1.az b/modelchecker/tests/1.az new file mode 100644 index 0000000..950af9e --- /dev/null +++ b/modelchecker/tests/1.az @@ -0,0 +1 @@ +*+* diff --git a/modelchecker/tests/1.ba b/modelchecker/tests/1.ba new file mode 100644 index 0000000..e2f2a3d --- /dev/null +++ b/modelchecker/tests/1.ba @@ -0,0 +1 @@ +**@ diff --git a/modelchecker/tests/1.bb b/modelchecker/tests/1.bb new file mode 100644 index 0000000..b59d6de --- /dev/null +++ b/modelchecker/tests/1.bb @@ -0,0 +1 @@ +**+ diff --git a/modelchecker/tests/1.bo b/modelchecker/tests/1.bo new file mode 100644 index 0000000..16389df --- /dev/null +++ b/modelchecker/tests/1.bo @@ -0,0 +1 @@ +@$ diff --git a/modelchecker/tests/1.bq b/modelchecker/tests/1.bq new file mode 100644 index 0000000..656cb7f --- /dev/null +++ b/modelchecker/tests/1.bq @@ -0,0 +1 @@ ++$ diff --git a/modelchecker/tests/1.bx b/modelchecker/tests/1.bx new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/modelchecker/tests/1.bx @@ -0,0 +1 @@ + diff --git a/modelchecker/tests/1.bz b/modelchecker/tests/1.bz new file mode 100644 index 0000000..71cb1a0 --- /dev/null +++ b/modelchecker/tests/1.bz @@ -0,0 +1 @@ + $+ diff --git a/modelchecker/tests/1.ca b/modelchecker/tests/1.ca new file mode 100644 index 0000000..643a7f1 --- /dev/null +++ b/modelchecker/tests/1.ca @@ -0,0 +1 @@ +@* diff --git a/modelchecker/tests/1.cc b/modelchecker/tests/1.cc new file mode 100644 index 0000000..7b80397 --- /dev/null +++ b/modelchecker/tests/1.cc @@ -0,0 +1 @@ ++* diff --git a/modelchecker/tests/1.cj b/modelchecker/tests/1.cj new file mode 100644 index 0000000..f8614b0 --- /dev/null +++ b/modelchecker/tests/1.cj @@ -0,0 +1 @@ + *@ diff --git a/modelchecker/tests/1.cl b/modelchecker/tests/1.cl new file mode 100644 index 0000000..ff505f8 --- /dev/null +++ b/modelchecker/tests/1.cl @@ -0,0 +1 @@ + *+ diff --git a/modelchecker/tests/1.cm b/modelchecker/tests/1.cm new file mode 100644 index 0000000..8d4f16e --- /dev/null +++ b/modelchecker/tests/1.cm @@ -0,0 +1 @@ +@$. diff --git a/modelchecker/tests/1.co b/modelchecker/tests/1.co new file mode 100644 index 0000000..eea9930 --- /dev/null +++ b/modelchecker/tests/1.co @@ -0,0 +1 @@ ++$. diff --git a/modelchecker/tests/1.cv b/modelchecker/tests/1.cv new file mode 100644 index 0000000..9c558e3 --- /dev/null +++ b/modelchecker/tests/1.cv @@ -0,0 +1 @@ +. diff --git a/modelchecker/tests/1.cx b/modelchecker/tests/1.cx new file mode 100644 index 0000000..d68dc04 --- /dev/null +++ b/modelchecker/tests/1.cx @@ -0,0 +1 @@ +.$+ diff --git a/modelchecker/tests/1.cz b/modelchecker/tests/1.cz new file mode 100644 index 0000000..974d5e3 --- /dev/null +++ b/modelchecker/tests/1.cz @@ -0,0 +1 @@ +@*. diff --git a/modelchecker/tests/1.db b/modelchecker/tests/1.db new file mode 100644 index 0000000..91459b8 --- /dev/null +++ b/modelchecker/tests/1.db @@ -0,0 +1 @@ ++*. diff --git a/modelchecker/tests/1.di b/modelchecker/tests/1.di new file mode 100644 index 0000000..c14534f --- /dev/null +++ b/modelchecker/tests/1.di @@ -0,0 +1 @@ +.*@ diff --git a/modelchecker/tests/1.dk b/modelchecker/tests/1.dk new file mode 100644 index 0000000..7684803 --- /dev/null +++ b/modelchecker/tests/1.dk @@ -0,0 +1 @@ +.*+ diff --git a/modelchecker/tests/1.dl b/modelchecker/tests/1.dl new file mode 100644 index 0000000..7770a88 --- /dev/null +++ b/modelchecker/tests/1.dl @@ -0,0 +1 @@ +@*$ diff --git a/modelchecker/tests/1.dm b/modelchecker/tests/1.dm new file mode 100644 index 0000000..59c227c --- /dev/null +++ b/modelchecker/tests/1.dm @@ -0,0 +1 @@ +@ diff --git a/modelchecker/tests/1.dn b/modelchecker/tests/1.dn new file mode 100644 index 0000000..07ff770 --- /dev/null +++ b/modelchecker/tests/1.dn @@ -0,0 +1 @@ ++*$ diff --git a/modelchecker/tests/1.do b/modelchecker/tests/1.do new file mode 100644 index 0000000..fd38861 --- /dev/null +++ b/modelchecker/tests/1.do @@ -0,0 +1 @@ ++ diff --git a/modelchecker/tests/1.dp b/modelchecker/tests/1.dp new file mode 100644 index 0000000..1541089 --- /dev/null +++ b/modelchecker/tests/1.dp @@ -0,0 +1 @@ +*@$ diff --git a/modelchecker/tests/1.dq b/modelchecker/tests/1.dq new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/modelchecker/tests/1.dq @@ -0,0 +1 @@ +* diff --git a/modelchecker/tests/1.dr b/modelchecker/tests/1.dr new file mode 100644 index 0000000..4e6bf62 --- /dev/null +++ b/modelchecker/tests/1.dr @@ -0,0 +1 @@ +*+$ diff --git a/modelchecker/tests/1.ds b/modelchecker/tests/1.ds new file mode 100644 index 0000000..565135c --- /dev/null +++ b/modelchecker/tests/1.ds @@ -0,0 +1 @@ +$+* diff --git a/modelchecker/tests/1.dt b/modelchecker/tests/1.dt new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/modelchecker/tests/1.dt @@ -0,0 +1 @@ +* diff --git a/modelchecker/tests/1.du b/modelchecker/tests/1.du new file mode 100644 index 0000000..59c227c --- /dev/null +++ b/modelchecker/tests/1.du @@ -0,0 +1 @@ +@ diff --git a/modelchecker/tests/1.dv b/modelchecker/tests/1.dv new file mode 100644 index 0000000..0e9172d --- /dev/null +++ b/modelchecker/tests/1.dv @@ -0,0 +1 @@ +*$+ diff --git a/modelchecker/tests/1.dw b/modelchecker/tests/1.dw new file mode 100644 index 0000000..fd38861 --- /dev/null +++ b/modelchecker/tests/1.dw @@ -0,0 +1 @@ ++ diff --git a/modelchecker/tests/2.bp b/modelchecker/tests/2.bp new file mode 100644 index 0000000..9d5d76b --- /dev/null +++ b/modelchecker/tests/2.bp @@ -0,0 +1 @@ +@ $ diff --git a/modelchecker/tests/2.br b/modelchecker/tests/2.br new file mode 100644 index 0000000..2d030da --- /dev/null +++ b/modelchecker/tests/2.br @@ -0,0 +1 @@ ++ $ diff --git a/modelchecker/tests/2.bs b/modelchecker/tests/2.bs new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/modelchecker/tests/2.bs @@ -0,0 +1 @@ + diff --git a/modelchecker/tests/2.bt b/modelchecker/tests/2.bt new file mode 100644 index 0000000..51df466 --- /dev/null +++ b/modelchecker/tests/2.bt @@ -0,0 +1 @@ + @$ diff --git a/modelchecker/tests/2.bu b/modelchecker/tests/2.bu new file mode 100644 index 0000000..7865ef3 --- /dev/null +++ b/modelchecker/tests/2.bu @@ -0,0 +1 @@ +$+ diff --git a/modelchecker/tests/2.bv b/modelchecker/tests/2.bv new file mode 100644 index 0000000..08eef60 --- /dev/null +++ b/modelchecker/tests/2.bv @@ -0,0 +1 @@ + +$ diff --git a/modelchecker/tests/2.bw b/modelchecker/tests/2.bw new file mode 100644 index 0000000..fc96b61 --- /dev/null +++ b/modelchecker/tests/2.bw @@ -0,0 +1 @@ +$ @ diff --git a/modelchecker/tests/2.by b/modelchecker/tests/2.by new file mode 100644 index 0000000..9775cb6 --- /dev/null +++ b/modelchecker/tests/2.by @@ -0,0 +1 @@ +$ + diff --git a/modelchecker/tests/2.cb b/modelchecker/tests/2.cb new file mode 100644 index 0000000..5bddb2c --- /dev/null +++ b/modelchecker/tests/2.cb @@ -0,0 +1 @@ +@ * diff --git a/modelchecker/tests/2.cd b/modelchecker/tests/2.cd new file mode 100644 index 0000000..6aa777e --- /dev/null +++ b/modelchecker/tests/2.cd @@ -0,0 +1 @@ ++ * diff --git a/modelchecker/tests/2.ce b/modelchecker/tests/2.ce new file mode 100644 index 0000000..c3a206b --- /dev/null +++ b/modelchecker/tests/2.ce @@ -0,0 +1 @@ +*@ diff --git a/modelchecker/tests/2.cf b/modelchecker/tests/2.cf new file mode 100644 index 0000000..ab93399 --- /dev/null +++ b/modelchecker/tests/2.cf @@ -0,0 +1 @@ + @* diff --git a/modelchecker/tests/2.cg b/modelchecker/tests/2.cg new file mode 100644 index 0000000..63b96cf --- /dev/null +++ b/modelchecker/tests/2.cg @@ -0,0 +1 @@ +*+ diff --git a/modelchecker/tests/2.ch b/modelchecker/tests/2.ch new file mode 100644 index 0000000..5e4bef5 --- /dev/null +++ b/modelchecker/tests/2.ch @@ -0,0 +1 @@ + +* diff --git a/modelchecker/tests/2.ci b/modelchecker/tests/2.ci new file mode 100644 index 0000000..306363e --- /dev/null +++ b/modelchecker/tests/2.ci @@ -0,0 +1 @@ +* @ diff --git a/modelchecker/tests/2.ck b/modelchecker/tests/2.ck new file mode 100644 index 0000000..b6695e9 --- /dev/null +++ b/modelchecker/tests/2.ck @@ -0,0 +1 @@ +* + diff --git a/modelchecker/tests/2.cn b/modelchecker/tests/2.cn new file mode 100644 index 0000000..ee897ea --- /dev/null +++ b/modelchecker/tests/2.cn @@ -0,0 +1 @@ +@.$ diff --git a/modelchecker/tests/2.cp b/modelchecker/tests/2.cp new file mode 100644 index 0000000..95190a4 --- /dev/null +++ b/modelchecker/tests/2.cp @@ -0,0 +1 @@ ++.$ diff --git a/modelchecker/tests/2.cq b/modelchecker/tests/2.cq new file mode 100644 index 0000000..9c558e3 --- /dev/null +++ b/modelchecker/tests/2.cq @@ -0,0 +1 @@ +. diff --git a/modelchecker/tests/2.cr b/modelchecker/tests/2.cr new file mode 100644 index 0000000..4fd2a6e --- /dev/null +++ b/modelchecker/tests/2.cr @@ -0,0 +1 @@ +.@$ diff --git a/modelchecker/tests/2.cs b/modelchecker/tests/2.cs new file mode 100644 index 0000000..905a558 --- /dev/null +++ b/modelchecker/tests/2.cs @@ -0,0 +1 @@ +$+. diff --git a/modelchecker/tests/2.ct b/modelchecker/tests/2.ct new file mode 100644 index 0000000..7c7130f --- /dev/null +++ b/modelchecker/tests/2.ct @@ -0,0 +1 @@ +.+$ diff --git a/modelchecker/tests/2.cu b/modelchecker/tests/2.cu new file mode 100644 index 0000000..4779a9f --- /dev/null +++ b/modelchecker/tests/2.cu @@ -0,0 +1 @@ +$.@ diff --git a/modelchecker/tests/2.cw b/modelchecker/tests/2.cw new file mode 100644 index 0000000..9665c94 --- /dev/null +++ b/modelchecker/tests/2.cw @@ -0,0 +1 @@ +$.+ diff --git a/modelchecker/tests/2.da b/modelchecker/tests/2.da new file mode 100644 index 0000000..5802d41 --- /dev/null +++ b/modelchecker/tests/2.da @@ -0,0 +1 @@ +@.* diff --git a/modelchecker/tests/2.dc b/modelchecker/tests/2.dc new file mode 100644 index 0000000..07ad1a7 --- /dev/null +++ b/modelchecker/tests/2.dc @@ -0,0 +1 @@ ++.* diff --git a/modelchecker/tests/2.dd b/modelchecker/tests/2.dd new file mode 100644 index 0000000..e8f78e6 --- /dev/null +++ b/modelchecker/tests/2.dd @@ -0,0 +1 @@ +*@. diff --git a/modelchecker/tests/2.de b/modelchecker/tests/2.de new file mode 100644 index 0000000..8cbe2d6 --- /dev/null +++ b/modelchecker/tests/2.de @@ -0,0 +1 @@ +.@* diff --git a/modelchecker/tests/2.df b/modelchecker/tests/2.df new file mode 100644 index 0000000..5915301 --- /dev/null +++ b/modelchecker/tests/2.df @@ -0,0 +1 @@ +*+. diff --git a/modelchecker/tests/2.dg b/modelchecker/tests/2.dg new file mode 100644 index 0000000..46a34b1 --- /dev/null +++ b/modelchecker/tests/2.dg @@ -0,0 +1 @@ +.+* diff --git a/modelchecker/tests/2.dh b/modelchecker/tests/2.dh new file mode 100644 index 0000000..1baf176 --- /dev/null +++ b/modelchecker/tests/2.dh @@ -0,0 +1 @@ +*.@ diff --git a/modelchecker/tests/2.dj b/modelchecker/tests/2.dj new file mode 100644 index 0000000..3164958 --- /dev/null +++ b/modelchecker/tests/2.dj @@ -0,0 +1 @@ +*.+ diff --git a/modelchecker/tests/3.ae b/modelchecker/tests/3.ae new file mode 100644 index 0000000..5644553 --- /dev/null +++ b/modelchecker/tests/3.ae @@ -0,0 +1 @@ +@ diff --git a/modelchecker/tests/3.af b/modelchecker/tests/3.af new file mode 100644 index 0000000..ee5f1c3 --- /dev/null +++ b/modelchecker/tests/3.af @@ -0,0 +1 @@ ++ diff --git a/modelchecker/tests/3.ag b/modelchecker/tests/3.ag new file mode 100644 index 0000000..6400bed --- /dev/null +++ b/modelchecker/tests/3.ag @@ -0,0 +1 @@ + @ diff --git a/modelchecker/tests/3.ah b/modelchecker/tests/3.ah new file mode 100644 index 0000000..8d570bc --- /dev/null +++ b/modelchecker/tests/3.ah @@ -0,0 +1 @@ + + diff --git a/modelchecker/tests/3.ai b/modelchecker/tests/3.ai new file mode 100644 index 0000000..5bd7b57 --- /dev/null +++ b/modelchecker/tests/3.ai @@ -0,0 +1 @@ + @ diff --git a/modelchecker/tests/3.aj b/modelchecker/tests/3.aj new file mode 100644 index 0000000..0c1c7ad --- /dev/null +++ b/modelchecker/tests/3.aj @@ -0,0 +1 @@ + + diff --git a/modelchecker/tests/3.ak b/modelchecker/tests/3.ak new file mode 100644 index 0000000..1c559b3 --- /dev/null +++ b/modelchecker/tests/3.ak @@ -0,0 +1 @@ +@.. diff --git a/modelchecker/tests/3.al b/modelchecker/tests/3.al new file mode 100644 index 0000000..552ccae --- /dev/null +++ b/modelchecker/tests/3.al @@ -0,0 +1 @@ ++.. diff --git a/modelchecker/tests/3.am b/modelchecker/tests/3.am new file mode 100644 index 0000000..2a7f3cd --- /dev/null +++ b/modelchecker/tests/3.am @@ -0,0 +1 @@ +.@. diff --git a/modelchecker/tests/3.an b/modelchecker/tests/3.an new file mode 100644 index 0000000..1ebfeac --- /dev/null +++ b/modelchecker/tests/3.an @@ -0,0 +1 @@ +.+. diff --git a/modelchecker/tests/3.ao b/modelchecker/tests/3.ao new file mode 100644 index 0000000..51a2953 --- /dev/null +++ b/modelchecker/tests/3.ao @@ -0,0 +1 @@ +..@ diff --git a/modelchecker/tests/3.ap b/modelchecker/tests/3.ap new file mode 100644 index 0000000..2b39a1b --- /dev/null +++ b/modelchecker/tests/3.ap @@ -0,0 +1 @@ +..+ diff --git a/modelchecker/tests/3.bc b/modelchecker/tests/3.bc new file mode 100644 index 0000000..eef7761 --- /dev/null +++ b/modelchecker/tests/3.bc @@ -0,0 +1 @@ +@. diff --git a/modelchecker/tests/3.bd b/modelchecker/tests/3.bd new file mode 100644 index 0000000..1d89be2 --- /dev/null +++ b/modelchecker/tests/3.bd @@ -0,0 +1 @@ +@ . diff --git a/modelchecker/tests/3.be b/modelchecker/tests/3.be new file mode 100644 index 0000000..67d4a5d --- /dev/null +++ b/modelchecker/tests/3.be @@ -0,0 +1 @@ ++. diff --git a/modelchecker/tests/3.bf b/modelchecker/tests/3.bf new file mode 100644 index 0000000..dc2b92b --- /dev/null +++ b/modelchecker/tests/3.bf @@ -0,0 +1 @@ ++ . diff --git a/modelchecker/tests/3.bg b/modelchecker/tests/3.bg new file mode 100644 index 0000000..c7c0090 --- /dev/null +++ b/modelchecker/tests/3.bg @@ -0,0 +1 @@ +.@ diff --git a/modelchecker/tests/3.bh b/modelchecker/tests/3.bh new file mode 100644 index 0000000..4f3e30b --- /dev/null +++ b/modelchecker/tests/3.bh @@ -0,0 +1 @@ + @. diff --git a/modelchecker/tests/3.bi b/modelchecker/tests/3.bi new file mode 100644 index 0000000..dc9b5cf --- /dev/null +++ b/modelchecker/tests/3.bi @@ -0,0 +1 @@ +.+ diff --git a/modelchecker/tests/3.bj b/modelchecker/tests/3.bj new file mode 100644 index 0000000..815c378 --- /dev/null +++ b/modelchecker/tests/3.bj @@ -0,0 +1 @@ + +. diff --git a/modelchecker/tests/3.bk b/modelchecker/tests/3.bk new file mode 100644 index 0000000..ccb58de --- /dev/null +++ b/modelchecker/tests/3.bk @@ -0,0 +1 @@ +. @ diff --git a/modelchecker/tests/3.bl b/modelchecker/tests/3.bl new file mode 100644 index 0000000..fdfbe90 --- /dev/null +++ b/modelchecker/tests/3.bl @@ -0,0 +1 @@ + .@ diff --git a/modelchecker/tests/3.bm b/modelchecker/tests/3.bm new file mode 100644 index 0000000..d8cd4de --- /dev/null +++ b/modelchecker/tests/3.bm @@ -0,0 +1 @@ +. + diff --git a/modelchecker/tests/3.bn b/modelchecker/tests/3.bn new file mode 100644 index 0000000..353d1f3 --- /dev/null +++ b/modelchecker/tests/3.bn @@ -0,0 +1 @@ + .+