X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid.t;h=816f5f5b78007b9f5a6a68b324bad1a83157489a;hb=352956bcf1933bdaeba631deb4ade7dc7fd754b1;hp=10bf8c659b25d1a85a6acc3f8f5664feb4b357c3;hpb=20ddcb02821ff3bf8afd2c2279e0889492c93fd9;p=public-inbox.git
diff --git a/t/altid.t b/t/altid.t
index 10bf8c65..816f5f5b 100644
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,19 +1,16 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
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.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+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 = tempdir('pi-altid-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
my $alt_file = "$tmpdir/another-nntp.sqlite3";
my $altid = [ "serial:gmane:file=$alt_file" ];
@@ -27,35 +24,34 @@ 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->init_bare;
+ $im->add(PublicInbox::Eml->new(<<'EOF'));
+From: a@example.com
+To: b@example.com
+Subject: boo!
+Message-ID:
+
+hello world gmane:666
+EOF
$im->done;
}
{
- $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir});
+ $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
$ibx->{altid} = $altid;
my $rw = PublicInbox::SearchIdx->new($ibx, 1);
$rw->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');
};
{