rename WatchMaildir => Watch

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

diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t
index dd5030ea0e89bfc4c0311f03e42212c43bfa8763..ca1cf9656889934c8b60b7dcb406376d7189185f 100644 (file)
--- a/t/watch_maildir_v2.t
+++ b/t/watch_maildir_v2.t
@@ -2,19 +2,19 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use Cwd;
 use PublicInbox::Config;
 use PublicInbox::TestCommon;
 use PublicInbox::Import;
 require_git(2.6);
-require_mods(qw(Search::Xapian DBD::SQLite Filesys::Notify::Simple));
+require_mods(qw(Search::Xapian DBD::SQLite));
 require PublicInbox::V2Writable;
 my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxdir = "$tmpdir/v2";
 my $maildir = "$tmpdir/md";
 my $spamdir = "$tmpdir/spam";
-use_ok 'PublicInbox::WatchMaildir';
+use_ok 'PublicInbox::Watch';
 use_ok 'PublicInbox::Emergency';
 my $cfgpfx = "publicinbox.test";
 my $addr = 'test-public@example.com';
@@ -49,8 +49,8 @@ my $ibx = $config->lookup_name('test');
 ok($ibx, 'found inbox by name');
 my $srch = $ibx->search;
 
-PublicInbox::WatchMaildir->new($config)->scan('full');
-my ($total, undef) = $srch->reopen->query('');
+PublicInbox::Watch->new($config)->scan('full');
+my $total = scalar @{$srch->reopen->query('')};
 is($total, 1, 'got one revision');
 
 # my $git = PublicInbox::Git->new("$inboxdir/git/0.git");
@@ -69,8 +69,9 @@ my $write_spam = sub {
 };
 $write_spam->();
 is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
-PublicInbox::WatchMaildir->new($config)->scan('full');
-is(($srch->reopen->query(''))[0], 0, 'deleted file');
+PublicInbox::Watch->new($config)->scan('full');
+is_deeply($srch->reopen->query(''), [], 'deleted file');
+is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 
 # check with scrubbing
 {
@@ -79,17 +80,18 @@ To unsubscribe from this list: send the line "unsubscribe git" in
 the body of a message to majordomo\@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        PublicInbox::Emergency->new($maildir)->prepare(\$msg);
-       PublicInbox::WatchMaildir->new($config)->scan('full');
-       my ($nr, $msgs) = $srch->reopen->query('');
-       is($nr, 1, 'got one file back');
+       PublicInbox::Watch->new($config)->scan('full');
+       my $msgs = $srch->reopen->query('');
+       is(scalar(@$msgs), 1, 'got one file back');
        my $mref = $ibx->msg_by_smsg($msgs->[0]);
        like($$mref, qr/something\n\z/s, 'message scrubbed on import');
 
        is(unlink(glob("$maildir/new/*")), 1, 'unlinked spam');
        $write_spam->();
-       PublicInbox::WatchMaildir->new($config)->scan('full');
-       ($nr, $msgs) = $srch->reopen->query('');
-       is($nr, 0, 'inbox is empty again');
+       PublicInbox::Watch->new($config)->scan('full');
+       $msgs = $srch->reopen->query('');
+       is(scalar(@$msgs), 0, 'inbox is empty again');
+       is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 }
 
 {
@@ -101,10 +103,10 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        $config->{'publicinboxwatch.spamcheck'} = 'spamc';
        {
                local $SIG{__WARN__} = sub {}; # quiet spam check warning
-               PublicInbox::WatchMaildir->new($config)->scan('full');
+               PublicInbox::Watch->new($config)->scan('full');
        }
-       my ($nr, $msgs) = $srch->reopen->query('');
-       is($nr, 0, 'inbox is still empty');
+       my $msgs = $srch->reopen->query('');
+       is(scalar(@$msgs), 0, 'inbox is still empty');
        is(unlink(glob("$maildir/new/*")), 1);
 }
 
@@ -115,9 +117,9 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        local $ENV{PATH} = $main_path;
        PublicInbox::Emergency->new($maildir)->prepare(\$msg);
        $config->{'publicinboxwatch.spamcheck'} = 'spamc';
-       PublicInbox::WatchMaildir->new($config)->scan('full');
-       my ($nr, $msgs) = $srch->reopen->query('');
-       is($nr, 1, 'inbox has one mail after spamc OK-ed a message');
+       PublicInbox::Watch->new($config)->scan('full');
+       my $msgs = $srch->reopen->query('');
+       is(scalar(@$msgs), 1, 'inbox has one mail after spamc OK-ed a message');
        my $mref = $ibx->msg_by_smsg($msgs->[0]);
        like($$mref, qr/something\n\z/s, 'message scrubbed on import');
        delete $config->{'publicinboxwatch.spamcheck'};
@@ -128,12 +130,12 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
        open my $fh, '<', $patch or die "failed to open $patch: $!\n";
        $msg = do { local $/; <$fh> };
        PublicInbox::Emergency->new($maildir)->prepare(\$msg);
-       PublicInbox::WatchMaildir->new($config)->scan('full');
-       my ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7');
-       is($nr, 1, 'diff postimage found');
+       PublicInbox::Watch->new($config)->scan('full');
+       my $msgs = $srch->reopen->query('dfpost:6e006fd7');
+       is(scalar(@$msgs), 1, 'diff postimage found');
        my $post = $msgs->[0];
-       ($nr, $msgs) = $srch->query('dfpre:090d998b6c2c');
-       is($nr, 1, 'diff preimage found');
+       $msgs = $srch->query('dfpre:090d998b6c2c');
+       is(scalar(@$msgs), 1, 'diff preimage found');
        is($post->{blob}, $msgs->[0]->{blob}, 'same message');
 }
 
@@ -159,8 +161,8 @@ Date: Sat, 18 Jun 2016 00:00:00 +0000
 both
 EOF
        PublicInbox::Emergency->new($maildir)->prepare(\$both);
-       PublicInbox::WatchMaildir->new($config)->scan('full');
-       my ($total, $msgs) = $srch->reopen->query('m:both@b.com');
+       PublicInbox::Watch->new($config)->scan('full');
+       my $msgs = $srch->reopen->query('m:both@b.com');
        my $v1 = $config->lookup_name('v1');
        my $msg = $v1->git->cat_file($msgs->[0]->{blob});
        is($both, $$msg, 'got original message back from v1');
@@ -184,7 +186,7 @@ EOF
        PublicInbox::Emergency->new($maildir)->prepare(\$want);
        PublicInbox::Emergency->new($maildir)->prepare(\$do_not_want);
        my $config = PublicInbox::Config->new(\$cfg);
-       PublicInbox::WatchMaildir->new($config)->scan('full');
+       PublicInbox::Watch->new($config)->scan('full');
        $ibx = $config->lookup_name('test');
        my $num = $ibx->mm->num_for('do.want@example.com');
        ok(defined $num, 'List-ID matched for watch');
@@ -193,7 +195,7 @@ EOF
 
        $cfg = $orig."$cfgpfx.watchheader=X-Mailing-List:no\@example.com\n";
        $config = PublicInbox::Config->new(\$cfg);
-       PublicInbox::WatchMaildir->new($config)->scan('full');
+       PublicInbox::Watch->new($config)->scan('full');
        $ibx = $config->lookup_name('test');
        $num = $ibx->mm->num_for('do.not.want@example.com');
        ok(defined $num, 'X-Mailing-List matched');