nntp: fix cross-newsgroup Message-ID lookups

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

diff --git a/t/nntp.t b/t/nntp.t
index ff72ec6a001cabc92d725154608a7bda2956702a..9a482acba88eb91d95c45ad1475018b0144bbb1a 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::TestCommon;
+use PublicInbox::Eml;
 require_mods(qw(DBD::SQLite Data::Dumper));
 use_ok 'PublicInbox::NNTP';
 use_ok 'PublicInbox::Inbox';
@@ -96,7 +97,6 @@ use_ok 'PublicInbox::Inbox';
 }
 
 { # test setting NNTP headers in HEAD and ARTICLE requests
-       require Email::MIME;
        my $u = 'https://example.com/a/';
        my $ng = PublicInbox::Inbox->new({ name => 'test',
                                        inboxdir => 'test.git',
@@ -107,11 +107,14 @@ use_ok 'PublicInbox::Inbox';
                                        url => [ '//example.com/a' ]});
        is($ng->base_url, $u, 'URL expanded');
        my $mid = 'a@b';
-       my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
+       my $mime = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n");
        my $hdr = $mime->header_obj;
-       my $mock_self = { nntpd => { grouplist => [], 
-                                    servername => 'example.com' } };
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
+       my $mock_self = {
+               nntpd => { grouplist => [], servername => 'example.com' },
+               ng => $ng,
+       };
+       my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ng };
+       PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
@@ -126,7 +129,8 @@ use_ok 'PublicInbox::Inbox';
                'Xref: set');
 
        $ng->{-base_url} = 'http://mirror.example.com/m/';
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
+       $smsg->{num} = 2;
+       PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],