X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=36323da2cc53252f09f250127f4c3f40e1bb3f2f;hb=aed917ab8001642c774a55a4a4fffe9a26887a52;hp=aee77dc6b9e7c7e7ad6d30187be2adfa22dc8765;hpb=5d3d666d4712604159141d991dadd3e6299565bd;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index aee77dc..36323da 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.21 2005-05-31 07:22:20 adam Exp $
+/* $Id: testlib.c,v 1.29 2005-12-15 13:28:32 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -22,6 +22,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /** testlib - utilities for the api tests */
 
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <assert.h>
 #include <yaz/log.h>
 #include <yaz/pquery.h>
@@ -59,6 +69,14 @@ void start_log(int argc, char **argv)
  */
 ZebraService start_up(char *cfgname, int argc, char **argv)
 {
+#if HAVE_SYS_RESOURCE_H
+#if HAVE_SYS_TIME_H
+    struct rlimit rlim;
+    rlim.rlim_cur = 20;
+    rlim.rlim_max = 20;
+    setrlimit(RLIMIT_CPU, &rlim);
+#endif
+#endif
     nmem_init();
     start_log(argc, argv);
     return start_service(cfgname);
@@ -71,12 +89,12 @@ const char *get_srcdir()
 {
     const char *srcdir = getenv("srcdir");
     if (!srcdir || ! *srcdir)
-        srcdir=".";
+        srcdir = ".";
     return srcdir;
 
 }
 /** start_service - do a zebra_start with a decent config name */
-ZebraService start_service(char *cfgname)
+ZebraService start_service(const char *cfgname)
 {
     char cfg[256];
     const char *srcdir = get_srcdir();
@@ -85,13 +103,8 @@ ZebraService start_service(char *cfgname)
         cfgname="zebra.cfg";
 
     sprintf(cfg, "%.200s/%.50s", srcdir, cfgname);
-    zs=zebra_start(cfg);
-    if (!zs)
-    {
-        printf("zebra_start failed, probably because missing config file \n"
-               "check %s\n", cfg);
-        exit(9);
-    }
+    zs = zebra_start(cfg);
+    TL_ASSERT2(zs, "zebra_start_failed. Missing config file?");
     return zs;
 }
 
@@ -123,13 +136,15 @@ void init_data(ZebraHandle zh, const char **recs)
     zebra_select_database(zh, "Default");
     yaz_log(log_level, "going to call init");
     i = zebra_init(zh);
-    yaz_log(log_level, "init returned %d", i);
+    yaz_log(log_level, "init_data returned %d", i);
     if (i) 
     {
-        printf("init failed with %d\n",i);
+	yaz_log(log_level, "init_data: zebra_init failed with %d", i);
+        printf("init_data failed with %d\n", i);
         zebra_result(zh, &i, &addinfo);
+        yaz_log(log_level, "Error %d  %s", i, addinfo);
         printf("  Error %d   %s\n", i, addinfo);
-        exit(1);
+	TL_ASSERT(i == 0);
     }
     if (recs)
     {
@@ -159,38 +174,44 @@ int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
     parser = yaz_pqf_create();
     rpn = yaz_pqf_parse(parser, odr, query);
     yaz_pqf_destroy(parser);
-    if (!rpn) {
-        printf("Error: Parse failed \n%s\n", query);
-        exit(1);
-    }
+    TL_ASSERT2(rpn, "Parse of pqf failed");
     rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
     if (experror)
     {
 	int code;
 	if (rc != ZEBRA_FAIL)
 	{
+	    yaz_log(log_level, "search returned %d (OK), but error was "
+		    "expected", rc);
 	    printf("Error: search returned %d (OK), but error was expected\n"
 		   "%s\n",  rc, query);
-	    exit(1);
+	    TL_ASSERT(rc == ZEBRA_FAIL);
 	}
 	code = zebra_errCode(zh);
 	if (code != experror)
 	{
+	    yaz_log(log_level, "search returned error code %d, but error %d "
+		    "was expected", code, experror);
 	    printf("Error: search returned error code %d, but error %d was "
 		   "expected\n%s\n",
 		   code, experror, query);
-	    exit(1);
+	    TL_ASSERT(code == experror);
 	}
     }
     else
     {
 	if (rc == ZEBRA_FAIL) {
 	    int code = zebra_errCode(zh);
+	    yaz_log(log_level, "search returned %d. Code %d", rc, code);
+	    
 	    printf("Error: search returned %d. Code %d\n%s\n", rc, 
 		   code, query);
 	    exit (1);
 	}
-	if (exphits != -1 && hits != exphits) {
+	if (exphits != -1 && hits != exphits)
+	{
+	    yaz_log(log_level, "search returned " ZINT_FORMAT 
+		   " hits instead of " ZINT_FORMAT, hits, exphits);
 	    printf("Error: search returned " ZINT_FORMAT 
 		   " hits instead of " ZINT_FORMAT "\n%s\n",
 		   hits, exphits, query);
@@ -220,7 +241,8 @@ void do_scan(int lineno, ZebraHandle zh, const char *query,
     yaz_log(log_level, "======================================");
     yaz_log(log_level, "scan[%d]: pos=%d num=%d %s", lineno, pos, num, query);
 
-    res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial);
+    res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial, 
+			 0 /* setname */);
     if (res != ZEBRA_OK)
     {
 	printf("Error: scan returned %d (FAIL), but no error was expected\n"
@@ -359,6 +381,51 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
     free(positions);
 }
 
+void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
+{
+    ZebraMetaRecord *recs;
+    zint i;
+    int errs = 0;
+    zint min_val_recs = 0;
+    zint min_val_exp = 0;
+
+    assert(query);
+    do_query(__LINE__, zh, query, hits);
+
+    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
+    if (!recs)
+    {
+	fprintf(stderr, "recs==0\n");
+	exit(1);
+    }
+    /* find min for each sequence to get proper base offset */
+    for (i = 0; i<hits; i++)
+    {
+	if (min_val_recs == 0 || recs[i].sysno < min_val_recs)
+	    min_val_recs = recs[i].sysno;
+	if (min_val_exp == 0 || exp[i] < min_val_exp)
+	    min_val_exp = exp[i];
+    }
+	    
+    /* compare sequences using base offset */
+    for (i = 0; i<hits; i++)
+	if ((recs[i].sysno-min_val_recs) != (exp[i]-min_val_exp))
+	    errs++;
+    if (errs)
+    {
+	printf("Sequence not in right order for query\n%s\ngot exp\n",
+	       query);
+	for (i = 0; i<hits; i++)
+	    printf(" " ZINT_FORMAT "   " ZINT_FORMAT "\n",
+		   recs[i].sysno, exp[i]);
+    }
+    zebra_meta_records_destroy (zh, recs, 4);
+
+    if (errs)
+	exit(1);
+}
+
+
 struct finfo {
     const char *name;
     int occurred;