* src/ltltest/tostring.test: Simplify with set -e. Move the

description of the test ...
* src/ltltest/tostring.cc: ... here, where it is actually coded.
* src/ltltest/lunabbrev.test, src/ltltest/tunabbrev.test,
src/ltltest/nenoform.test,  src/ltltest/tunenoform.test:
Simplify with set -e.
This commit is contained in:
Alexandre Duret-Lutz 2003-04-29 11:26:16 +00:00
parent 03e893b23d
commit d17a86e87d
7 changed files with 115 additions and 130 deletions

View file

@ -4,36 +4,30 @@
. ./defs || exit 1
check()
{
./tunabbrev "$1" "$2" || exit 1
}
set -e
# A few things that do not change
check 'a' 'a'
check '1' '1'
check '0' '0'
check 'a U b' 'a U b'
check 'a & b' 'a & b'
check 'a & b' 'b & a'
check 'a & b & c' 'c & a & b'
check 'a & b & c' 'b & c & a'
check 'a & b & a' 'b & a & b'
check 'a & b' 'b & a & b'
check 'a & b' 'b & a & a'
check 'a & b & (c |(f U g)| e)' 'b & a & a & (c | e |(f U g)| e | c) & b'
./tunabbrev 'a' 'a'
./tunabbrev '1' '1'
./tunabbrev '0' '0'
./tunabbrev 'a U b' 'a U b'
./tunabbrev 'a & b' 'a & b'
./tunabbrev 'a & b' 'b & a'
./tunabbrev 'a & b & c' 'c & a & b'
./tunabbrev 'a & b & c' 'b & c & a'
./tunabbrev 'a & b & a' 'b & a & b'
./tunabbrev 'a & b' 'b & a & b'
./tunabbrev 'a & b' 'b & a & a'
./tunabbrev 'a & b & (c |(f U g)| e)' 'b & a & a & (c | e |(f U g)| e | c) & b'
# same as in lunabbrev.test:
check 'a ^ b' '(a & !b) | (!a & b)'
check 'a ^ Xb' '(!Xb & a) | (!a & Xb) | (Xb & !a)'
check '!a <-> Xb' '(Xb & !a) | (!!a & !Xb)'
check '(a ^ b) | (b ^ c)' '(c & !b) | (!c & b) | (a & !b) | (!a & b)'
./tunabbrev 'a ^ b' '(a & !b) | (!a & b)'
./tunabbrev 'a ^ Xb' '(!Xb & a) | (!a & Xb) | (Xb & !a)'
./tunabbrev '!a <-> Xb' '(Xb & !a) | (!!a & !Xb)'
./tunabbrev '(a ^ b) | (b ^ c)' '(c & !b) | (!c & b) | (a & !b) | (!a & b)'
# LTL unabbreviations:
check 'G a ' 'false R a'
check 'GF a => F G(b)' '!(false R (true U a)) | (true U (false V b))'
check 'GGGGa' 'false V (false V (false V (false V a)))'
check 'FFFfalse' 'true U ((true) U (true U (false)))'
# Success.
:
./tunabbrev 'G a ' 'false R a'
./tunabbrev 'GF a => F G(b)' '!(false R (true U a)) | (true U (false V b))'
./tunabbrev 'GGGGa' 'false V (false V (false V (false V a)))'
./tunabbrev 'FFFfalse' 'true U ((true) U (true U (false)))'