X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.h;fp=test%2Fapi%2Ftestlib.h;h=03543562861925acff508d416dcee66b2e05246b;hb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;hp=298e88092046e920dbb6ab2f613fcae10a9ea150;hpb=cc74bd253ed898cd5b94826912cbc1ca1c940387;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.h b/test/api/testlib.h
index 298e880..0354356 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,4 +1,4 @@
-/* $Id: testlib.h,v 1.17 2005-12-15 13:28:32 adam Exp $
+/* $Id: testlib.h,v 1.18 2006-03-31 15:58:05 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -27,37 +27,37 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/pquery.h>
 #include <yaz/log.h>
 #include <idzebra/api.h>
+#include <yaz/test.h>
 
 /** 
- * start_up : Does all the usual start functions
+ * tl_start_up : Does all the usual start functions
  *    - nmem_init
  *    - build the name of logfile from argv[0], and open it
  *      if no argv passed, do not open a log
  *    - read zebra.cfg from env var srcdir if it exists; otherwise current dir 
  *      default to zebra.cfg, if no name is given
  */
-ZebraService start_up(char *cfgname, int argc, char **argv);
+ZebraService tl_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();
+const char *tl_get_srcdir();
 
 /** 
  * start_log: open a log file 
  */
 /*    FIXME - parse command line arguments to set log levels etc */
-void start_log(int argc, char **argv);
+void tl_start_log(int argc, char **argv);
 
 /** 
- * start_service - do a zebra_start with a decent config name 
+ * tl_zebra_start - do a zebra_start with a decent config name 
  * Takes care of checking the environment for srcdir (as needed by distcheck)
  * and uses that if need be. 
  * The name defaults to zebra.cfg, if null or emtpy
  */
-ZebraService start_service(const char *cfgname);
-
+ZebraService tl_zebra_start(const char *cfgname);
 
 /** 
  * close_down closes it all down
@@ -67,54 +67,60 @@ ZebraService start_service(const char *cfgname);
  * closes down nmem and xmalloc
  * returns the retcode, for use in return or exit in main()
  */
-int close_down(ZebraHandle zh, ZebraService zs, int retcode);
+int tl_close_down(ZebraHandle zh, ZebraService zs
+    ) GCC_ATTRIBUTE((warn_unused_result));    
 
 /** inits the database and inserts test data */
-void init_data(ZebraHandle zh, const char **recs);
-
+int tl_init_data(ZebraHandle zh, const char **recs
+    ) GCC_ATTRIBUTE((warn_unused_result));    
 
 /**
- * do_query does a simple query, and checks that the number of hits matches
+ * tl_query does a simple query, and checks that the number of hits matches
  */
-int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits);
+int tl_query(ZebraHandle zh, const char *query, zint exphits
+    ) GCC_ATTRIBUTE((warn_unused_result));
 
 
 /**
- * do_query does a simple query, and checks that error is what is expected
+ * tl_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);
-
+int tl_query_x(ZebraHandle zh, const char *query, zint exphits,
+	       int experror
+    ) GCC_ATTRIBUTE((warn_unused_result));
+    
 /**
- * do_scan is a utility for scan testing 
+ * tl_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) */
-    );
+int tl_scan(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) */
+    ) GCC_ATTRIBUTE((warn_unused_result));
 
-void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp);
+int tl_sort(ZebraHandle zh, const char *query, zint hits, zint *exp
+    ) GCC_ATTRIBUTE((warn_unused_result));
 
 /** 
  * ranking_query makes a query, checks number of hits, and for 
  * the first hit, that it contains the given string, and that it 
  * gets the right score
  */
-void ranking_query(int lineno, ZebraHandle zh, char *query, 
-          int exphits, char *firstrec, int firstscore );
+int tl_ranking_query(ZebraHandle zh, char *query, 
+		     int exphits, char *firstrec, int firstscore
+    ) GCC_ATTRIBUTE((warn_unused_result));
 
 /** 
  * meta_query makes a query, checks number of hits, and for 
  * checks that the all records in result set has the proper identifiers (ids)
  */
-void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
-		zint *ids);
+int tl_meta_query(ZebraHandle zh, char *query, int exphits,
+		  zint *ids
+    ) GCC_ATTRIBUTE((warn_unused_result));
 
 /**
  * if filter given by name does not exist, exit nicely but warn in log 
  */
-void check_filter(ZebraService zs, const char *name);
+void tl_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); }
+#define TL_MAIN int main(int argc, char **argv) { \
+ YAZ_CHECK_INIT(argc, argv); tst(argc, argv); YAZ_CHECK_TERM; }