fix tests to run without Xapian installed

[public-inbox.git] / t / over.t

diff --git a/t/over.t b/t/over.t
index bfe331ede2cbc5c75db85c942aa4f087bf1ad9d6..7a3c972104d6d15024b8fbc8c5e25465e182e308 100644 (file)
--- a/t/over.t
+++ b/t/over.t
@@ -5,7 +5,8 @@ use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 use Compress::Zlib qw(compress);
-foreach my $mod (qw(DBD::SQLite)) {
+# FIXME: allow using Over w/o Xapian
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
        eval "require $mod";
        plan skip_all => "$mod missing for over.t" if $@;
 }
@@ -38,23 +39,23 @@ is($y, $x + 1, 'integer tid for ghost increases');
 
 my $ddd = compress('');
 foreach my $s ('', undef) {
-       $over->add_over([0, 98, [ 'a' ], [], $s, $ddd]);
-       $over->add_over([0, 99, [ 'b' ], [], $s, $ddd]);
-       my $msgs = [ map { $_->{num} } @{$over->get_thread('a')->{msgs}} ];
+       $over->add_over([0, 0, 98, [ 'a' ], [], $s, $ddd]);
+       $over->add_over([0, 0, 99, [ 'b' ], [], $s, $ddd]);
+       my $msgs = [ map { $_->{num} } @{$over->get_thread('a')} ];
        is_deeply([98], $msgs,
                'messages not linked by empty subject');
 }
 
-$over->add_over([0, 98, [ 'a' ], [], 's', $ddd]);
-$over->add_over([0, 99, [ 'b' ], [], 's', $ddd]);
+$over->add_over([0, 0, 98, [ 'a' ], [], 's', $ddd]);
+$over->add_over([0, 0, 99, [ 'b' ], [], 's', $ddd]);
 foreach my $mid (qw(a b)) {
-       my $msgs = [ map { $_->{num} } @{$over->get_thread('a')->{msgs}} ];
+       my $msgs = [ map { $_->{num} } @{$over->get_thread('a')} ];
        is_deeply([98, 99], $msgs, 'linked messages by subject');
 }
-$over->add_over([0, 98, [ 'a' ], [], 's', $ddd]);
-$over->add_over([0, 99, [ 'b' ], ['a'], 'diff', $ddd]);
+$over->add_over([0, 0, 98, [ 'a' ], [], 's', $ddd]);
+$over->add_over([0, 0, 99, [ 'b' ], ['a'], 'diff', $ddd]);
 foreach my $mid (qw(a b)) {
-       my $msgs = [ map { $_->{num} } @{$over->get_thread($mid)->{msgs}} ];
+       my $msgs = [ map { $_->{num} } @{$over->get_thread($mid)} ];
        is_deeply([98, 99], $msgs, "linked messages by Message-ID: <$mid>");
 }