X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid_v2.t;h=281a09d51dd0cfe4af5ed0b5590ec97b8a74b68c;hb=refs%2Fheads%2Fmaster;hp=87f1452bf9ac4aec6a5a1038f089315639bbca20;hpb=56489ee40e44255f2f9a00cd608bc366d2586306;p=public-inbox.git

diff --git a/t/altid_v2.t b/t/altid_v2.t
index 87f1452b..c62252c1 100644
--- a/t/altid_v2.t
+++ b/t/altid_v2.t
@@ -1,55 +1,39 @@
-# Copyright (C) 2016-2018 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 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 v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
+require PublicInbox::Msgmap;
+my $another = 'another-nntp.sqlite3';
+my $altid = [ "serial:gmane:file=$another" ];
+my $ibx = create_inbox 'v2', version => 2, indexlevel => 'medium',
+			altid => $altid, sub {
+	my ($im, $ibx) = @_;
+	my $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 2);
+	is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set') or xbail 'once';
+	is($mm->mid_set(1234, 'a@example.com')+0, 0, 'mid_set not idempotent');
+	is($mm->mid_set(1, 'a@example.com')+0, 0, 'mid_set fails with dup MID');
+	$im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;
+From: a@example.com
+To: b@example.com
+Subject: boo!
+Message-ID: <a@example.com>
 
-use_ok 'PublicInbox::V2Writable';
-use_ok 'PublicInbox::Inbox';
-my $tmpdir = tempdir('pi-altidv2-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $mainrepo = "$tmpdir/inbox";
-my $full = "$tmpdir/inbox/another-nntp.sqlite3";
-my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
-
-{
-	ok(mkdir($mainrepo), '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');
-	ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID');
-}
-
-my $ibx = {
-	mainrepo => $mainrepo,
-	name => 'test-v2writable',
-	version => 2,
-	-primary_address => 'test@example.com',
-	altid => $altid,
+hello world gmane:666
+EOF
 };
-$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->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 $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 2);
+is($mm->mid_set(1234, 'a@example.com') + 0, 0, 'mid_set not idempotent');
+is($mm->mid_set(1, 'a@example.com') + 0, 0, 'mid_set fails with dup MID');
+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');
+$mset = $ibx->search->mset('gmane:666');
+is($mset->size, 0, 'body did NOT match');
 
 done_testing();
-
-1;