--- trunk/t/5_Node.t	2006/01/06 01:36:09	45
+++ trunk/t/5_Node.t	2006/01/06 12:48:14	50
@@ -3,13 +3,13 @@
 use strict;
 use blib;
 
-use Test::More tests => 46;
+use Test::More tests => 79;
 use Test::Exception;
 use Data::Dumper;
 
 BEGIN { use_ok('Search::Estraier') };
 
-my $debug = 1;
+my $debug = 0;
 
 # name of node for test
 my $test_node = 'Search-Estraier';
@@ -51,27 +51,47 @@
 #diag "draft:\n$draft";
 ok(my $doc = new Search::Estraier::Document($draft), 'new doc from draft');
 
+ok( $node->put_doc($doc), "put_doc data001");
+
 for ( 1 .. 10 ) {
 	$doc->add_attr('@uri', 'test' . $_);
 	ok( $node->put_doc($doc), "put_doc test$_");
 	#diag $doc->dump_draft;
 }
 
-ok(my $id = $node->uri_to_id( 'data001' ), 'uri_to_id');
-
-ok( $node->out_doc( $id ), "out_doc $id");
+my $id;
+ok($id = $node->uri_to_id( 'data001' ), "uri_to_id = $id");
 
 for ( 1 .. 5 ) {
 	ok( $node->out_doc_by_uri( 'test' . $_ ), "out_doc_by_uri test$_");
 }
 
-$doc->add_attr('@uri', 'data001');
+ok($doc = $node->get_doc( $id ), 'get_doc for edit');
 $doc->add_attr('foo', 'bar');
+#diag Dumper($doc);
 ok( $node->edit_doc( $doc ), 'edit_doc');
 
+ok( $node->out_doc( $id ), "out_doc $id");
+
+ok( ! $node->edit_doc( $doc ), "edit removed");
+
 for ( 6 .. 10 ) {
-	ok( $node->get_doc( $_ ), "get_doc $_");
 	my $uri = 'test' . $_;
+	ok( my $id = $node->uri_to_id( $uri ), "uri_to_id $uri");
+	ok( $node->get_doc( $id ), "get_doc $id");
 	ok( $node->get_doc_by_uri( $uri ), "get_doc_by_uri $uri");
-	ok( my $k = $node->etch_doc_by_uri( $uri ), "etch_doc_by_uri $uri");
+	cmp_ok( $node->get_doc_attr( $id, '@uri' ), 'eq', $uri, "get_doc_attr $id");
+	cmp_ok( $node->get_doc_attr_by_uri( $uri, '@uri' ), 'eq', $uri, "get_doc_attr $id");
+	ok( my $k = $node->etch_doc( $id ), "etch_doc_by_uri $uri");
+	ok( my $k2 = $node->etch_doc_by_uri( $uri ), "etch_doc_by_uri $uri");
+	#diag Dumper($k, $k2);
+	ok( eq_hash( $k, $k2 ), "keywords");
 }
+
+my $v;
+ok($v = $node->name, "name: $v");
+ok($v = $node->label, "label: $v");
+ok($v = $node->doc_num, "doc_num: $v");
+ok($v = $node->word_num, "word_num: $v");
+ok($v = $node->size, "size: $v");
+