1 files changed, 26 insertions, 36 deletions

diff --git a/t/altid.t b/t/altid.t
index 6c34cdd6..2692029e 100644
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,14 +1,13 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
 use PublicInbox::TestCommon;
-require_mods(qw(DBD::SQLite Search::Xapian));
+use PublicInbox::Eml;
+require_mods(qw(DBD::SQLite 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";
@@ -16,51 +15,42 @@ my $altid = [ "serial:gmane:file=$alt_file" ];
 my $ibx;
 
 {
-        my $mm = PublicInbox::Msgmap->new_file($alt_file, 1);
+        my $mm = PublicInbox::Msgmap->new_file($alt_file, 2);
         is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set once OK');
         ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent');
         ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID');
 }
 
 {
-        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' => '<a@example.com>',
-                ],
-                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: <a@example.com>
+
+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');
 };
 
 {
-        my $mm = PublicInbox::Msgmap->new_file($alt_file, 1);
+        my $mm = PublicInbox::Msgmap->new_file($alt_file, 2);
         my ($min, $max) = $mm->minmax;
         my $num = $mm->mid_insert('b@example.com');
         ok($num > $max, 'auto-increment goes beyond mid_set');
 }
-
-done_testing();
-
-1;
+done_testing;