X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid_v2.t;h=01ed9ed48dbc377a56bf9bf8c8265142faa62b37;hb=1e3c53a422b8d23cff961e43f77ea0a835cdef78;hp=e91a644c6dc06d8e3aef05db401ba9332ec40682;hpb=50c822076abee76c3133ffc3482488392eecedfb;p=public-inbox.git
diff --git a/t/altid_v2.t b/t/altid_v2.t
index e91a644c..01ed9ed4 100644
--- a/t/altid_v2.t
+++ b/t/altid_v2.t
@@ -1,25 +1,21 @@
-# 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/;
-require './t/common.perl';
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
require_git(2.6);
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
- eval "require $mod";
- plan skip_all => "$mod missing for altid_v2.t" if $@;
-}
-
+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');
@@ -27,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',
@@ -35,20 +31,19 @@ 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' => '',
- ],
- body => "hello world gmane:666\n",
- ));
+$v2w->add(PublicInbox::Eml->new(<<'EOF'));
+From: a@example.com
+To: b@example.com
+Subject: boo!
+Message-ID:
+
+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 = [ map { $_->{mid} } @$msgs ];
+is_deeply($msgs, ['a@example.com'], 'got one match');
$msgs = $ibx->search->query("gmane:666");
is_deeply([], $msgs, 'body did NOT match');