Changeset 12649

Timestamp:

Mar 28, 2007, 1:24:00 PM (19 years ago)

Author:

jhoblitt

Message:

convert tests to use libtap

Location:

trunk/Nebulous/nebclient

Files:

• autogen.sh (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/tests.c (modified) (12 diffs)

trunk/Nebulous/nebclient/autogen.sh

@@ -87 +87 @@
 && rm -f src/*.xml
 
+cd tests/tap
+sh bootstrap.sh || echo "libtap bootstrap.sh failed"
+
 run_configure=true
 for arg in $*; do

trunk/Nebulous/nebclient/configure.ac

@@ -1 +1 @@
 dnl Copyright (C) 2005  Joshua Hoblitt
 dnl
-dnl $Id: configure.ac,v 1.12 2006-12-12 00:31:39 jhoblitt Exp $
+dnl $Id: configure.ac,v 1.13 2007-03-28 23:24:00 jhoblitt Exp $
 
 AC_PREREQ(2.59)
@@ -7 +7 @@
 AC_INIT([nebclient], [0.0.3], [jhoblitt@cpan.org])
 AC_CONFIG_SRCDIR([nebulous.wsdl])
+
+dnl this enables the building of libtap
+AC_CONFIG_SUBDIRS([test/tap])
 
 AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])

trunk/Nebulous/nebclient/tests/Makefile.am

@@ +1 @@
+SUBDIRS = tap
+
 TESTS = tests
 
+AM_CPPFLAGS = \
+    -I$(top_srcdir)/tests/tap/src \
+    -I$(top_srcdir)/src
+
+AM_LDFLAGS = \
+    $(top_builddir)/tests/tap/src/libtap.la \
+    $(top_builddir)/src/libnebclient.la
+
 check_PROGRAMS = tests
-tests_SOURCES = tests.c
-tests_CPPFLAGS = -I$(top_srcdir)/src$
-tests_LDADD = $(top_builddir)/src/libnebclient.la

trunk/Nebulous/nebclient/tests/tests.c

@@ -3 +3 @@
 #include <unistd.h>
 #include <stdbool.h>
+
 #include "nebclient.h"
-
-#define TESTS(num_tests) \
-    int test_num = 0; \
-    int test_failure = 0; \
-    printf("1..%d\n", num_tests);
-
-#define OK(test, name) \
-    test_num++; \
-    if (test) { \
-        printf("ok %d - %s\n", test_num, name); \
-    } else { \
-        test_failure++; \
-        printf("not ok %d - %s\n", test_num, name); \
-        printf("# %s\n", nebErr(server)); \
-    }
-
-#define TEST_EXIT \
-    exit(test_failure);
+#include "tap.h"
 
 int main (int argc, char **argv) {
@@ -27 +11 @@
     char            *key = "foobarbaz";
 
-    TESTS(22);
+    plan_tests(22);
 
     if (getenv("NEBULOUS_SERVER")) {
@@ -34 +18 @@
         server = nebServerAlloc(NULL);
     }
-    OK(server, "server not NULL");
+    ok(server, "server not NULL");
 
     printf("# server set to %s\n", server->endpoint);
@@ -44 +28 @@
         filename = nebCreate(server, key, 0, NULL, NULL, &URI);
 
-        OK(filename, "create object");
-        OK(URI, "URI not NULL");
-        OK(nebDelete(server, key), "delete object");
+        ok(filename, "create object");
+        ok(URI, "URI not NULL");
+        ok(nebDelete(server, key), "delete object");
 
         nebFree(URI);
@@ -58 +42 @@
         fh = nebOpenCreate(server, key, 0, NULL, NULL, &URI);
 
-        OK(fh > -1, "create new object filehandle");
-        OK(URI, "URI not NULL");
+        ok(fh > -1, "create new object filehandle");
+        ok(URI, "URI not NULL");
 
         nebFree(URI);
@@ -70 +54 @@
         fh = nebOpen(server, key, NEB_READ);
 
-        OK(fh, "open object for reading");
+        ok(fh, "open object for reading");
 
         close(fh);
@@ -80 +64 @@
         fh = nebOpen(server, key, NEB_WRITE);
 
-        OK(fh, "open object for writing");
+        ok(fh, "open object for writing");
 
         close(fh);
@@ -86 +70 @@
 
 
-    OK(nebReplicate(server, key, NULL, NULL), "replicate object");
+    ok(nebReplicate(server, key, NULL, NULL), "replicate object");
 
-    OK(nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
+    ok(nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
 
-    OK(nebCull(server, key), "cull object");
+    ok(nebCull(server, key), "cull object");
 
-    OK(nebStat(server, key), "stat object");
+    ok(nebStat(server, key), "stat object");
 
-    OK(nebLock(server, key, NEB_WRITE), "lock object write");
-    OK(nebUnlock(server, key, NEB_WRITE), "unlock object write");
+    ok(nebLock(server, key, NEB_WRITE), "lock object write");
+    ok(nebUnlock(server, key, NEB_WRITE), "unlock object write");
 
-    OK(nebLock(server, key, NEB_READ), "lock object read");
-    OK(nebUnlock(server, key, NEB_READ), "unlock object read");
+    ok(nebLock(server, key, NEB_READ), "lock object read");
+    ok(nebUnlock(server, key, NEB_READ), "unlock object read");
 
     {
@@ -105 +89 @@
         locations = nebFindInstances(server, key, NULL);
 
-        OK(locations, "locations not NULL");
-        OK(locations && locations->n == 1, "find instances");
+        ok(locations, "locations not NULL");
+        ok(locations && locations->n == 1, "find instances");
 
         nebObjectInstancesFree(locations);
@@ -116 +100 @@
         filename = nebFind(server, key);
 
-        OK(filename, "find file name");
+        ok(filename, "find file name");
 
         nebFree(filename);
@@ -122 +106 @@
 
 
-    OK(nebCopy(server, key, "copyiedfile"), "copy object");
+    ok(nebCopy(server, key, "copyiedfile"), "copy object");
 
-    OK(nebDelete(server, key), "delete object");
+    ok(nebDelete(server, key), "delete object");
 
-    OK(nebMove(server, "copyiedfile", "movedfile"), "move object");
+    ok(nebMove(server, "copyiedfile", "movedfile"), "move object");
 
     if (!nebDelete(server, "movedfile")) {
@@ -134 +118 @@
     nebServerFree(server);
 
-    TEST_EXIT;
+    return exit_status();
 }