From c83f5c5360ea8b67ae4fd81c35ae606724aa0da9 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 25 Sep 2010 15:45:35 -0700 Subject: [PATCH] stringi-set: Convert tests to use Autotest. --- tests/automake.mk | 3 +- tests/libpspp/stringi-set-test.c | 147 +++++++++++++++++++++++-------- tests/libpspp/stringi-set.at | 21 +++++ 3 files changed, 133 insertions(+), 38 deletions(-) create mode 100644 tests/libpspp/stringi-set.at diff --git a/tests/automake.mk b/tests/automake.mk index 52d35ae0..9e6b90f0 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -146,7 +146,6 @@ dist_TESTS += tests/command/get-data-psql.sh endif nodist_TESTS = \ - tests/libpspp/stringi-set-test \ tests/libpspp/tower-test TESTS = $(dist_TESTS) $(nodist_TESTS) @@ -171,6 +170,7 @@ check_PROGRAMS += \ tests/libpspp/string-map-test \ tests/libpspp/stringi-map-test \ tests/libpspp/string-set-test \ + tests/libpspp/stringi-set-test \ tests/output/render-test tests_data_datasheet_test_SOURCES = \ @@ -433,6 +433,7 @@ TESTSUITE_AT = \ tests/libpspp/string-map.at \ tests/libpspp/stringi-map.at \ tests/libpspp/string-set.at \ + tests/libpspp/stringi-set.at \ tests/math/moments.at \ tests/output/render.at \ tests/output/charts.at \ diff --git a/tests/libpspp/stringi-set-test.c b/tests/libpspp/stringi-set-test.c index 25f52c82..a20e84ce 100644 --- a/tests/libpspp/stringi-set-test.c +++ b/tests/libpspp/stringi-set-test.c @@ -38,9 +38,6 @@ #include "libpspp/compiler.h" #include "libpspp/str.h" -/* Currently running test. */ -static const char *test_name; - /* Exit with a failure code. (Place a breakpoint on this function while debugging.) */ static void @@ -56,8 +53,7 @@ check_func (bool ok, int line) { if (!ok) { - printf ("Check failed in %s test at %s, line %d\n", - test_name, __FILE__, line); + fprintf (stderr, "%s:%d: check failed\n", __FILE__, line); check_die (); } } @@ -682,38 +678,115 @@ test_destroy_null (void) /* Main program. */ -/* Runs TEST_FUNCTION and prints a message about NAME. */ -static void -run_test (void (*test_function) (void), const char *name) -{ - test_name = name; - putchar ('.'); - fflush (stdout); - test_function (); -} +struct test + { + const char *name; + const char *description; + void (*function) (void); + }; + +static const struct test tests[] = + { + { + "insert-any-remove-any", + "insert any order, delete any order", + test_insert_any_remove_any + }, + { + "insert-any-remove-same", + "insert any order, delete same order", + test_insert_any_remove_same + }, + { + "insert-any-remove-reverse", + "insert any order, delete reverse order", + test_insert_any_remove_reverse + }, + { + "random-sequence", + "insert and delete in random sequence", + test_random_sequence + }, + { + "insert-ordered", + "insert in ascending order", + test_insert_ordered + }, + { + "union", + "union", + test_union + }, + { + "union-and-intersection", + "union and intersection", + test_union_and_intersection + }, + { + "intersect", + "intersect", + test_intersect + }, + { + "subtract", + "subtract", + test_subtract + }, + { + "swap", + "swap", + test_swap + }, + { + "clear", + "clear", + test_clear + }, + { + "clone", + "clone", + test_clone + }, + { + "destroy-null", + "destroying null table", + test_destroy_null + }, + }; + +enum { N_TESTS = sizeof tests / sizeof *tests }; int -main (void) -{ - run_test (test_insert_any_remove_any, "insert any order, delete any order"); - run_test (test_insert_any_remove_same, - "insert any order, delete same order"); - run_test (test_insert_any_remove_reverse, - "insert any order, delete reverse order"); - run_test (test_random_sequence, "insert and delete in random sequence"); - run_test (test_insert_ordered, "insert in ascending order"); - run_test (test_union, "union"); - run_test (test_union_and_intersection, "union and intersection"); - run_test (test_intersect, "intersect"); - run_test (test_subtract, "subtract"); - run_test (test_swap, "swap"); - run_test (test_clear, "clear"); - run_test (test_clone, "clone"); - run_test (test_destroy_null, "destroying null table"); - - putchar ('\n'); - - free_strings (); - - return 0; +main (int argc, char *argv[]) +{ + int i; + + if (argc != 2) + { + fprintf (stderr, "exactly one argument required; use --help for help\n"); + return EXIT_FAILURE; + } + else if (!strcmp (argv[1], "--help")) + { + printf ("%s: test case-insensitive string set library\n" + "usage: %s TEST-NAME\n" + "where TEST-NAME is one of the following:\n", + argv[0], argv[0]); + for (i = 0; i < N_TESTS; i++) + printf (" %s\n %s\n", tests[i].name, tests[i].description); + return 0; + } + else + { + for (i = 0; i < N_TESTS; i++) + if (!strcmp (argv[1], tests[i].name)) + { + tests[i].function (); + free_strings (); + return 0; + } + + fprintf (stderr, "unknown test %s; use --help for help\n", argv[1]); + return EXIT_FAILURE; + } } diff --git a/tests/libpspp/stringi-set.at b/tests/libpspp/stringi-set.at new file mode 100644 index 00000000..b38e8479 --- /dev/null +++ b/tests/libpspp/stringi-set.at @@ -0,0 +1,21 @@ +AT_BANNER([case-insensitive string set library]) + +m4_define([CHECK_STRINGI_SET], + [AT_SETUP([case-insensitive string set -- $1]) + AT_KEYWORDS([stringi-set]) + AT_CHECK([stringi-set-test $1]) + AT_CLEANUP]) + +CHECK_STRINGI_SET([insert-any-remove-any]) +CHECK_STRINGI_SET([insert-any-remove-same]) +CHECK_STRINGI_SET([insert-any-remove-reverse]) +CHECK_STRINGI_SET([random-sequence]) +CHECK_STRINGI_SET([insert-ordered]) +CHECK_STRINGI_SET([union]) +CHECK_STRINGI_SET([union-and-intersection]) +CHECK_STRINGI_SET([intersect]) +CHECK_STRINGI_SET([subtract]) +CHECK_STRINGI_SET([swap]) +CHECK_STRINGI_SET([clear]) +CHECK_STRINGI_SET([clone]) +CHECK_STRINGI_SET([destroy-null]) -- 2.30.2