X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.h;h=132ef95b49131df0e6b4e56f2406c0975d8ebde3;hb=1fde4f52fc72af8e10a600a81c6f0924105add6a;hp=3ce928833b900fe69c11f1d67d738c4028acf95a;hpb=39cb125e7755c6058a93dada8d5172804213cf8e;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.h b/test/api/testlib.h
index 3ce9288..132ef95 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,6 +1,6 @@
-/* $Id: testlib.h,v 1.5 2004-11-29 21:55:28 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: testlib.h,v 1.16 2005-09-13 11:51:07 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -23,13 +23,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /** testlib - utilities for the api tests */
 
 #include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/yconfig.h>
 #include <yaz/pquery.h>
+#include <yaz/log.h>
 #include <idzebra/api.h>
 
-int log_level;
-
-
 /** 
  * start_up : Does all the usual start functions
  *    - nmem_init
@@ -40,6 +38,12 @@ int log_level;
  */
 ZebraService start_up(char *cfgname, int argc, char **argv);
 
+/**
+ * get_srcdir : returns the source dir. Most often ".", but when
+ * making distcheck, some other dir 
+ */
+const char *get_srcdir();
+
 /** 
  * start_log: open a log file 
  */
@@ -52,7 +56,7 @@ void start_log(int argc, char **argv);
  * and uses that if need be. 
  * The name defaults to zebra.cfg, if null or emtpy
  */
-ZebraService start_service(char *cfgname);
+ZebraService start_service(const char *cfgname);
 
 
 /** 
@@ -66,14 +70,31 @@ ZebraService start_service(char *cfgname);
 int close_down(ZebraHandle zh, ZebraService zs, int retcode);
 
 /** inits the database and inserts test data */
-void init_data( ZebraHandle zh, const char **recs);
+void init_data(ZebraHandle zh, const char **recs);
 
 
 /**
  * do_query does a simple query, and checks that the number of hits matches
  */
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits);
+int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits);
+
 
+/**
+ * do_query does a simple query, and checks that error is what is expected
+ */
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
+	       int experror);
+
+/**
+ * do_scan is a utility for scan testing 
+ */
+void do_scan(int lineno, ZebraHandle zh, const char *query,
+	     int pos, int num,  /* input params */
+	     int exp_pos, int exp_num,  int exp_partial, /* expected result */
+	     const char **exp_entries  /* expected entries (or NULL) */
+    );
+
+void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp);
 
 /** 
  * ranking_query makes a query, checks number of hits, and for 
@@ -89,3 +110,8 @@ void ranking_query(int lineno, ZebraHandle zh, char *query,
  */
 void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
 		zint *ids);
+
+/**
+ * if filter given by name does not exist, exit nicely but warn in log 
+ */
+void check_filter(ZebraService zs, const char *name);