search: replace ->query with ->mset

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

diff --git a/t/altid.t b/t/altid.t
index fc5bcbc2349a09852a0003f962ebaf00a9e4e6d2..816f5f5b78007b9f5a6a68b324bad1a83157489a 100644 (file)
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,14 +1,11 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 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 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';
@@ -27,19 +24,17 @@ 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' => '<a@example.com>',
-               ],
-               body => "hello world gmane:666\n",
-       ));
+       $im->init_bare;
+       $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
        $im->done;
 }
 {
@@ -50,12 +45,13 @@ my $ibx;
 }
 
 {
-       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');
 };
 
 {