search: replace ->query with ->mset

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

diff --git a/t/altid_v2.t b/t/altid_v2.t
index 87f1452bf9ac4aec6a5a1038f089315639bbca20..f04b547bd0aeed196cf026501e923e4e749010c1 100644 (file)
--- a/t/altid_v2.t
+++ b/t/altid_v2.t
@@ -1,23 +1,21 @@
-# Copyright (C) 2016-2018 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 File::Temp qw/tempdir/;
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for altid_v2.t" if $@;
-}
-
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
 use_ok 'PublicInbox::Inbox';
-my $tmpdir = tempdir('pi-altidv2-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $mainrepo = "$tmpdir/inbox";
+my ($tmpdir, $for_destroy) = tmpdir();
+my $inboxdir = "$tmpdir/inbox";
 my $full = "$tmpdir/inbox/another-nntp.sqlite3";
 my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
 
 {
-       ok(mkdir($mainrepo), 'created repo for msgmap');
+       ok(mkdir($inboxdir), 'created repo for msgmap');
        my $mm = PublicInbox::Msgmap->new_file($full, 1);
        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');
@@ -25,7 +23,7 @@ my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
 }
 
 my $ibx = {
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => 'test-v2writable',
        version => 2,
        -primary_address => 'test@example.com',
@@ -33,22 +31,22 @@ my $ibx = {
 };
 $ibx = PublicInbox::Inbox->new($ibx);
 my $v2w = PublicInbox::V2Writable->new($ibx, 1);
-$v2w->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",
-       ));
+$v2w->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
 $v2w->done;
 
-my $msgs = $ibx->search->reopen->query("gmane:1234");
-is_deeply([map { $_->mid } @$msgs], ['a@example.com'], 'got one match');
-$msgs = $ibx->search->query("gmane:666");
-is_deeply([], $msgs, 'body did NOT match');
+my $mset = $ibx->search->reopen->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');
+$mset = $ibx->search->mset('gmane:666');
+is($mset->size, 0, 'body did NOT match');
 
 done_testing();