X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.h;h=132ef95b49131df0e6b4e56f2406c0975d8ebde3;hb=1096988cbba8ece70c1ab3c964a5f1e2b1759773;hp=b1f77268f2ce9d35bc5d37bf77d27b4fc6f9cc33;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.h b/test/api/testlib.h
index b1f7726..132ef95 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,4 +1,4 @@
-/* $Id: testlib.h,v 1.10 2005-01-15 19:38:35 adam Exp $
+/* $Id: testlib.h,v 1.16 2005-09-13 11:51:07 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -28,9 +28,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/log.h>
 #include <idzebra/api.h>
 
-int log_level;
-
-
 /** 
  * start_up : Does all the usual start functions
  *    - nmem_init
@@ -59,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);
 
 
 /** 
@@ -73,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