From 3affb51bbd06872fec36123a558b3d28d0938a61 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <chth@gmx.net>
Date: Wed, 17 Aug 2005 03:34:24 +0000
Subject: [PATCH] test suite improvements

git-archimport-id: chth@gmx.net--2004/mala-glibc--devel--0.2--patch-92
---
 ChangeLog                                      |  20 ++
 tests/{mala_strings.test => 10stringlib.tests} |   4 +-
 tests/20basic.tests                            |   9 +
 tests/30expansion.tests                        | 160 +++++++++++
 tests/40stdmodule.tests                        | 362 +++++++++++++++++++++++++
 tests/50arithmodule.tests                      |  10 +
 tests/test.sh                                  |  92 ++++---
 7 files changed, 621 insertions(+), 36 deletions(-)
 rename tests/{mala_strings.test => 10stringlib.tests} (93%)
 create mode 100644 tests/20basic.tests
 create mode 100644 tests/30expansion.tests
 create mode 100644 tests/40stdmodule.tests
 create mode 100644 tests/50arithmodule.tests

diff --git a/ChangeLog b/ChangeLog
index 004e92d..66a4ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 # arch-tag: automatic-ChangeLog--chth@gmx.net--2004/mala-glibc--devel--0.2
 #
 
+2005-08-17 03:34:24 GMT	Christian Thaeter <chth@gmx.net>	patch-92
+
+    Summary:
+      test suite improvements
+    Revision:
+      mala-glibc--devel--0.2--patch-92
+
+
+    new files:
+     tests/20basic.tests tests/30expansion.tests
+     tests/40stdmodule.tests tests/50arithmodule.tests
+
+    modified files:
+     ChangeLog tests/10stringlib.tests tests/test.sh
+
+    renamed files:
+     tests/mala_strings.test
+       ==> tests/10stringlib.tests
+
+
 2005-08-16 23:22:51 GMT	Christian Thaeter <chth@gmx.net>	patch-91
 
     Summary:
diff --git a/tests/mala_strings.test b/tests/10stringlib.tests
similarity index 93%
rename from tests/mala_strings.test
rename to tests/10stringlib.tests
index 9480177..4847d69 100644
--- a/tests/mala_strings.test
+++ b/tests/10stringlib.tests
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, contact me.
 
-TEST "strings" <<END
+TESTING "mala stringlibrary test:" ./test-mala_strings
+
+TEST "stringlib" <<END
 TEST a = mala_string_new ("bar", test): .. OK
 TEST b = mala_string_new ("baz", test): .. OK
 TEST c = mala_string_new ("bar", test): .. OK
diff --git a/tests/20basic.tests b/tests/20basic.tests
new file mode 100644
index 0000000..d97fb15
--- /dev/null
+++ b/tests/20basic.tests
@@ -0,0 +1,9 @@
+# arch-tag: org.pipapo.mala.tests.basic
+
+TESTING "basic startup test:" ./test-mala_stdmodule
+
+TEST "no args" <<END
+variable: (null)
+negated: 0
+state: 0
+END
diff --git a/tests/30expansion.tests b/tests/30expansion.tests
new file mode 100644
index 0000000..d6ed83a
--- /dev/null
+++ b/tests/30expansion.tests
@@ -0,0 +1,160 @@
+# arch-tag: org.pipapo.mala.tests.expansion
+
+TESTING "plain engine/ppexpansion tests:" ./test-mala_expansions
+
+TEST "no args" <<END
+prg: --NULL
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "one longopt" --foo <<END
+prg: --foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "one shortopt" -f <<END
+prg: -f
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "2 args" foo bar <<END
+prg: foo
+prg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+
+TEST "simple exclam_expansion" ! --foo <<END
+prg: --NOT
+prg: --foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple no_expansion" --no-foo <<END
+prg: --NOT
+prg: --foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple char_expansion" -foo+bar <<END
+prg: -f
+prg: -o
+prg: -o
+prg: +b
+prg: +a
+prg: +r
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple assign_expansion" --foo=bar <<END
+prg: --foo
+prg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+
+TEST "simple setenv_expansion" variable=foobar <<END
+prg: --SETENV
+prg: variable
+prg: foobar
+variable: (null)
+negated: 0
+state: 0
+END
+
+
+export FOO=BAR
+TEST "simple envvar_expansion" --\$FOO <<END
+prg: --ENVSUBST
+prg: --\$FOO
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple underscore_expansion" --foo_bar <<END
+prg: --foo-bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple numsplit_expansion" -f00 <<END
+prg: -f
+prg: 00
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple bracket_expansion" [foobar] <<END
+prg: --SECTION
+prg: foobar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "simple assign_contraction" variable = foobar <<END
+prg: --SETENV
+prg: variable
+prg: foobar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "complex" variable = foobar --no-\$variable <<END
+prg: --SETENV
+prg: variable
+prg: foobar
+prg: --NOT
+prg: --ENVSUBST
+prg: --\$variable
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "complex envvar_expansion 1" --no-\${FOO} <<END
+prg: --NOT
+prg: --ENVSUBST
+prg: --\${FOO}
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "complex longopt assign_expansion with spaces" --foo="bar baz" <<END
+prg: --foo
+prg: bar baz
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "shortopt with number" -foo0bar <<END
+prg: -f
+prg: -o
+prg: -o
+prg: 0bar
+variable: (null)
+negated: 0
+state: 0
+END
diff --git a/tests/40stdmodule.tests b/tests/40stdmodule.tests
new file mode 100644
index 0000000..1e9f065
--- /dev/null
+++ b/tests/40stdmodule.tests
@@ -0,0 +1,362 @@
+# arch-tag: org.pipapo.mala.tests.stdmodule
+
+TESTING "stdmodule tests:" ./test-mala_stdmodule
+
+TEST "no args" <<END
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "--LITERAL" --LITERAL --LITERAL foobar <<END
+arg: --LITERAL
+arg: foobar
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "negated --LITERAL" ! --LITERAL <<END
+prg: --ERROR-NEGATED
+prg: --LITERAL
+prg: --HERE-ERROR-NEGATED
+variable: (null)
+negated: -1
+state: 6
+END
+
+TEST "missing arg at --PRINT" --PRINT <<END
+prg: --ERROR-MISSINGARG
+prg: --PRINT
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "--no-PRINT" --no-PRINT <<END
+prg: --ERROR-UNEXPECTED-NEGATED
+prg: --PRINT
+prg: --HERE
+variable: (null)
+negated: -1
+state: 6
+END
+
+TEST "--PRINT --LITERAL" --PRINT --LITERAL --LITERAL --NL <<END
+--LITERAL
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "--PRINT and --NL" --PRINT "foo bar" --NL <<END
+foo bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "negated --DEF" ! --DEF foo bar --END-DEF <<END
+prg: --ERROR-NEGATED
+prg: --DEF
+prg: --HERE-ERROR-NEGATED
+prg: foo
+prg: bar
+prg: --END-DEF
+variable: (null)
+negated: -1
+state: 6
+END
+
+TEST "missing name at --DEF" --DEF <<END
+prg: --ERROR-MISSING-ARGUMENT
+prg: --DEF
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "missing body at --DEF" --DEF foo <<END
+prg: --ERROR-MISSING-ARGUMENT
+prg: --DEF
+prg: foo
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "define macro w/o parameter" --DEF foo --BEGIN bar baz --END <<END
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "substitute"  --DEF foo bar foo <<END
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "expand macro w/o parameter" --DEF foo --BEGIN bar baz --END foo <<END
+arg: bar
+arg: baz
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "define macro w/ parameter" --DEF foo --BEGIN %1 bar --END <<END
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "expand macro w/ parameter" --DEF foo --BEGIN %1 bar --END foo baz <<END
+arg: baz
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "%% expand test" --DEF foo foo%%bar foo baz <<END
+arg: foo%bar
+arg: baz
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "%0 expand test" --DEF foo foo%0bar --END-DEF foo baz <<END
+arg: foofoobar
+arg: baz
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "%PREV expand test" --DEF foo bar barf --END-DEF --DEF foo baz %PREV --END-DEF foo gnarf <<END
+arg: baz
+arg: bar
+arg: barf
+arg: gnarf
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "%END expand test" --DEF --foo bar %END--END-foo barf --END-DEF --foo bat baz --END-foo gnarf <<END
+arg: bar
+arg: bat
+arg: baz
+arg: barf
+arg: gnarf
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "%END escape test" --DEF foo 1 %ENDendfoo 2 --END-DEF 3 foo 4 --ESCAPE endfoo 5 endfoo 6 <<END
+arg: 3
+arg: 1
+arg: 4
+arg: endfoo
+arg: 5
+arg: 2
+arg: 6
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "define nested macro w/o parameter" --DEF foo --BEGIN bar --DEF baz --BEGIN barf gnarf --END --END baz foo baz <<END
+arg: baz
+arg: bar
+arg: barf
+arg: gnarf
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "variable expansion in macro" variable = bar --DEF foo '$variable' --END-DEF --PRINT foo --NL <<END
+bar
+variable: bar
+negated: 0
+state: 0
+END
+
+TEST "missing macro argument" --DEF foo %2 --END-DEF foo bar <<END
+prg: --ERROR-MISSING-ARGUMENT
+prg: foo
+prg: bar
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "stale --END" --PRINT foo --NL --END <<END
+foo
+prg: --ERROR-END-WITHOUT-BEGIN
+prg: --END
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "escaped argument" --DEF foo %%1 foo <<END
+arg: %1
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "invalid macro" --DEF foo %illegal foo bar <<END
+prg: --ERROR-PARAMETER-SYNTAX
+prg: foo
+prg: %illegal
+prg: --HERE
+prg: foo
+prg: bar
+variable: (null)
+negated: 0
+state: 6
+END
+
+PLANNED "definition redefinition" --DEF --substitute --ESCAPE --DEF %1 %2 --ESCAPE --END-DEF --END-DEF --substitute foo bar foo <<END
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "printl" --PRINTL --LITERAL foo <<END
+foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "undef substitution" --DEF foo bar foo --UNDEF foo foo <<END
+arg: bar
+arg: foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "undef error" --UNDEF foo <<END
+prg: --ERROR-UNKNOWN-ACTION
+prg: --UNDEF
+prg: foo
+prg: --HERE
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "undef expand" --DEF foo --BEGIN bar baz --END foo --UNDEF foo foo <<END
+arg: bar
+arg: baz
+arg: foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+TEST "undef macro" --DEF foo --BEGIN bar %1 --END foo baz --UNDEF foo foo baz <<END
+arg: bar
+arg: baz
+arg: foo
+arg: baz
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "redef macro" --DEF foo bar --REDEF foo baz foo goo --UNDEF foo --UNDEF foo <<END
+arg: baz
+arg: goo
+prg: --ERROR-UNKNOWN-ACTION
+prg: --UNDEF
+prg: foo
+prg: --HERE-ERROR-UNKNOWN-ACTION
+variable: (null)
+negated: 0
+state: 6
+END
+
+TEST "defined" --DEFINED --DEF ! --DEFINED foo --DEFINED bar --NO-DEFINED --DEFINED <<END
+arg: --TRUE
+arg: --TRUE
+arg: --FALSE
+arg: --FALSE
+variable: (null)
+negated: 0
+state: 1
+END
+
+PLANNED "attach" --DEF foo bar --END-DEF --DEF baz barf --END-DEF --ATTACH foo baz foo --UNDEF baz foo <<END
+arg: bar
+arg: foo
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "detach" --DEF foo bar --END-DEF --DEF baz barf --END-DEF --ATTACH foo baz foo --DETACH foo --UNDEF baz foo <<END
+arg: bar
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "if" --IF --TRUE success --END-IF --IF --FALSE fail --END-IF bar <<END
+arg: success
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "elif true" --TEST --FALSE --ELIF --TRUE success --END-ELIF bar <<END
+arg: success
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "elif false" --TEST --FALSE --ELIF --FALSE success --END-ELIF <<END
+variable: (null)
+negated: 0
+state: 1
+END
+
+PLANNED "elif not entered" --TEST --TRUE --ELIF --TRUE success --END-ELIF <<END
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "else passed" --TEST --TRUE --ELSE success --END-ELSE bar <<END
+arg: bar
+variable: (null)
+negated: 0
+state: 0
+END
+
+PLANNED "else entered" --TEST --FALSE --ELSE success --END-ELSE <<END
+arg: success
+variable: (null)
+negated: 0
+state: 0
+END
+
diff --git a/tests/50arithmodule.tests b/tests/50arithmodule.tests
new file mode 100644
index 0000000..123590b
--- /dev/null
+++ b/tests/50arithmodule.tests
@@ -0,0 +1,10 @@
+# arch-tag: org.pipapo.mala.tests.arithmodule
+
+TESTING "arithmodule tests:" ./test-mala_arithmodule
+
+PLANNED "faculty" --DEF fac --IF --EQ %1 0 1 --END-IF --ELSE --MUL %1 --ASSIGN t --SUB %1 1 fac t --END-ELSE --END-DEF --PRINTL fac 12 <<END
+479001600
+variable: (null)
+negated: 0
+state: 0
+END
diff --git a/tests/test.sh b/tests/test.sh
index c2523a7..7a36f45 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, contact me.
 
+# TESTMODE=RELEASE yet unimplemented
+#   run all tests, PLANNED which fail count as error
+#
+# TESTMODE=DEBUG
+#   run only tests which recently failed
+
 arg0="$0"
 srcdir=$(dirname "$arg0")
 
@@ -38,21 +44,51 @@ TESTCNT=0
 SKIPCNT=0
 FAILCNT=0
 
+if test -f ,testlog; then
+    mv ,testlog ,testlog.pre
+else
+    touch ,testlog.pre
+fi
+
 date >,testlog
 
 function TEST()
 {
+        name="$1"
+	shift
 	cat >,cmp
 	echo -n "" >,out
-	echo -n "TEST $1: "
-	echo -en "\nTEST $* " >>,testlog
-	shift
+	echo -n "TEST $name: "
+	echo -en "\nTEST $name: $* " >>,testlog
+
+        case $TESTMODE in
+        DEBUG)
+            if grep "^TEST $name: .* FAILED" ,testlog.pre >&/dev/null; then
+                MSGOK=" (fixed)"
+                MSGFAIL=" (still broken)"
+            elif grep "^TEST $name: .* \\(SKIPPED (ok)\\|OK\\)" ,testlog.pre >&/dev/null; then
+                echo ".. SKIPPED (ok)"
+                echo ".. SKIPPED (ok)" >>,testlog
+                SKIPCNT=$(($SKIPCNT + 1))
+                TESTCNT=$(($TESTCNT + 1))
+                return
+            else
+                MSGOK=" (new)"
+                MSGFAIL=" (new)"
+            fi
+            ;;
+        *)
+            MSGOK=""
+            MSGFAIL=""
+            ;;
+        esac
+
 	if $valgrind $TESTBIN "$@" 2>&1 | tee ,tmp | grep -v 'DEBUG:' | cmp ,cmp - &>/dev/null; then
-            echo ".. OK"
-            echo ".. OK" >>,testlog
+            echo ".. OK$MSGOK"
+            echo ".. OK$MSGOK" >>,testlog
         else
-            echo ".. FAILED";
-            echo ".. FAILED" >>,testlog
+            echo ".. FAILED$MSGFAIL";
+            echo ".. FAILED$MSGFAIL" >>,testlog
             grep -v 'DEBUG:' <,tmp >,out
             diff -ua ,cmp ,out >>,testlog
             # grep 'DEBUG:\|==.*==' <,tmp >>,testlog
@@ -67,14 +103,18 @@ function PLANNED()
 {
 	echo -n "PLANNED $1: "
 	echo -en "\nPLANNED $* " >>,testlog
-        echo ".. SKIPPED"
-        echo ".. SKIPPED" >>,testlog
+        echo ".. SKIPPED (planned)"
+        echo ".. SKIPPED (planned)" >>,testlog
         SKIPCNT=$(($SKIPCNT + 1))
         TESTCNT=$(($TESTCNT + 1))
 }
 
-function TESTSUMMARY()
+function RUNTESTS()
 {
+    for i in $srcdir/*.tests; do
+        source $i
+    done
+    echo
     rm ,cmp ,out ,tmp
     if [ $FAILCNT = 0 ]; then
         echo " ... PASSED $(($TESTCNT - $SKIPCNT)) TESTS, $SKIPCNT SKIPPED"
@@ -88,32 +128,14 @@ function TESTSUMMARY()
     fi
 }
 
-echo
-echo "string library tests:"
-TESTBIN=./test-mala_strings
-source $srcdir/mala_strings.test
-
-echo
-echo "basic startup tests:"
-TESTBIN=./test-mala_stdmodule
-source ../../../tests/basic_tests
-
-echo
-echo "plain engine/expansion tests:"
-TESTBIN=./test-mala_expansions
-source ../../../tests/expansion_tests
-
-echo
-echo "stdmodule tests:"
-TESTBIN=./test-mala_stdmodule
-source ../../../tests/stdmodule_tests
-
-#echo
-#echo "arithmodule tests:"
-#TESTBIN=./test-mala_arithmodule
-#source ../../../tests/arithmodule_tests
+function TESTING()
+{
+    echo
+    echo "$1"
+    TESTBIN=$2
+}
 
-TESTSUMMARY
+RUNTESTS
 
 # arch-tag: f4d06a47-6e17-40de-bba8-17240ae3f435
 
-- 
2.11.4.GIT