X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.h;h=cbe06cce60d0bf500f1ad911e3b64424eb31fc79;hb=1d1083ab048f9f1000f0bf11225be23a6730cb06;hp=ce8360ddb778d40378c247cde3fc6c060f9ff2f7;hpb=331f05f608e3d45c11adce71f767e38e173e8f40;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.h b/test/api/testlib.h
index ce8360d..cbe06cc 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,6 +1,6 @@
-/* $Id: testlib.h,v 1.9 2004-12-14 11:23:15 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: testlib.h,v 1.14 2005-05-04 10:50:09 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -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
@@ -73,14 +70,29 @@ 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) */
+    );
 
 /** 
  * ranking_query makes a query, checks number of hits, and for