--- trunk/t/5_Node.t	2006/05/16 12:11:39	152
+++ trunk/t/5_Node.t	2006/08/06 16:29:34	167
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-my $tests = 269;
+my $tests = 272;
 
 use Test::More;
 use Test::Exception;
@@ -32,7 +32,12 @@
 ok($node->set_timeout(42), 'set_timeout');
 throws_ok {$node->set_timeout('foo') } qr/timeout/, 'set_timeout NaN';
 
-ok($node->set_auth('admin','admin'), 'set_auth');
+my ($user, $passwd) = (
+	$ENV{EST_USER} || 'admin',
+	$ENV{EST_PASSWD} || 'admin'
+);
+
+ok($node->set_auth($user, $passwd), 'set_auth');
 
 cmp_ok($node->status, '==', -1, 'status');
 
@@ -166,6 +171,9 @@
 
 ok( ! $node->edit_doc( $doc ), "edit_doc of removed doc");
 
+my $cache;
+ok($cache = $node->cacheusage, "cacheusage: $cache");
+
 my $delete_num = 5;
 
 for ( 1 .. $delete_num ) {
@@ -239,6 +247,9 @@
 # test skip
 my $skip = int($max / 2) || die "skip is zero, can't test";
 ok($cond->set_skip( $skip ), "cond set_skip($skip)");
+cmp_ok($cond->skip, '==', $skip, "skip is $skip");
+
+like($node->cond_to_query( $cond ), qr/skip=$skip/, 'cond_to_query have skip');
 
 ok( $nres = $node->search( $cond, 0 ), 'search');
 isa_ok( $nres, 'Search::Estraier::NodeResult' );
@@ -246,7 +257,7 @@
 cmp_ok($nres->hits, '==', $doc_num2, "nres->hits $doc_num2");
 
 for my $i ( 0 .. ($nres->doc_num - 1) ) {
-	my $uri = 'test' . ($i + $delete_num + 1);
+	my $uri = 'test' . ($i + $delete_num + $skip + 1);
 	ok( my $rdoc = $nres->get_doc( $i ), "nres->get_doc $i");
 	if ($rdoc) {
 		cmp_ok( $rdoc->attr('@uri'), 'eq', $uri, "\@uri = $uri");
@@ -257,7 +268,7 @@
 
 
 # user doesn't exist
-ok(! $node->set_user('foobar', 1), 'set_user');
+ok($node->set_user('foobar', 1), 'set_user');
 
 ok(my $node2 = new Search::Estraier::Node( "$estmaster_uri/node/$test2_node" ), "new $test2_node");
 ok($node2->set_auth('admin','admin'), "set_auth $test2_node");
@@ -268,13 +279,13 @@
 throws_ok { $node->name } qr/404/, 'croak on error';
 
 # croak_on_error
-ok($node = new Search::Estraier::Node( url => "$estmaster_uri/node/$test1_node", croak_on_error => 1 ), "new $test1_node");
+ok($node = new Search::Estraier::Node( url => "$estmaster_uri/node/$test1_node", croak_on_error => 1, user => $user, passwd => $passwd, debug => $debug ), "new $test1_node");
 
 ok(! $node->uri_to_id('foobar'), 'uri_to_id without croak');
 
 
 # test users
-ok(! $node->admins, 'no admins');
+ok($node->admins, 'have admins');
 ok(! $node->guests, 'no guests');
 
 
@@ -296,7 +307,7 @@
 ok($msg = $node->master(
 	action => 'nodeclr',
 	name => $node->name,
-), "nodeclr $node->name: $msg");
+), "nodeclr " . $node->name . ": $msg");
 
 cmp_ok($node->doc_num, '==', 0, 'no documents');