X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstwrbuf.c;h=e12ec84aca1f9e1a0f8d70a42e3f303ec85c986e;hp=a31115ee0621af69ec235ed368edab1b4f306a73;hb=2788a4851b551e1a3efb320a2878b809f2d8a9d7;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/test/tstwrbuf.c b/test/tstwrbuf.c
index a31115e..e12ec84 100644
--- a/test/tstwrbuf.c
+++ b/test/tstwrbuf.c
@@ -1,24 +1,27 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstwrbuf.c,v 1.4 2005-06-25 15:46:07 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();
 
-    wrbuf_free(wr, 1);
+    YAZ_CHECK(wr);
+
+    wrbuf_destroy(wr);
 
     wr = wrbuf_alloc();
 
+    YAZ_CHECK(wr);
+
     for (step = 1; step < 65; step++)
     {
         int i, j, k;
@@ -35,26 +38,24 @@ 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);
+    wrbuf_destroy(wr);
+}
+
+int main (int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tstwrbuf();
+    YAZ_CHECK_TERM;
 }
 
 /*