string-set: Convert tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 6fe59dcaae8f9d6ca7402df4cc6608058eaef710..52d35ae0be839e00aef6a26d92652cdbe8b7c820 100644 (file)
--- 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/string-set-test \
        tests/libpspp/stringi-set-test \
        tests/libpspp/tower-test
 
@@ -171,6 +170,7 @@ check_PROGRAMS += \
        tests/libpspp/str-test \
        tests/libpspp/string-map-test \
        tests/libpspp/stringi-map-test \
+       tests/libpspp/string-set-test \
        tests/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
@@ -432,6 +432,7 @@ TESTSUITE_AT = \
        tests/libpspp/str.at \
        tests/libpspp/string-map.at \
        tests/libpspp/stringi-map.at \
+       tests/libpspp/string-set.at \
        tests/math/moments.at \
        tests/output/render.at \
        tests/output/charts.at \

diff --git a/tests/libpspp/string-set-test.c b/tests/libpspp/string-set-test.c
index 6aafef445b9fe2c4b366407b219c2addc321732f..7f136a66c4e8ca1dabfee0d5ba2f33df99df8e34 100644 (file)
--- a/tests/libpspp/string-set-test.c
+++ b/tests/libpspp/string-set-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,9 +36,6 @@
 
 #include <libpspp/compiler.h>
 \f
-/* Currently running test. */
-static const char *test_name;
-
 /* Exit with a failure code.
    (Place a breakpoint on this function while debugging.) */
 static void
@@ -54,8 +51,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 ();
     }
 }
@@ -644,38 +640,115 @@ test_destroy_null (void)
 \f
 /* 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 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/string-set.at b/tests/libpspp/string-set.at
new file mode 100644 (file)
index 0000000..d782e9b
--- /dev/null
+++ b/tests/libpspp/string-set.at
@@ -0,0 +1,21 @@
+AT_BANNER([string set library])
+
+m4_define([CHECK_STRING_SET],
+  [AT_SETUP([string set -- $1])
+   AT_KEYWORDS([string-set])
+   AT_CHECK([string-set-test $1])
+   AT_CLEANUP])
+
+CHECK_STRING_SET([insert-any-remove-any])
+CHECK_STRING_SET([insert-any-remove-same])
+CHECK_STRING_SET([insert-any-remove-reverse])
+CHECK_STRING_SET([random-sequence])
+CHECK_STRING_SET([insert-ordered])
+CHECK_STRING_SET([union])
+CHECK_STRING_SET([union-and-intersection])
+CHECK_STRING_SET([intersect])
+CHECK_STRING_SET([subtract])
+CHECK_STRING_SET([swap])
+CHECK_STRING_SET([clear])
+CHECK_STRING_SET([clone])
+CHECK_STRING_SET([destroy-null])