New test

diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index fdbe210..3d06408 100644 (file)
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -1,20 +1,20 @@
-# $Id: Makefile.am,v 1.11 2003-06-18 11:46:34 adam Exp $
-
-TESTS = t1 t2 t3 t4
-
-testclient_SOURCES = testclient.c
+# $Id: Makefile.am,v 1.12 2004-06-14 21:43:44 adam Exp $
 
 noinst_PROGRAMS = testclient
+testclient_SOURCES = testclient.c
 
-EXTRA_PROGRAMS = t1 t2 t3 t4
+check_PROGRAMS = t1 t2 t3 t4 t5
+TESTS = $(check_PROGRAMS)
 
-EXTRA_DIST=t1.cfg t2.cfg
+EXTRA_DIST=zebra.cfg
 
 t1_SOURCES = t1.c
 t2_SOURCES = t2.c
 t3_SOURCES = t3.c
 t4_SOURCES = t4.c
+t5_SOURCES = t5.c
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC)
 
 LDADD = ../../index/libzebra.a $(YAZLIB) $(TCL_LIB)
+

diff --git a/test/api/t1.c b/test/api/t1.c
index 89dd2ce..26c8ac4 100644 (file)
--- a/test/api/t1.c
+++ b/test/api/t1.c
@@ -1,4 +1,4 @@
-/* $Id: t1.c,v 1.4 2004-01-22 11:27:22 adam Exp $
+/* $Id: t1.c,v 1.5 2004-06-14 21:43:44 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
 
     yaz_log_init_file("t1.log");
     nmem_init();
-    zs = zebra_start("t1.cfg", 0, 0);
+    zs = zebra_start("zebra.cfg", 0, 0);
     zh = zebra_open (zs);
     
     zebra_close (zh);

diff --git a/test/api/t1.cfg b/test/api/t1.cfg
deleted file mode 100644 (file)
index 1267efe..0000000
--- a/test/api/t1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: t1.cfg,v 1.2 2003-04-24 19:35:52 adam Exp $
-profilepath: ../../tab
-

diff --git a/test/api/t2.c b/test/api/t2.c
index 03ac063..c911a31 100644 (file)
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,4 +1,4 @@
-/* $Id: t2.c,v 1.8 2004-01-22 11:27:22 adam Exp $
+/* $Id: t2.c,v 1.9 2004-06-14 21:43:44 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -38,17 +38,18 @@ int main(int argc, char **argv)
 
     nmem_init ();
 
-    zs = zebra_start("t2.cfg", 0, 0);
+    zs = zebra_start("zebra.cfg", 0, 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));
 
     zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits < 1)
+    if (hits != 1)
     {
-        yaz_log(LOG_FATAL, "At least one hit expected");
+        yaz_log(LOG_FATAL, "Expected 1 hit. Got %d", hits);
         exit_code = 1;
     }
 

diff --git a/test/api/t2.cfg b/test/api/t2.cfg
deleted file mode 100644 (file)
index 8db253e..0000000
--- a/test/api/t2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id: t2.cfg,v 1.3 2004-01-22 11:27:22 adam Exp $
-profilepath: ../../tab
-
-attset: bib1.att
-
-recordType: grs.sgml
-

diff --git a/test/api/t3.c b/test/api/t3.c
index e22fe94..b5b2c8d 100644 (file)
--- a/test/api/t3.c
+++ b/test/api/t3.c
@@ -1,4 +1,4 @@
-/* $Id: t3.c,v 1.5 2004-01-22 11:27:22 adam Exp $
+/* $Id: t3.c,v 1.6 2004-06-14 21:43:44 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -38,9 +38,10 @@ int main(int argc, char **argv)
 
     nmem_init ();
     
-    zs = zebra_start("t2.cfg", 0, 0);
+    zs = zebra_start("zebra.cfg", 0, 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));

diff --git a/test/api/t4.c b/test/api/t4.c
index 5ad4140..54a0053 100644 (file)
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,4 +1,4 @@
-/* $Id: t4.c,v 1.5 2004-01-22 11:27:22 adam Exp $
+/* $Id: t4.c,v 1.6 2004-06-14 21:43:44 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -38,8 +38,9 @@ int main(int argc, char **argv)
 
     nmem_init ();
     
-    zs = zebra_start("t2.cfg", 0, 0);
+    zs = zebra_start("zebra.cfg", 0, 0);
     zh = zebra_open (zs);
+    zebra_init(zh);
     zebra_select_database(zh, "Default");
 
     zebra_begin_trans (zh, 1);
@@ -49,7 +50,7 @@ int main(int argc, char **argv)
     zebra_close(zh);
     zebra_stop(zs);
 
-    zs = zebra_start("t2.cfg", 0, 0);
+    zs = zebra_start("zebra.cfg", 0, 0);
     zh = zebra_open (zs);
     zebra_select_database(zh, "Default");
 

diff --git a/test/api/t5.c b/test/api/t5.c
new file mode 100644 (file)
index 0000000..a19de00
--- /dev/null
+++ b/test/api/t5.c
@@ -0,0 +1,85 @@
+/* $Id: t5.c,v 1.1 2004-06-14 21:43:44 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+#include <yaz/log.h>
+#include <yaz/pquery.h>
+#include <zebraapi.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, hits = -1;
+    int exit_code = 0;
+    ZebraService zs;
+    ZebraHandle zh;
+    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}
+    ;
+
+    yaz_log_init_file("t5.log");
+
+    nmem_init ();
+    
+    zs = zebra_start("zebra.cfg", 0, 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);
+
+    zebra_close (zh);
+    zebra_stop (zs);
+
+    nmem_exit ();
+    xmalloc_trav ("x");
+    exit (exit_code);
+}

diff --git a/test/api/zebra.cfg b/test/api/zebra.cfg
new file mode 100644 (file)
index 0000000..d4aca09
--- /dev/null
+++ b/test/api/zebra.cfg
@@ -0,0 +1,9 @@
+# $Id: zebra.cfg,v 1.1 2004-06-14 21:43:44 adam Exp $
+profilepath: ../../tab
+
+attset: bib1.att
+
+recordType: grs.sgml
+
+isam: b
+