Imported Upstream version 0.10

1 files changed, 25 insertions, 38 deletions

diff --git a/tests/util/concat-t.c b/tests/util/concat-t.c
index 2428d71..ca7de2c 100644
--- a/tests/util/concat-t.c
+++ b/tests/util/concat-t.c
@@ -1,59 +1,46 @@
-/* $Id$
- *
+/*
  * concat test suite.
  *
- * Copyright 2004, 2005, 2006
+ * Written by Russ Allbery <rra@stanford.edu>
+ * Copyright 2009 Board of Trustees, Leland Stanford Jr. University
+ * Copyright (c) 2004, 2005, 2006
  *     by Internet Systems Consortium, Inc. ("ISC")
- * Copyright 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- *     2003 by The Internet Software Consortium and Rich Salz
- *
- * This code is derived from software contributed to the Internet Software
- * Consortium by Rich Salz.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ *     2002, 2003 by The Internet Software Consortium and Rich Salz
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * See LICENSE for licensing terms.
  */
 
 #include <config.h>
 #include <portable/system.h>
 
-#include <tests/libtest.h>
-#include <util/util.h>
+#include <tests/tap/basic.h>
+#include <util/concat.h>
 
 #define END (char *) 0
 
-
 /*
  * Memory leaks everywhere!  Whoo-hoo!
  */
 int
 main(void)
 {
-    test_init(13);
-
-    ok_string( 1, "a",     concat("a",                   END));
-    ok_string( 2, "ab",    concat("a", "b",              END));
-    ok_string( 3, "ab",    concat("ab", "",              END));
-    ok_string( 4, "ab",    concat("", "ab",              END));
-    ok_string( 5, "",      concat("",                    END));
-    ok_string( 6, "abcde", concat("ab", "c", "", "de",   END));
-    ok_string( 7, "abcde", concat("abc", "de", END, "f", END));
-
-    ok_string( 8, "/foo",             concatpath("/bar", "/foo"));
-    ok_string( 9, "/foo/bar",         concatpath("/foo", "bar"));
-    ok_string(10, "./bar",            concatpath("/foo", "./bar"));
-    ok_string(11, "/bar/baz/foo/bar", concatpath("/bar/baz", "foo/bar"));
-    ok_string(12, "./foo",            concatpath(NULL, "foo"));
-    ok_string(13, "/foo/bar",         concatpath(NULL, "/foo/bar"));
+    plan(13);
+
+    is_string("a",     concat("a",                   END), "concat 1");
+    is_string("ab",    concat("a", "b",              END), "concat 2");
+    is_string("ab",    concat("ab", "",              END), "concat 3");
+    is_string("ab",    concat("", "ab",              END), "concat 4");
+    is_string("",      concat("",                    END), "concat 5");
+    is_string("abcde", concat("ab", "c", "", "de",   END), "concat 6");
+    is_string("abcde", concat("abc", "de", END, "f", END), "concat 7");
+
+    is_string("/foo",             concatpath("/bar", "/foo"),        "path 1");
+    is_string("/foo/bar",         concatpath("/foo", "bar"),         "path 2");
+    is_string("./bar",            concatpath("/foo", "./bar"),       "path 3");
+    is_string("/bar/baz/foo/bar", concatpath("/bar/baz", "foo/bar"), "path 4");
+    is_string("./foo",            concatpath(NULL, "foo"),           "path 5");
+    is_string("/foo/bar",         concatpath(NULL, "/foo/bar"),      "path 6");
 
     return 0;
 }