X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fapi%2Ftestlib.h;h=298e88092046e920dbb6ab2f613fcae10a9ea150;hb=cf74a32bc8f34221e85c56411c141923405269e9;hp=304c60fc3ae84851909846859bc0eaae7ece1909;hpb=f24d7d2fd56ec639ccd0d9c2f9628964ef72c078;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.h b/test/api/testlib.h
index 304c60f..298e880 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,4 +1,4 @@
-/* $Id: testlib.h,v 1.13 2005-05-02 09:05:22 adam Exp $
+/* $Id: testlib.h,v 1.17 2005-12-15 13:28:32 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -56,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);
 
 
 /** 
@@ -76,13 +76,13 @@ 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, char *query, int exphits,
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
 	       int experror);
 
 /**
@@ -94,6 +94,8 @@ void do_scan(int lineno, ZebraHandle zh, const char *query,
 	     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 
  * the first hit, that it contains the given string, and that it 
@@ -113,3 +115,6 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
  * if filter given by name does not exist, exit nicely but warn in log 
  */
 void check_filter(ZebraService zs, const char *name);
+
+#define TL_ASSERT(x) if (!(x)) { yaz_log(YLOG_FATAL, "%s:%d TL_ASSERT(%s) failed",  __FILE__, __LINE__, #x); exit(1); }
+#define TL_ASSERT2(x,m) if (!(x)) { yaz_log(YLOG_WARN, "%s", m); yaz_log(YLOG_FATAL, "%s:%d TL_ASSERT(%s) failed",  __FILE__, __LINE__, #x); exit(1); }