X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft5.c;h=6a483d58b24528a999953320e8ac18abac0c0db0;hb=4989a5fc444f3bca0f094f1ac2bfe4f04af5e666;hp=e5f43344340466b81aff5ed44053c88c3218b6d4;hpb=61b0f4d9c54eb0e2f23a03ab11d33234008bd7bf;p=idzebra-moved-to-github.git

diff --git a/test/api/t5.c b/test/api/t5.c
index e5f4334..6a483d5 100644
--- a/test/api/t5.c
+++ b/test/api/t5.c
@@ -1,4 +1,4 @@
-/* $Id: t5.c,v 1.7 2004-10-20 14:32:29 heikki Exp $
+/* $Id: t5.c,v 1.8 2004-10-28 15:24:36 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -24,36 +24,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/pquery.h>
 #include <idzebra/api.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);
-}
+#include "testlib.h"
+
 	
-static void expect(ZebraHandle zh, const char *pqf, int hits_expect,
-		   int *exit_code)
-{
-    int hits;
-    if (zebra_search_PQF (zh, pqf, "set1", &hits) != 0)
-    {
-        yaz_log(LOG_FATAL, "Search %s: failed", pqf);
-        *exit_code = 1;
-    }
-    else if (hits != hits_expect)
-    {
-        yaz_log(LOG_FATAL, "Search %s: Expected %d, got %d", pqf,
-		hits_expect, hits);
-        *exit_code = 2;
-    }
-}
 
 int main(int argc, char **argv)
 {
-    int i;
-    int exit_code = 0;
     ZebraService zs;
     ZebraHandle zh;
     const char *myrec[] = {
@@ -68,43 +44,38 @@ int main(int argc, char **argv)
 
     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);
-    for (i = 0; myrec[i]; i++)
-	zebra_add_record (zh, myrec[i], strlen(myrec[i]));
-    zebra_end_trans (zh);
-
-    expect(zh, "@attr 1=4 my", 3, &exit_code);
-    expect(zh, "@attr 1=4 {my x}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {my x}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {x my}", 0, &exit_code);
-    expect(zh, "@attr 1=4 {my x title}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {my title}", 2, &exit_code);
-    expect(zh, "@attr 1=4 @and x title", 2, &exit_code);
+    init_data(zh,myrec);
+
+    Query(__LINE__,zh, "@attr 1=4 my", 3);
+    Query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    Query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    Query(__LINE__,zh, "@attr 1=4 {x my}", 0);
+    Query(__LINE__,zh, "@attr 1=4 {my x title}", 1);
+    Query(__LINE__,zh, "@attr 1=4 {my title}", 2);
+    Query(__LINE__,zh, "@attr 1=4 @and x title", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 1 2 k 2 my x", 2, &exit_code);
+    Query(__LINE__,zh, "@prox 0 2 1 2 k 2 my x", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 1 2 k 2 x my", 0, &exit_code);
+    Query(__LINE__,zh, "@prox 0 2 1 2 k 2 x my", 0);
 
     /* exl=0 distance=2 order=0 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 0 2 k 2 x my", 2, &exit_code);
+    Query(__LINE__,zh, "@prox 0 2 0 2 k 2 x my", 2);
 
     /* exl=0 distance=2 order=0 relation=3 (=), known, unit=word */
-    expect(zh, "@prox 0 2 1 3 k 2 my x", 1, &exit_code);
+    Query(__LINE__,zh, "@prox 0 2 1 3 k 2 my x", 1);
 
     /* exl=1 distance=2 order=0 relation=3 (=), known, unit=word */
-    expect(zh, "@prox 1 2 1 3 k 2 my x", 1, &exit_code);
+    Query(__LINE__,zh, "@prox 1 2 1 3 k 2 my x", 1);
 
     zebra_close (zh);
     zebra_stop (zs);
 
     nmem_exit ();
     xmalloc_trav ("x");
-    exit (exit_code);
+    logf(LOG_LOG,"======== All tests OK");
+    exit (0);
 }