X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F25-scan.t;h=01aba9e01d83536e44b77d1f9f4b5cf5e5eb7ea8;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=f81acb669d252597144e37fdeb33854ffcecf071;hpb=ae5c2b81234af64a77295188f6fc90ede3589723;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/25-scan.t b/t/25-scan.t
index f81acb6..01aba9e 100644
--- a/t/25-scan.t
+++ b/t/25-scan.t
@@ -1,19 +1,18 @@
-# $Id: 25-scan.t,v 1.9 2006-11-02 17:04:36 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 => 87;
+use Test::More tests => 81;
 
 BEGIN { use_ok('ZOOM') };
 
-my $host = "bagel.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 = ();
@@ -29,7 +28,8 @@ foreach my $i (1 .. $n) {
     (my $disp, $occ) = $ss->display_term($i-1);
     ok(defined $disp,
        "display term $i of $n: '$disp' ($occ occurences)");
-    ok($disp eq $term, "display term $i identical to term");
+    ok(lc($disp) eq lc($term),
+       "display term $i ($disp) equivalent to term ($term)");
 }
 
 $ss->destroy();
@@ -49,7 +49,14 @@ foreach my $i (1 .. $n) {
        "got title term $i of $n: '$term' ($occ occurences)");
     ok($term ge $previous, "title term '$term' ge previous '$previous'");
     $previous = $term;
-    ok((grep { $term eq $_ } @terms), "title term was in term list");
+
+    # Previously we used to assert that the each title-term was
+    # included in the initial term-list that we got by scanning across
+    # all indexes.  Of course this will not in general be true,
+    # because not all terms are title terms, which means that the $n
+    # title terms will include some that are past the end of $n
+    # general terms.  So remove that test.
+    #ok((grep { $term eq $_ } @terms), "title term ($term) was in term list (@terms)");
 }
 
 $ss->destroy();
@@ -60,7 +67,7 @@ ok(1, "destroyed second scanset");
 $conn->option(number => 4);
 $conn->option(cqlfile => "samples/cql/pqf.properties");
 
-($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL('title=w'), 4);
+($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,
@@ -115,6 +122,6 @@ sub scan {
 
     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);
 }