X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid.t;h=3ce08a6a42ab74b19d6d045bb0650311fa3ebad1;hb=4452b5ebd8f202d72260325768512230c93ef6f2;hp=816f5f5b78007b9f5a6a68b324bad1a83157489a;hpb=80b887f29b2ec71d025b4c266a1c26314758994c;p=public-inbox.git
diff --git a/t/altid.t b/t/altid.t
index 816f5f5b..3ce08a6a 100644
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,15 +1,13 @@
-# Copyright (C) 2016-2020 all contributors
+#!perl -w
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
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, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
my $alt_file = "$tmpdir/another-nntp.sqlite3";
@@ -17,17 +15,16 @@ my $altid = [ "serial:gmane:file=$alt_file" ];
my $ibx;
{
- my $mm = PublicInbox::Msgmap->new_file($alt_file, 1);
+ my $mm = PublicInbox::Msgmap->new_file($alt_file, 2);
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 $git = PublicInbox::Git->new($git_dir);
- my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
- $im->init_bare;
- $im->add(PublicInbox::Eml->new(<<'EOF'));
+ $ibx = create_inbox 'testbox', tmpdir => $git_dir, sub {
+ my ($im) = @_;
+ $im->add(PublicInbox::Eml->new(<<'EOF'));
From: a@example.com
To: b@example.com
Subject: boo!
@@ -35,13 +32,9 @@ Message-ID:
hello world gmane:666
EOF
- $im->done;
-}
-{
- $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
+ };
$ibx->{altid} = $altid;
- my $rw = PublicInbox::SearchIdx->new($ibx, 1);
- $rw->index_sync;
+ PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
}
{
@@ -55,12 +48,9 @@ EOF
};
{
- my $mm = PublicInbox::Msgmap->new_file($alt_file, 1);
+ my $mm = PublicInbox::Msgmap->new_file($alt_file, 2);
my ($min, $max) = $mm->minmax;
my $num = $mm->mid_insert('b@example.com');
ok($num > $max, 'auto-increment goes beyond mid_set');
}
-
-done_testing();
-
-1;
+done_testing;