--- trunk/t/5_Node.t	2006/05/16 11:39:53	151
+++ trunk/t/5_Node.t	2006/05/22 14:42:10	156
@@ -3,22 +3,28 @@
 use strict;
 use blib;
 
-use Test::More tests => 270;
+my $tests = 270;
+
+use Test::More;
 use Test::Exception;
 use Data::Dumper;
 
 BEGIN { use_ok('Search::Estraier') };
 
+plan tests => $tests;
+
 my $debug = shift @ARGV;
 
 # name of node for test
 my $test1_node = '_test1_' . $$;
 my $test2_node = '_test2_' . $$;
 
+my $estmaster_uri = $ENV{'ESTMASTER_URI'} || 'http://localhost:1978';
+
 ok(my $node = new Search::Estraier::Node( debug => $debug ), 'new');
 isa_ok($node, 'Search::Estraier::Node');
 
-ok($node->set_url("http://localhost:1978/node/$test1_node"), "set_url $test1_node");
+ok($node->set_url("$estmaster_uri/node/$test1_node"), "set_url $test1_node");
 
 ok($node->set_proxy('', 8080), 'set_proxy');
 throws_ok {$node->set_proxy('proxy.example.com', 'foo') } qr/port/, 'set_proxy port NaN';
@@ -26,12 +32,22 @@
 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');
 
 # test master functionality
 
+SKIP: {
+
+skip "can't find estmaster at $estmaster_uri", ($tests - 9) if (! eval { $node->master( action => 'nodelist' ) } );
+
+diag "using $estmaster_uri";
 diag("node->master shutdown not tested");
 
 diag("node->master backup not tested");
@@ -212,7 +228,7 @@
 }
 
 ok(my $hints = $nres->hints, 'hints');
-diag Dumper($hints);
+diag Dumper($hints) if ($debug);
 
 ok($node->_set_info, "refresh _set_info");
 
@@ -229,13 +245,15 @@
 my $skip = int($max / 2) || die "skip is zero, can't test";
 ok($cond->set_skip( $skip ), "cond set_skip($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' );
 cmp_ok($nres->doc_num, '==', $max, "nres->doc_num " . ($max - $skip));
 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");
@@ -246,24 +264,24 @@
 
 
 # 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( "http://localhost:1978/node/$test2_node" ), "new $test2_node");
+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");
 
 # croak_on_error
 
-ok($node = new Search::Estraier::Node( url => "http://localhost:1978/non-existant", croak_on_error => 1 ), "new non-existant");
+ok($node = new Search::Estraier::Node( url => "$estmaster_uri/non-existant", croak_on_error => 1 ), "new non-existant");
 throws_ok { $node->name } qr/404/, 'croak on error';
 
 # croak_on_error
-ok($node = new Search::Estraier::Node( url => "http://localhost:1978/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');
 
 
@@ -275,17 +293,17 @@
 
 # now, test links
 my $test2_label = "$test2_node label";
-my $link_url = "http://localhost:1978/node/$test2_node";
+my $link_url = "$estmaster_uri/node/$test2_node";
 ok($node->set_link( $link_url, $test2_label, 42), "set_link $test2_node ($test2_label) 42");
 ok(my $links = $node->links, 'links');
 cmp_ok($#{$links}, '==', 0, 'one link');
 like($links->[0], qr/^$link_url/, 'link correct');
-ok($node->set_link("http://localhost:1978/node/$test2_node", $test2_label, 0), "set_link $test2_node ($test2_label) delete");
+ok($node->set_link("$estmaster_uri/node/$test2_node", $test2_label, 0), "set_link $test2_node ($test2_label) delete");
 
 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');
 
@@ -302,7 +320,7 @@
 my $node_label = "test $$ label";
 
 ok($node = new Search::Estraier::Node(
-	url => "http://localhost:1978/node/$node_name",
+	url => "$estmaster_uri/node/$node_name",
 	create => 1,
 	label => $node_label,
 	croak_on_error => 1
@@ -312,14 +330,14 @@
 cmp_ok($node->label, 'eq', $node_label, "node label: $node_label");
 
 ok($node = new Search::Estraier::Node(
-	url => "http://localhost:1978/node/$node_name",
+	url => "$estmaster_uri/node/$node_name",
 	create => 1,
 	label => $node_label,
 	croak_on_error => 0
 ), "new create existing");
 
 ok($node = new Search::Estraier::Node(
-	url => "http://localhost:1978/node/$node_name",
+	url => "$estmaster_uri/node/$node_name",
 	create => 1,
 	label => $node_label,
 	croak_on_error => 1
@@ -333,7 +351,7 @@
 
 # and again, this time without node
 ok($node = new Search::Estraier::Node(
-	url => "http://localhost:1978/node/$node_name",
+	url => "$estmaster_uri/node/$node_name",
 	create => 1,
 	label => $node_label,
 	croak_on_error => 0
@@ -350,4 +368,6 @@
 
 ok($msg = $node->master( action => 'sync' ), "sync: $msg");
 
+} # SKIP
+
 diag "over";