Refactored more stuff into testlib, cleaned up the tests.

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

diff --git a/test/api/t5.c b/test/api/t5.c
index 6a483d5..11b0f69 100644 (file)
--- a/test/api/t5.c
+++ b/test/api/t5.c
@@ -1,4 +1,4 @@
-/* $Id: t5.c,v 1.8 2004-10-28 15:24:36 heikki Exp $
+/* $Id: t5.c,v 1.9 2004-10-29 13:02:39 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,62 +20,45 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.h>
-
+/** t5.c: proximity searches */
 #include "testlib.h"
 
-       
-
-int main(int argc, char **argv)
-{
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec[] = {
+const char *myrec[] = {
         "<gils>\n<title>My title</title>\n</gils>\n",
         "<gils>\n<title>My x title</title>\n</gils>\n",
         "<gils>\n<title>My title x</title>\n</gils>\n" ,
-       0}
-    ;
+       0} ;
+       
 
-    yaz_log_init_file("t5.log");
-    yaz_log_init_level(LOG_ALL);
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs);
 
-    nmem_init ();
-    
-    zs = start_service(0);
-    zh = zebra_open (zs);
     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);
+    do_query(__LINE__,zh, "@attr 1=4 my", 3);
+    do_query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {x my}", 0);
+    do_query(__LINE__,zh, "@attr 1=4 {my x title}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {my title}", 2);
+    do_query(__LINE__,zh, "@attr 1=4 @and x title", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    Query(__LINE__,zh, "@prox 0 2 1 2 k 2 my x", 2);
+    do_query(__LINE__,zh, "@prox 0 2 1 2 k 2 my x", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    Query(__LINE__,zh, "@prox 0 2 1 2 k 2 x my", 0);
+    do_query(__LINE__,zh, "@prox 0 2 1 2 k 2 x my", 0);
 
     /* exl=0 distance=2 order=0 relation=2 (<=), known, unit=word */
-    Query(__LINE__,zh, "@prox 0 2 0 2 k 2 x my", 2);
+    do_query(__LINE__,zh, "@prox 0 2 0 2 k 2 x my", 2);
 
     /* exl=0 distance=2 order=0 relation=3 (=), known, unit=word */
-    Query(__LINE__,zh, "@prox 0 2 1 3 k 2 my x", 1);
+    do_query(__LINE__,zh, "@prox 0 2 1 3 k 2 my x", 1);
 
     /* exl=1 distance=2 order=0 relation=3 (=), known, unit=word */
-    Query(__LINE__,zh, "@prox 1 2 1 3 k 2 my x", 1);
-
-    zebra_close (zh);
-    zebra_stop (zs);
+    do_query(__LINE__,zh, "@prox 1 2 1 3 k 2 my x", 1);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    logf(LOG_LOG,"======== All tests OK");
-    exit (0);
+    return close_down(zh,zs,0);
 }