r1802@llin: dpavlin | 2009-04-23 15:20:49 +0200

[webpac2] / t / 5-output-swish.t

diff --git a/t/5-output-swish.t b/t/5-output-swish.t
index 2747732..f9e1bb9 100755 (executable)
--- a/t/5-output-swish.t
+++ b/t/5-output-swish.t
@@ -6,17 +6,20 @@ use blib;
 use Test::More tests => 35;
 
 BEGIN {
-use_ok( 'WebPAC::Test' );
-use_ok( 'WebPAC::Output::SWISH' );
-use_ok( 'SWISH::API' );
+       use lib 'lib';
+       use_ok( 'WebPAC::Test' );
+       use_ok( 'WebPAC::Output::SWISH' );
+       use_ok( 'SWISH::API' );
 }
 
 my $path = "$abs_path/kino/";
 
-ok(my $out = new WebPAC::Output::SWISH(
+ok(my $out = new WebPAC::Output::SWISH({
        database => 'test',
        %LOG
-), "new");
+}), "new");
+
+ok( $out->init, 'init' );
 
 my $ds = {
        'Source' => {
@@ -24,7 +27,7 @@ my $ds = {
                'search' => [ 'tko zna' ]
        },
        'ID' => {
-               'search' => 'id',
+               'search' => [ 'id' ],
        },
        'Array' => {
                'search' => [ qw/a1 a2 s3 a4 a5/ ],
@@ -34,9 +37,6 @@ my $ds = {
        },
 };
 
-throws_ok { $out->add( ) } qr/need id/, 'add without params';
-throws_ok { $out->add( 42 ) } qr/need ds/, 'add without ds';
-
 ok( $out->add( 42, $ds ), 'add 42' );
 
 my @strange = ( qw/èajðinica odma¹æivanje ¾abokreèina ¹uma/ );
@@ -53,7 +53,7 @@ sub test_search {
        my $swish = SWISH::API->new( $out->index_path );
        $swish->abort_last_error if $swish->Error;
 
-       my $results = $swish->search( $query_string );
+       my $results = $swish->query( $query_string );
 
        my $total_hits = $results->hits;