X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F25-scan.t;h=ff145c1984d4d00945ad0a0de7ef4d7b545b7147;hb=d3e9f77a4fd2600d9e56bb3a4f68032ce3f9b299;hp=7329c3febb570117dae48dc86da7a2bb87d5d095;hpb=ff028a20b2e9bae14905e61222669978f4a424b4;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/25-scan.t b/t/25-scan.t
index 7329c3f..ff145c1 100644
--- a/t/25-scan.t
+++ b/t/25-scan.t
@@ -1,19 +1,18 @@
-# $Id: 25-scan.t,v 1.5 2005-12-20 22:21:58 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 25-scan.t'
 
 use strict;
 use warnings;
-use Test::More tests => 81;
+use Test::More tests => 87;
 
 BEGIN { use_ok('ZOOM') };
 
-my $host = "indexdata.com/gils";
+my $host = "z3950.indexdata.com/gils";
 my $conn;
 eval { $conn = new ZOOM::Connection($host, 0) };
 ok(!$@, "connection to '$host'");
 
+$conn->option(number => 10);
 my($ss, $n) = scan($conn, 0, "w", 10);
 
 my @terms = ();
@@ -58,8 +57,9 @@ ok(1, "destroyed second scanset");
 # Now re-do the same scan, but limiting the results to four terms at a
 # time.  This time, use a CQL query
 $conn->option(number => 4);
-$conn->option(cqlfile => "/etc/passwd");
-($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL('title=w'), 4);
+$conn->option(cqlfile => "samples/cql/pqf.properties");
+
+($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL2RPN('title=w', $conn), 4);
 # Get last term and use it as seed for next scan
 my($term, $occ) = $ss->term($n-1);
 ok($ss->option("position") == 1,
@@ -70,6 +70,18 @@ ok(defined $term,
 $ss->destroy();
 ok(1, "destroyed third scanset");
 
+$conn->option(cclfile => "samples/ccl/default.bib");
+($ss, $n) = scan($conn, 1, new ZOOM::Query::CCL2RPN('ti=w', $conn), 4);
+# Get last term and use it as seed for next scan
+($term, $occ) = $ss->term($n-1);
+ok($ss->option("position") == 1,
+   "seed-term is start of returned list");
+ok(defined $term,
+   "got last title term '$term' to use as seed");
+
+$ss->destroy();
+ok(1, "destroyed fourth scanset");
+
 # We want the seed-term to be in "position zero", i.e. just before the start
 $conn->option(position => 0);
 ($ss, $n) = scan($conn, 0, "\@attr 1=4 $term", 2);
@@ -82,7 +94,7 @@ ok($ss->option("position") eq "fruit",
    "option setting/getting works");
 
 $ss->destroy();
-ok(1, "destroyed fourth scanset");
+ok(1, "destroyed fifth scanset");
 
 # Some more testing still to do: see comment in "15-scan.t"
 
@@ -91,7 +103,6 @@ sub scan {
     my($conn, $startterm_is_query, $startterm, $nexpected) = @_;
 
     my $ss;
-    ok(1, "about to scan for '$startterm'");
     eval {
 	if ($startterm_is_query) {
 	    $ss = $conn->scan($startterm);
@@ -100,10 +111,9 @@ sub scan {
 	}
     };
     ok(!$@, "scan for '$startterm'");
-    die $@ if $@;
 
     my $n = $ss->size();
     ok(defined $n, "got size");
-    ok($n == $nexpected, "got $n terms (expected $nexpected)");
+    ok($n == $nexpected, "got $n terms for '$startterm' (expected $nexpected)");
     return ($ss, $n);
 }