Make cleanup of encodings, moving webpac closer to having

[webpac2] / t / 2-input-excel.t

diff --git a/t/2-input-excel.t b/t/2-input-excel.t
index b46ebf2..962f48c 100755 (executable)
--- a/t/2-input-excel.t
+++ b/t/2-input-excel.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 45;
+use Test::More tests => 49;
 
 BEGIN {
 use_ok( 'WebPAC::Test' );
@@ -13,25 +13,24 @@ use_ok( 'WebPAC::Input' );
 my $module = 'WebPAC::Input::Excel';
 diag "testing with $module";
 
-our ($input,$db,$size);
+ok(my $input = new WebPAC::Input(
+       module => $module,
+       no_progress_bar => 1,
+       %LOG,
+), "new");
 
-sub open_xls {
+our ($db,$size);
 
-       ok($input = new WebPAC::Input(
-               module => $module,
-               no_progress_bar => 1,
-               %LOG,
-       ), "new $module");
+sub open_xls {
+       my $args = shift;
 
-       my $path = shift;
-       $path = "$abs_path/data/$path";
-       ok(my $db = $input->open( path => $path ), "open $path");
+       $args->{path} = "$abs_path/data/" . $args->{path} || die "no path?";
+       ok(my $db = $input->open( %$args ), "open " . dump( $args ));
        ok($size = $input->size, "size $size");
        return $db;
 }
 
-
-open_xls('excel_95.xls');
+open_xls({ path => 'excel_95.xls' });
 
 foreach my $mfn ( 1 ... $size ) {
        my $rec = $input->fetch;
@@ -46,8 +45,7 @@ foreach my $mfn ( 1 ... $size ) {
        diag "rec: ", dump($rec), "\n" if $debug;
 }
 
-open_xls('stara-signatura.xls');
-
-foreach my $mfn ( 20 .. 23 ) {
-       diag dump( $input->fetch( $mfn ) ) if $debug;
-}
+open_xls({ path => 'stara-signatura.xls', input_encoding => 'utf-16' });
+ok( $input->seek( 790 ), 'seek 790');
+ok( my $rec = $input->fetch, 'fetch' );
+diag dump( $rec );