--- trunk/t/1_Document.t	2006/01/28 17:38:00	94
+++ trunk/t/1_Document.t	2006/01/28 17:55:48	95
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 37;
+use Test::More tests => 45;
 use Test::Exception;
 use Data::Dumper;
 
@@ -17,6 +17,8 @@
 my $attr_data = {
 	'@uri' => 'http://localhost/Search-Estraier/',
 	'size' => 42,
+	'zero' => 0,
+	'foo' => 'bar',
 };
 
 my @test_texts = (
@@ -36,8 +38,9 @@
 ok($doc = new Search::Estraier::Document, 'new');
 
 foreach my $a (keys %{$attr_data}) {
-	my $d = $attr_data->{$a} || die;
-	ok($doc->add_attr($a, $d), "add_attr $a");
+	my $d = $attr_data->{$a};
+	ok($doc->add_attr($a, $d), "add_attr $a = $d");
+	diag "draft:\n",$doc->dump_draft,Dumper($doc->{attrs});
 	cmp_ok($doc->attr($a), 'eq', $d, "attr $a = $d");
 }
 
@@ -62,12 +65,12 @@
 ok(my @attr = $doc->attr_names, 'attr_names');
 #diag "attr_names: ", join(',',@attr), "\n";
 
-cmp_ok(scalar @attr, '==', 2, 'attr_names');
+cmp_ok(scalar @attr, '==', keys %{$attr_data}, 'attr_names');
 
 ok(! $doc->attr('foobar'), "non-existant attr");
 
 foreach my $a (keys %{$attr_data}) {
-	cmp_ok($attr_data->{$a}, 'eq', $doc->attr($a), "attr $a = ".$attr_data->{$a});
+	cmp_ok($doc->attr($a), 'eq', $attr_data->{$a}, "attr $a = ".$attr_data->{$a});
 	ok($doc->add_attr($a, undef), "delete attribute");
 }