Cleaned the test programs a bit, used routines in testlib

[idzebra-moved-to-github.git] / test / api / t2.c

diff --git a/test/api/t2.c b/test/api/t2.c
index 7beea78..51f479f 100644 (file)
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,4 +1,4 @@
-/* $Id: t2.c,v 1.12 2004-08-25 09:23:39 adam Exp $
+/* $Id: t2.c,v 1.13 2004-10-28 15:24:36 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -23,45 +23,30 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <yaz/log.h>
 #include <idzebra/api.h>
+#include "testlib.h"
 
 /* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
-static ZebraService start_service()
-{
-    char cfg[256];
-    char *srcdir = getenv("srcdir");
-    sprintf(cfg, "%.200s%szebra.cfg", srcdir ? srcdir : "", srcdir ? "/" : "");
-    return zebra_start(cfg);
-}
 
 int main(int argc, char **argv)
 {
-    int exit_code = 0;
-    int hits;
     ZebraService zs;
     ZebraHandle zh;
-    const char *myrec =
+    const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
+        "</gils>\n",
+        0};
+
 
     yaz_log_init_file("t2.log");
 
     nmem_init ();
 
-    zs = start_service();
+    zs = start_service(0);
     zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
-    zebra_begin_trans (zh, 1);
-
-    zebra_add_record (zh, myrec, strlen(myrec));
+    init_data(zh,myrec);
 
-    zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits != 1)
-    {
-        yaz_log(LOG_FATAL, "Expected 1 hit. Got %d", hits);
-        exit_code = 1;
-    }
+    Query(__LINE__,zh, "@attr 1=4 my", 1);
 
     zebra_end_trans (zh);
     zebra_commit (zh);
@@ -70,5 +55,6 @@ int main(int argc, char **argv)
 
     nmem_exit ();
     xmalloc_trav ("x");
-    exit (exit_code);
+    logf(LOG_LOG,"================ All tests OK ");
+    exit (0);
 }