X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid.t;h=87635b19a37513233517679a1bcf292694d905f2;hb=b9e7ecbbd53b97cfb9437a27e548d1df15d871b4;hp=c7a3601a6b196f03f5111c11f89bb0b8e57f1528;hpb=e6b7a7f5f70fb89a54ff158bc6c8b564149947e5;p=public-inbox.git
diff --git a/t/altid.t b/t/altid.t
index c7a3601a..87635b19 100644
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,15 +1,13 @@
-# Copyright (C) 2016-2020 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;
-use PublicInbox::MIME;
+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";
@@ -24,10 +22,9 @@ my $ibx;
}
{
- my $git = PublicInbox::Git->new($git_dir);
- my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
- $im->init_bare;
- $im->add(PublicInbox::MIME->new(<<'EOF'));
+ $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!
@@ -35,22 +32,19 @@ Message-ID:
hello world gmane:666
EOF
- $im->done;
-}
-{
- $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
+ };
$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');
};
{
@@ -59,7 +53,4 @@ EOF
my $num = $mm->mid_insert('b@example.com');
ok($num > $max, 'auto-increment goes beyond mid_set');
}
-
-done_testing();
-
-1;
+done_testing;