--- trunk/t/6-unit.t	2005/07/24 15:03:11	31
+++ trunk/t/6-unit.t	2006/01/07 18:23:27	352
@@ -2,16 +2,17 @@
 
 use strict;
 
-use Test::More tests => 23;
+use Test::More tests => 34;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use File::Temp qw/tempdir/;
+use Data::Dumper;
 use blib;
 
 BEGIN {
 use_ok( 'WebPAC::Lookup' );
-use_ok( 'WebPAC::Input::ISIS' );
-use_ok( 'WebPAC::DB' );
+use_ok( 'WebPAC::Input' );
+use_ok( 'WebPAC::Store' );
 use_ok( 'WebPAC::Normalize::XML' );
 use_ok( 'WebPAC::Output::TT' );
 }
@@ -29,21 +30,24 @@
 	lookup_file => "$abs_path../conf/lookup/isis.pm",
 ), "new Lookup");
 
-ok(my $isis = new WebPAC::Input::ISIS(
+ok(my $isis = new WebPAC::Input(
+	module => 'WebPAC::Input::ISIS',
 	code_page => 'ISO-8859-2',	# application encoding
-	limit_mfn => 10,
+	limit => 10,
 ), "new Input::ISIS");
 
 ok(my $maxmfn = $isis->open(
-	filename => $isis_file,
+	path => $isis_file,
 	code_page => '852',		# database encoding
+	lookup => $lookup,
 ), "Input::ISIS->open");
 
 ok(my $path = tempdir( CLEANUP => 1 ), "path");
 
-ok(my $db = new WebPAC::DB(
+ok(my $db = new WebPAC::Store(
 	path => $path,
-), "new DB");
+	database => '.',
+), "new Store");
 
 ok(my $n = new WebPAC::Normalize::XML(
 #	filter => { 'foo' => sub { shift } },
@@ -64,14 +68,17 @@
 
 while (my $row = $isis->fetch) {
 	
-	ok(my @ds = $n->data_structure($row), "data_structure");
+	ok(my $ds = $n->data_structure($row), "data_structure");
 
-use Data::Dumper;
-print Dumper(\@ds);
+#	diag Dumper($ds);
 
-	ok($out->apply(
+	ok(my $html = $out->apply(
 		template => 'html.tt',
-		data => @ds,
+		data => $ds,
 	), "apply");
 
+	$html =~ s#\s*[\n\r]+\s*##gs;
+
+	#diag $html;
+
 };