projects
/
ZOOM-Perl-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
258ac2f
)
Testing for scan by CQL query (does not yet work).
author
mike
<mike>
Tue, 20 Dec 2005 22:21:58 +0000
(22:21 +0000)
committer
mike
<mike>
Tue, 20 Dec 2005 22:21:58 +0000
(22:21 +0000)
t/25-scan.t
patch
|
blob
|
history
diff --git
a/t/25-scan.t
b/t/25-scan.t
index
f6aa477
..
7329c3f
100644
(file)
--- a/
t/25-scan.t
+++ b/
t/25-scan.t
@@
-1,4
+1,4
@@
-# $Id: 25-scan.t,v 1.4 2005-12-19 17:48:47 mike Exp $
+# $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'
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl 25-scan.t'
@@
-14,7
+14,7
@@
my $conn;
eval { $conn = new ZOOM::Connection($host, 0) };
ok(!$@, "connection to '$host'");
eval { $conn = new ZOOM::Connection($host, 0) };
ok(!$@, "connection to '$host'");
-my($ss, $n) = scan($conn, "w", 10);
+my($ss, $n) = scan($conn, 0, "w", 10);
my @terms = ();
my @terms = ();
@@
-39,7
+39,8
@@
ok(defined $@ && $@ =~ /been destroy\(\)ed/,
"can't re-destroy scanset");
# Now re-scan, but only for words that occur in the title
"can't re-destroy scanset");
# Now re-scan, but only for words that occur in the title
-($ss, $n) = scan($conn, '@attr 1=4 w', 6);
+# This time, use a Query object for the start-term
+($ss, $n) = scan($conn, 1, new ZOOM::Query::PQF('@attr 1=4 w'), 6);
$previous = ""; # Sorts before all legitimate terms
foreach my $i (1 .. $n) {
$previous = ""; # Sorts before all legitimate terms
foreach my $i (1 .. $n) {
@@
-55,9
+56,10
@@
$ss->destroy();
ok(1, "destroyed second scanset");
# Now re-do the same scan, but limiting the results to four terms at a
ok(1, "destroyed second scanset");
# Now re-do the same scan, but limiting the results to four terms at a
-# time.
+# time. This time, use a CQL query
$conn->option(number => 4);
$conn->option(number => 4);
-($ss, $n) = scan($conn, '@attr 1=4 w', 4);
+$conn->option(cqlfile => "/etc/passwd");
+($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL('title=w'), 4);
# Get last term and use it as seed for next scan
my($term, $occ) = $ss->term($n-1);
ok($ss->option("position") == 1,
# Get last term and use it as seed for next scan
my($term, $occ) = $ss->term($n-1);
ok($ss->option("position") == 1,
@@
-70,7
+72,7
@@
ok(1, "destroyed third scanset");
# We want the seed-term to be in "position zero", i.e. just before the start
$conn->option(position => 0);
# We want the seed-term to be in "position zero", i.e. just before the start
$conn->option(position => 0);
-($ss, $n) = scan($conn, "\@attr 1=4 $term", 2);
+($ss, $n) = scan($conn, 0, "\@attr 1=4 $term", 2);
ok($ss->option("position") == 0,
"seed-term before start of returned list");
ok($ss->option("position") == 0,
"seed-term before start of returned list");
@@
-85,22
+87,20
@@
ok(1, "destroyed fourth scanset");
# Some more testing still to do: see comment in "15-scan.t"
# Some more testing still to do: see comment in "15-scan.t"
-my $use_query_for_scan = 0;
sub scan {
sub scan {
- my($conn, $startterm, $nexpected) = @_;
+ my($conn, $startterm_is_query, $startterm, $nexpected) = @_;
my $ss;
my $ss;
+ ok(1, "about to scan for '$startterm'");
eval {
eval {
- if ($use_query_for_scan) {
- my $q = new ZOOM::Query::PQF($startterm);
- $ss = $conn->scan($q);
+ if ($startterm_is_query) {
+ $ss = $conn->scan($startterm);
} else {
$ss = $conn->scan_pqf($startterm);
}
};
ok(!$@, "scan for '$startterm'");
die $@ if $@;
} else {
$ss = $conn->scan_pqf($startterm);
}
};
ok(!$@, "scan for '$startterm'");
die $@ if $@;
- $use_query_for_scan = !$use_query_for_scan;
my $n = $ss->size();
ok(defined $n, "got size");
my $n = $ss->size();
ok(defined $n, "got size");