X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstodr.c;h=268224da99dc8f17882bc80e896a60d252576f96;hp=5b26a160ebd09c4b28f42bec1fc4f6ad1469e55c;hb=ba1eb985bfd53a8cfbfd251e65688921dba56236;hpb=029ba3910b555dc57c38fd8d5a27091e59338890

diff --git a/test/tstodr.c b/test/tstodr.c
index 5b26a16..268224d 100644
--- a/test/tstodr.c
+++ b/test/tstodr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstodr.c,v 1.5 2005-05-26 21:47:16 adam Exp $
+ * $Id: tstodr.c,v 1.8 2006-01-29 21:59:13 adam Exp $
  *
  */
 #include <stdlib.h>
@@ -11,18 +11,22 @@
 #include <yaz/oid.h>
 #include "tstodrcodec.h"
 
+#include <yaz/test.h>
+
 #define MYOID  "1.2.3.4.5.6.7.8.9.10.11.12.13.14.15.16.17.18.19"
 
 void tst_MySequence1(ODR encode, ODR decode)
 {
+    int ret;
     char *ber_buf;
     int ber_len;
     Yc_MySequence *s = odr_malloc(encode, sizeof(*s));
     Yc_MySequence *t;
 
+    YAZ_CHECK(s);
     s->first = odr_intdup(encode, 12345);
     s->second = odr_malloc(encode, sizeof(*s->second));
-    s->second->buf = "hello";
+    s->second->buf = (unsigned char *) "hello";
     s->second->len = 5;
     s->second->size = 0;
     s->third = odr_intdup(encode, 1);
@@ -31,47 +35,53 @@ void tst_MySequence1(ODR encode, ODR decode)
     
     s->myoid = odr_getoidbystr(decode, MYOID);
 
-    if (!yc_MySequence(encode, &s, 0, 0))
-        exit(1);
+    ret = yc_MySequence(encode, &s, 0, 0);
+    YAZ_CHECK(ret);
+    if (!ret)
+        return;
     
     ber_buf = odr_getbuf(encode, &ber_len, 0);
 
     odr_setbuf(decode, ber_buf, ber_len, 0);
 
-    if (!yc_MySequence(decode, &t, 0, 0))
-        exit(2);
-    if (!t->first || *t->first != 12345)
-        exit(3);
-    if (!t->second || !t->second->buf || t->second->len != 5)
-        exit(4);
-    if (memcmp(t->second->buf, "hello", t->second->len))
-        exit(5);
-    if (!t->third || *t->third != 1)
-        exit(6);
-    if (!t->fourth)
-        exit(7);
-    if (!t->fifth || *t->fifth != YC_MySequence_enum1)
-        exit(8);
-    if (!t->myoid)
-	exit(9);
-    else
+    ret = yc_MySequence(decode, &t, 0, 0);
+    YAZ_CHECK(ret);
+    if (!ret)
+        return;
+
+    YAZ_CHECK(t);
+
+    YAZ_CHECK(t->first && *t->first == 12345);
+
+    YAZ_CHECK(t->second && t->second->buf && t->second->len == 5);
+
+    YAZ_CHECK(t->second && t->second->buf && t->second->len == 5 &&
+              memcmp(t->second->buf, "hello", t->second->len) == 0);
+
+    YAZ_CHECK(t->third && *t->third == 1);
+
+    YAZ_CHECK(t->fourth);
+
+    YAZ_CHECK(t->fifth && *t->fifth == YC_MySequence_enum1);
+
+    YAZ_CHECK(t->myoid);
+    if (t->myoid)
     {
-	int *myoid = odr_getoidbystr(decode, MYOID);
-	struct oident *oident;
+        int *myoid = odr_getoidbystr(decode, MYOID);
 
-	if (oid_oidcmp(myoid, t->myoid))
-	    exit(10);
-	oident = oid_getentbyoid(t->myoid);
+        YAZ_CHECK(oid_oidcmp(myoid, t->myoid) == 0);
     }
 }
 
 void tst_MySequence2(ODR encode, ODR decode)
 {
+    int ret;
     Yc_MySequence *s = odr_malloc(encode, sizeof(*s));
 
+    YAZ_CHECK(s);
     s->first = 0;  /* deliberately miss this .. */
     s->second = odr_malloc(encode, sizeof(*s->second));
-    s->second->buf = "hello";
+    s->second->buf = (unsigned char *) "hello";
     s->second->len = 5;
     s->second->size = 0;
     s->third = odr_intdup(encode, 1);
@@ -79,18 +89,17 @@ void tst_MySequence2(ODR encode, ODR decode)
     s->fifth = odr_intdup(encode, YC_MySequence_enum1);
     s->myoid = odr_getoidbystr(encode, MYOID);
 
-    if (yc_MySequence(encode, &s, 0, 0)) /* should fail */
-        exit(9);
-    if (odr_geterror(encode) != OREQUIRED)
-        exit(10);
-    if (strcmp(odr_getelement(encode), "first"))
-        exit(11);
+    ret = yc_MySequence(encode, &s, 0, 0); /* should fail */
+    YAZ_CHECK(!ret);
+
+    YAZ_CHECK(odr_geterror(encode) == OREQUIRED);
+
+    YAZ_CHECK(strcmp(odr_getelement(encode), "first") == 0);
     odr_reset(encode);
 
-    if (odr_geterror(encode) != ONONE)
-        exit(12);
-    if (strcmp(odr_getelement(encode), ""))
-        exit(13);
+    YAZ_CHECK(odr_geterror(encode) == ONONE);
+
+    YAZ_CHECK(strcmp(odr_getelement(encode), "") == 0);
 }
 
 void tst_MySequence3(ODR encode, ODR decode)
@@ -115,16 +124,34 @@ void tst_MySequence3(ODR encode, ODR decode)
     }
 }
 
-int main(int argc, char **argv)
+static void tst(void)
 {
     ODR odr_encode = odr_createmem(ODR_ENCODE);
     ODR odr_decode = odr_createmem(ODR_DECODE);
 
+    YAZ_CHECK(odr_encode);
+    YAZ_CHECK(odr_decode);
+
     tst_MySequence1(odr_encode, odr_decode);
     tst_MySequence2(odr_encode, odr_decode);
     tst_MySequence3(odr_encode, odr_decode);
 
     odr_destroy(odr_encode);
     odr_destroy(odr_decode);
-    exit(0);
 }
+
+int main(int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tst();
+    YAZ_CHECK_TERM;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+