X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstwrbuf.c;h=e1ed5f61342ce4b7aaeb0d26f381fb0e7113b2d8;hb=8d691989077a0addcbd840d769dce6700f3d9622;hp=bab20046ce9e981739d175caa0c28d81c13f3da7;hpb=6bc4a3e8b7e73275e8b37e6de40e4c596302bd51;p=yaz-moved-to-github.git

diff --git a/test/tstwrbuf.c b/test/tstwrbuf.c
index bab2004..e1ed5f6 100644
--- a/test/tstwrbuf.c
+++ b/test/tstwrbuf.c
@@ -1,24 +1,29 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstwrbuf.c,v 1.3 2005-02-01 17:23:36 adam Exp $
+ * $Id: tstwrbuf.c,v 1.6 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <yaz/wrbuf.h>
+#include <yaz/test.h>
 
-int main (int argc, char **argv)
+static void tstwrbuf(void)
 {
     int step;
     WRBUF wr = wrbuf_alloc();
 
+    YAZ_CHECK(wr);
+
     wrbuf_free(wr, 1);
 
     wr = wrbuf_alloc();
 
+    YAZ_CHECK(wr);
+
     for (step = 1; step < 65; step++)
     {
         int i, j, k;
@@ -35,25 +40,31 @@ int main (int argc, char **argv)
         
         cp = wrbuf_buf(wr);
         len = wrbuf_len(wr);
-        if (len != step * (step-1) / 2)
-        {
-            printf ("tstwrbuf 1 %d len=%d\n", step, len);
-            exit(1);
-        }
+        YAZ_CHECK(len == step * (step-1) / 2);
         k = 0;
         for (j = 1; j<step; j++)
             for (i = 0; i<j; i++)
             {
-                if (cp[k] != i+1)
-                {
-                    printf ("tstwrbuf 2 %d k=%d\n", step, k);
-                    exit(1);
-                }
+                YAZ_CHECK(cp[k] == i+1);
                 k++;
             }
         wrbuf_rewind(wr);
     }
     wrbuf_free(wr, 1);
-    exit(0);
 }
 
+int main (int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tstwrbuf();
+    YAZ_CHECK_TERM;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+