summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--modules/readtokens-tests13
-rw-r--r--tests/test-readtokens.c98
-rwxr-xr-xtests/test-readtokens.sh23
4 files changed, 140 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac1ba489f..83a09a4cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-03-07 Jim Meyering <meyering@redhat.com>
+ readtokens: add tests
+ * modules/readtokens-tests: New file.
+ * tests/test-readtokens.c: New file.
+
+2012-03-07 Jim Meyering <meyering@redhat.com>
+
quotearg: the module must now include quote.h
With commit v0.0-7133-g6417476, quotearg.c includes "quote.h".
So must the module.
diff --git a/modules/readtokens-tests b/modules/readtokens-tests
new file mode 100644
index 0000000000..a1982ddca9
--- /dev/null
+++ b/modules/readtokens-tests
@@ -0,0 +1,13 @@
+Files:
+tests/macros.h
+tests/test-readtokens.c
+tests/test-readtokens.sh
+
+Depends-on:
+closeout
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-readtokens.sh
+check_PROGRAMS += test-readtokens
diff --git a/tests/test-readtokens.c b/tests/test-readtokens.c
new file mode 100644
index 0000000000..1ee0c86fd4
--- /dev/null
+++ b/tests/test-readtokens.c
@@ -0,0 +1,98 @@
+/* Test the readtokens module.
+ Copyright (C) 2012 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ 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, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "readtokens.h"
+#include "closeout.h"
+#include "macros.h"
+
+static void
+basic (void)
+{
+ char *filename = "in.827";
+ int fd = open (filename, O_CREAT | O_WRONLY, 0600);
+ ASSERT (fd >= 0);
+ ASSERT (write (fd, "a|b;c+d", 7) == 7);
+ ASSERT (close (fd) == 0);
+
+ {
+ token_buffer tb;
+ FILE *fp = fopen (filename, "r");
+ ASSERT (fp);
+
+ init_tokenbuffer (&tb);
+ ASSERT (readtoken (fp, "|;", 2, &tb) == 1 && tb.buffer[0] == 'a');
+ ASSERT (readtoken (fp, "|;", 2, &tb) == 1 && tb.buffer[0] == 'b');
+ ASSERT (readtoken (fp, "+", 1, &tb) == 1 && tb.buffer[0] == 'c');
+ ASSERT (readtoken (fp, "-", 1, &tb) == 1 && tb.buffer[0] == 'd');
+ ASSERT (readtoken (fp, "%", 0, &tb) == (size_t) -1);
+ ASSERT ( ! ferror (fp));
+ ASSERT (fclose (fp) == 0);
+ }
+}
+
+int
+main (int argc, char **argv)
+{
+ token_buffer tb;
+ char *delim;
+ size_t delim_len;
+
+ atexit (close_stdout);
+
+ if (argc == 1)
+ {
+ basic ();
+ return 0;
+ }
+
+ init_tokenbuffer (&tb);
+
+ if (argc != 2)
+ return 99;
+
+ delim = argv[1];
+ delim_len = strlen (delim);
+
+ if (STREQ (delim, "\\0"))
+ {
+ delim = "";
+ delim_len = 1;
+ }
+
+ while (1)
+ {
+ size_t token_length = readtoken (stdin, delim, delim_len, &tb);
+ if (token_length == (size_t) -1)
+ break;
+ fwrite (tb.buffer, 1, token_length, stdout);
+ putchar (':');
+ }
+ putchar ('\n');
+ free (tb.buffer);
+
+ ASSERT ( ! ferror (stdin));
+
+ return 0;
+}
diff --git a/tests/test-readtokens.sh b/tests/test-readtokens.sh
new file mode 100755
index 0000000000..51fd41e518
--- /dev/null
+++ b/tests/test-readtokens.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ .
+
+fail=0
+
+test-readtokens || fail=1
+
+# Simplest case.
+echo a:b:c: > exp || fail=1
+printf a:b:c | test-readtokens : > out 2>&1 || fail=1
+compare exp out || fail=1
+
+# Use NUL as the delimiter.
+echo a:b:c: > exp || fail=1
+printf 'a\0b\0c' | test-readtokens '\0' > out 2>&1 || fail=1
+compare exp out || fail=1
+
+# Two delimiter bytes, and adjacent delimiters in the input.
+echo a:b:c: > exp || fail=1
+printf a:-:b-:c:: | test-readtokens :- > out 2>&1 || fail=1
+compare exp out || fail=1
+
+Exit $fail