From 80478947e803282def629dcb984d633c1a056fa0 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Mon, 19 Feb 2007 22:51:17 +0100
Subject: [PATCH] new test program, part 1

---
 tests/20basic.tests | 76 ++++++++++++++++++++++++++++++---------------
 tests/Makefile.am   |  2 +-
 tests/test-mala.c   | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 26 deletions(-)
 create mode 100644 tests/test-mala.c

diff --git a/tests/20basic.tests b/tests/20basic.tests
index 768cd84..3aa7de8 100644
--- a/tests/20basic.tests
+++ b/tests/20basic.tests
@@ -1,10 +1,10 @@
 # arch-tag: org.pipapo.mala.tests.basic
 
-TESTING "basic tests:" ./test-mala_nopp
+TESTING "basic tests:" ./test-mala
 
 TEST "no args" <<END
-
-
+stdout: .
+variable: (null)
 state: MACRO
 END
 
@@ -15,78 +15,104 @@ END
 
 
 TEST "print" foo --PRINT bar <<END
-bar
-foo
+stdout: bar.
+literal: foo.
+variable: (null)
 state: STATEMENT
 END
 
 
 TEST "subst" --SUBST-TEST <<END
-
-SUBST_SUCCEEDED
+stdout: .
+literal: SUBST_SUCCEEDED.
+variable: (null)
 state: LITERAL
 END
 
 
 TEST "expand" --FOOBAR <<END
-
-foo bar
+stdout: .
+literal: foo.
+literal: bar.
+variable: (null)
 state: LITERAL
 END
 
 
 TEST "cat" --CAT foo bar <<END
-
-foobar
+stdout: .
+literal: foobar.
+variable: (null)
 state: LITERAL
 END
 
 
 TEST "--LITERAL" --LITERAL --LITERAL foobar <<END
-
---LITERAL foobar
+stdout: .
+literal: --LITERAL.
+literal: foobar.
+variable: (null)
 state: LITERAL
 END
 
 
 TEST "--SKIP" --SKIP 1 --PRINT foo --PRINT bar --PRINT baz <<END
-barbaz
---PRINT foo
+stdout: barbaz.
+literal: --PRINT.
+literal: foo.
+variable: (null)
 state: STATEMENT
 END
 
 
 TEST "--SKIP 0" --SKIP 0 --PRINT foo --PRINT bar --PRINT baz <<END
-foobarbaz
-
+stdout: foobarbaz.
+variable: (null)
 state: STATEMENT
 END
 
 
 TEST "--SKIP -1" --SKIP -1 --PRINT foo --PRINT bar --PRINT baz <<END
-
---ERROR-OUT-OF-RANGE --SKIP -1 --PRINT foo --PRINT bar --PRINT baz
+stdout: .
+literal: --ERROR-OUT-OF-RANGE.
+literal: --SKIP.
+literal: -1.
+literal: --PRINT.
+literal: foo.
+literal: --PRINT.
+literal: bar.
+literal: --PRINT.
+literal: baz.
+variable: (null)
 state: ENOACTION
 END
 
 
 TEST "--SKIP 2" --SKIP 2 --PRINT foo --PRINT bar --PRINT baz <<END
-barbaz
---PRINT foo
+stdout: barbaz.
+literal: --PRINT.
+literal: foo.
+variable: (null)
 state: STATEMENT
 END
 
 
 TEST "--SKIP 2 none" --SKIP 2 --PRINT foo <<END
-
---PRINT foo
+stdout: .
+literal: --PRINT.
+literal: foo.
+variable: (null)
 state: STATEMENT
 END
 
 
 TEST "--SKIP 2 missing" --SKIP 2 --PRINT <<END
-
---ERROR-MISSING-ARGUMENT --SKIP 2 --PRINT
+stdout: .
+literal: --ERROR-MISSING-ARGUMENT.
+literal: --SKIP.
+literal: 2.
+literal: --PRINT.
+variable: (null)
 state: ENOACTION
 END
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 824edbd..768620b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -I$(top_srcdir)/std
 
-noinst_PROGRAMS = test-mala_strings test-mala_stringlists test-mala_expansions test-mala_nopp test-mala_stdmodule bench-stringbucket
+noinst_PROGRAMS = test-mala test-mala_strings test-mala_stringlists bench-stringbucket
 LDADD = ../engine/libmalaengine.a ../std/libmalastd.a
 
 TESTS = test.sh
diff --git a/tests/test-mala.c b/tests/test-mala.c
new file mode 100644
index 0000000..05d3d32
--- /dev/null
+++ b/tests/test-mala.c
@@ -0,0 +1,88 @@
+/*
+    test-mala.c - MaLa test driver
+
+  Copyright (C) 2004, Christian Thaeter <chth@gmx.net>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, contact me.
+
+*/
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <nobug.h>
+#include <acogc.h>
+
+#include "mala.h"
+#include "std.h"
+
+mala_actioninit my_actions[] =
+  {
+    MALA_PARSER_SUBSTITUTE("--SUBST-TEST","SUBST_SUCCEEDED"),
+    MALA_PARSER_EXPAND("--FOOBAR",("foo","bar")),
+    MALA_ACTIONS_END
+  };
+
+int
+main(int argc, char * argv[])
+{
+  MalaEngine engine;
+
+  engine = mala_engine_new ();
+
+  TRACE (NOBUG_ON);
+
+  ACOGC_STACK_ENTER (&engine->gcroot);
+  ACOGC_STACK_PTR (MalaStringList, args);
+  ACOGC_STACK_PTR (MalaStringList, result);
+
+  mala_module_std_init (engine);
+
+  // TODO mala_engine_new_main
+  mala_engine_actions_register (engine, my_actions);
+
+  args.ptr = mala_stringlist_new (engine);
+  mala_stringlist_append_cstrs (args.ptr, argc - 1, argv + 1, engine);
+
+  mala_engine_action_new_cstr (engine, "--ARGV0",
+                               mala_substitute_parser,
+                               argv[0], ACOGC_STATIC,
+                               mala_engine_action_get_cstr (engine, "--WORLD"));
+
+  mala_engine_action_new_cstr (engine, "--COMMANDLINE",
+                               mala_expand_parser,
+                               args.ptr, ACOGC_GC,
+                               mala_engine_action_get_cstr (engine, "--WORLD"));
+
+  printf ("stdout: ");
+  mala_engine_run_cstr (engine, "--COMMANDLINE", &result.ptr);
+
+  mala_stringlist_dump (result.ptr, stdout, ".\n", "literal: ","%s.\n", "", "");
+
+
+  printf ("variable: %s\n", getenv ("variable"));
+  printf ("state: %s\n", mala_engine_state_str (engine));
+  ACOGC_STACK_LEAVE;
+  mala_engine_free (engine);
+  return 0;
+}
+
+
+
+/*
+// Local Variables:
+// mode: C
+// c-file-style: "gnu"
+// End:
+// arch-tag: 610917e5-3918-4cba-be05-bf83efb45223
+// end_of_file
+*/
-- 
2.11.4.GIT