X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft14.c;h=b2045b2fb0742dda971451426013773b4dfa4e60;hb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;hp=dd7618ed978f2ba550c21c88574ce03537509774;hpb=3e76d7533ae842c778fb8cd99e364bae25c361e9;p=idzebra-moved-to-github.git

diff --git a/test/api/t14.c b/test/api/t14.c
index dd7618e..b2045b2 100644
--- a/test/api/t14.c
+++ b/test/api/t14.c
@@ -1,4 +1,4 @@
-/* $Id: t14.c,v 1.1 2005-12-15 13:28:46 adam Exp $
+/* $Id: t14.c,v 1.4 2006-05-10 08:13:35 adam Exp $
    Copyright (C) 2004-2005
    Index Data ApS
 
@@ -26,53 +26,50 @@ static void create_search_drop(ZebraHandle zh)
 {
     const char *rec = "<gils><title>some</title></gils>";
     const char *opaque_id = "9";
-    ZEBRA_RES res;
 
-    res = zebra_create_database (zh, "Default");
-    TL_ASSERT(res == ZEBRA_OK);
+    YAZ_CHECK(zebra_create_database (zh, "Default") == ZEBRA_OK);
 
-#if 0
-    /* probably bug #447 .. but we don't know */
-    res = zebra_admin_exchange_record (
-	zh, rec, strlen(rec),
-	opaque_id, strlen(opaque_id),
-	1); /* insert */
-
-    TL_ASSERT(res == ZEBRA_FAIL);
-#endif
+    /* bug #447 */
+    YAZ_CHECK(zebra_admin_exchange_record (
+		  zh, rec, strlen(rec),
+		  opaque_id, strlen(opaque_id),
+		  1) == ZEBRA_OK); /* insert */
 
-    res = zebra_admin_exchange_record (
+    YAZ_CHECK(zebra_admin_exchange_record (
 	zh, rec, strlen(rec),
 	opaque_id, strlen(opaque_id),
-	4); /* update/insert */
+	4) == ZEBRA_OK); /* update/insert */
 
-    TL_ASSERT(res == ZEBRA_OK);
-    do_query(__LINE__, zh, "@attr 1=4 some", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 some", 1));
 
     zebra_drop_database(zh, "Default");
 
-    do_query_x(__LINE__, zh, "@attr 1=4 some", 0, 109);
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=4 some", 0, 109));
 
 }
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up("zebra.cfg", argc, argv);
+    ZebraService zs = tl_start_up("zebra.cfg", argc, argv);
     ZebraHandle zh = zebra_open(zs, 0);
-    ZEBRA_RES res;
 
-    res = zebra_select_database(zh, "Default");
-    TL_ASSERT(res == ZEBRA_OK);
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
     create_search_drop(zh);
-#if 0
     /* bug #447 */
     create_search_drop(zh);
-#endif
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
 
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */