--- trunk/t/1_document.t	2006/01/04 14:38:35	5
+++ trunk/t/1_document.t	2006/01/04 14:48:11	6
@@ -17,45 +17,47 @@
 	'size' => 42,
 };
 
-ok(my $estdoc = new Search::Estraier::Document, 'new');
+ok(my $doc = new Search::Estraier::Document, 'new');
 
-ok($estdoc->delete, "delete");
+cmp_ok($doc->id, '==', -1, 'id');
 
-ok($estdoc = new Search::Estraier::Document, 'new');
+ok($doc->delete, "delete");
+
+ok($doc = new Search::Estraier::Document, 'new');
 
 foreach my $a (keys %{$attr_data}) {
-	ok($estdoc->add_attr($a, $attr_data->{$a}), "add_attr $a");
+	ok($doc->add_attr($a, $attr_data->{$a}), "add_attr $a");
 }
 
-ok($estdoc->add_text('This is a demo'), 'add_text');
-ok($estdoc->add_hidden_text('This is hidden text'), 'add_hidden_text');
+ok($doc->add_text('This is a demo'), 'add_text');
+ok($doc->add_hidden_text('This is hidden text'), 'add_hidden_text');
 
-ok(my $draft = $estdoc->dump_draft, 'dump_draft');
+ok(my $draft = $doc->dump_draft, 'dump_draft');
 
 diag "dump_draft:\n$draft";
 
-ok(my $estdoc2 = new_from_draft Search::Estraier::Document($draft), 'new_from_draft');
-cmp_ok($estdoc2->dump_draft, 'eq', $draft, 'drafts same');
+ok(my $doc2 = new_from_draft Search::Estraier::Document($draft), 'new_from_draft');
+cmp_ok($doc2->dump_draft, 'eq', $draft, 'drafts same');
 
-cmp_ok($estdoc->id, '==', -1, 'id');
-cmp_ok($estdoc2->id, '==', -1, 'id');
+cmp_ok($doc->id, '==', -1, 'id');
+cmp_ok($doc2->id, '==', -1, 'id');
 
-my @attr = $estdoc->attr_names;
+my @attr = $doc->attr_names;
 diag "attr_names: ", join(',',@attr), "\n";
 
 cmp_ok(scalar @attr, '==', 2, 'attr_names');
 
-ok(! $estdoc->attr('foobar'), "non-existant attr");
+ok(! $doc->attr('foobar'), "non-existant attr");
 
 foreach my $a (keys %{$attr_data}) {
-	cmp_ok($attr_data->{$a}, 'eq', $estdoc->attr($a), "attr $a = ".$attr_data->{$a});
-	ok($estdoc->add_attr($a, ''), "delete attribute");
+	cmp_ok($attr_data->{$a}, 'eq', $doc->attr($a), "attr $a = ".$attr_data->{$a});
+	ok($doc->add_attr($a, ''), "delete attribute");
 }
 
-#diag "attr_names left: ", join(',',$estdoc->attr_names), "\n";
-cmp_ok($estdoc->attr_names, '==' , 0, "attributes removed");
+#diag "attr_names left: ", join(',',$doc->attr_names), "\n";
+cmp_ok($doc->attr_names, '==' , 0, "attributes removed");
 
-my @texts = $estdoc->texts;
+my @texts = $doc->texts;
 diag "texts: ", join(',',@texts), "\n";
 
 cmp_ok(scalar @texts, '==', 1, 'texts');
@@ -63,14 +65,14 @@
 SKIP: {
 	skip "est_keywords not implemented", 2;
 
-	my @keywords = $estdoc->keywords;
+	my @keywords = $doc->keywords;
 	diag "keywords: ", join(',',@keywords), "\n";
 
 	cmp_ok(scalar @keywords, '==', 1, 'keywords');
 }
 
 
-ok(my $snippet = $estdoc->make_snippet(480, 96, 96, qw(demo is)), "make_snippet");
+ok(my $snippet = $doc->make_snippet(480, 96, 96, qw(demo is)), "make_snippet");
 diag "make_snippet:\n$snippet";
 
-ok($estdoc->scan_words(qw(this is demo)), "scan_words");
+ok($doc->scan_words(qw(this is demo)), "scan_words");