X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid.t;h=87635b19a37513233517679a1bcf292694d905f2;hb=ed0167d2a851b4f5128f57ad60309a0b76e62cfa;hp=fc5bcbc2349a09852a0003f962ebaf00a9e4e6d2;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git
diff --git a/t/altid.t b/t/altid.t
index fc5bcbc2..87635b19 100644
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,18 +1,13 @@
-# Copyright (C) 2016-2019 all contributors
+#!perl -w
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
use PublicInbox::TestCommon;
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
- eval "require $mod";
- plan skip_all => "$mod missing for altid.t" if $@;
-}
-
+use PublicInbox::Eml;
+require_mods(qw(DBD::SQLite Search::Xapian));
use_ok 'PublicInbox::Msgmap';
use_ok 'PublicInbox::SearchIdx';
-use_ok 'PublicInbox::Import';
-use_ok 'PublicInbox::Inbox';
my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
my $alt_file = "$tmpdir/another-nntp.sqlite3";
@@ -27,35 +22,29 @@ my $ibx;
}
{
- is(system(qw(git init -q --bare), $git_dir), 0, 'git init ok');
- my $git = PublicInbox::Git->new($git_dir);
- my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
- $im->add(Email::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'b@example.com',
- 'Content-Type' => 'text/plain',
- Subject => 'boo!',
- 'Message-ID' => '',
- ],
- body => "hello world gmane:666\n",
- ));
- $im->done;
-}
-{
- $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
+ $ibx = create_inbox 'testbox', tmpdir => $git_dir, sub {
+ my ($im) = @_;
+ $im->add(PublicInbox::Eml->new(<<'EOF'));
+From: a@example.com
+To: b@example.com
+Subject: boo!
+Message-ID:
+
+hello world gmane:666
+EOF
+ };
$ibx->{altid} = $altid;
- my $rw = PublicInbox::SearchIdx->new($ibx, 1);
- $rw->index_sync;
+ PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
}
{
- my $ro = PublicInbox::Search->new($ibx);
- my $msgs = $ro->query("gmane:1234");
- is_deeply([map { $_->mid } @$msgs], ['a@example.com'], 'got one match');
+ my $mset = $ibx->search->mset("gmane:1234");
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
+ $msgs = [ map { $_->{mid} } @$msgs ];
+ is_deeply($msgs, ['a@example.com'], 'got one match');
- $msgs = $ro->query("gmane:666");
- is_deeply([], $msgs, 'body did NOT match');
+ $mset = $ibx->search->mset('gmane:666');
+ is($mset->size, 0, 'body did NOT match');
};
{
@@ -64,7 +53,4 @@ my $ibx;
my $num = $mm->mid_insert('b@example.com');
ok($num > $max, 'auto-increment goes beyond mid_set');
}
-
-done_testing();
-
-1;
+done_testing;