-my @mods = qw(Filesys::Notify::Simple DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for watch_filter_rubylang_v2.t" if $@;
-}
-
-use_ok 'PublicInbox::WatchMaildir';
+require_mods(qw(DBD::SQLite Search::Xapian));
+use_ok 'PublicInbox::Watch';
my $cfgpfx = "publicinbox.$v";
my $inboxdir = "$tmpdir/$v";
my $maildir = "$tmpdir/md-$v";
my $spamdir = "$tmpdir/spam-$v";
my $addr = "test-$v\@example.com";
my $cfgpfx = "publicinbox.$v";
my $inboxdir = "$tmpdir/$v";
my $maildir = "$tmpdir/md-$v";
my $spamdir = "$tmpdir/spam-$v";
my $addr = "test-$v\@example.com";
- my @cmd = ('blib/script/public-inbox-init', "-$v", $v, $inboxdir,
+ my @cmd = ('-init', "-$v", $v, $inboxdir,
my $ibx = $config->lookup_name($v);
ok($ibx, 'found inbox by name');
my $ibx = $config->lookup_name($v);
ok($ibx, 'found inbox by name');
- ($tot, $msgs) = $ibx->search->query("alerts:$i");
- is($tot, 1, "got one result for alerts:$i");
+ my $mset = $ibx->search->mset("alerts:$i");
+ is($mset->size, 1, "got one result for alerts:$i");
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
- ($tot, undef) = $ibx->search->query('b:spam');
- is($tot, 1, 'got spam message');
+ is($ibx->search->mset('b:spam')->size, 1, 'got spam message');
- ($tot, undef) = $ibx->search->reopen->query('b:spam');
- is($tot, 0, 'spam removed');
+ is($ibx->search->reopen->mset('b:spam')->size, 0, 'spam removed');