X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstodr.c;h=b57c656829d1c45059b89831aad12ed3c71cc566;hp=9561e11c16087f586d3fd03d9cd40b4fbb01cfe1;hb=e6f45fddb3d4267340ad320dbedfbf5cb68c4d21;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9

diff --git a/test/tstodr.c b/test/tstodr.c
index 9561e11..b57c656 100644
--- a/test/tstodr.c
+++ b/test/tstodr.c
@@ -1,81 +1,104 @@
 /*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstodr.c,v 1.1 2003-10-27 12:21:38 adam Exp $
+ * $Id: tstodr.c,v 1.12 2007-08-13 16:23:30 mike Exp $
  *
  */
+#include <stdlib.h>
 #include <stdio.h>
-#include <yaz/odr.h>
+#include <yaz/oid_util.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);
     s->fourth = odr_nullval();
     s->fifth = odr_intdup(encode, YC_MySequence_enum1);
+    
+    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);
+    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)
+    {
+        Odr_oid *myoid = odr_getoidbystr(decode, MYOID);
+
+        YAZ_CHECK(oid_oidcmp(myoid, t->myoid) == 0);
+    }
 }
 
 void tst_MySequence2(ODR encode, ODR decode)
 {
-    char *ber_buf;
-    int ber_len;
+    int ret;
     Yc_MySequence *s = odr_malloc(encode, sizeof(*s));
-    Yc_MySequence *t;
 
+    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);
     s->fourth = odr_nullval();
     s->fifth = odr_intdup(encode, YC_MySequence_enum1);
+    s->myoid = odr_getoidbystr(encode, MYOID);
+
+    ret = yc_MySequence(encode, &s, 0, 0); /* should fail */
+    YAZ_CHECK(!ret);
+
+    YAZ_CHECK(odr_geterror(encode) == OREQUIRED);
 
-    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);
+    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)
@@ -100,16 +123,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
+ */
+