run update-copyrights from gnulib for 2019

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

diff --git a/t/nntp.t b/t/nntp.t
index 7500d6b9a57662ce7708a644984e7d0616cdd035..f3a9c7d81e802a6b69c0cc32b80a1f6bf6243df4 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,11 +1,10 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2019 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 Data::Dumper;
 
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
+foreach my $mod (qw(DBD::SQLite Data::Dumper)) {
        eval "require $mod";
        plan skip_all => "$mod missing for nntp.t" if $@;
 }
@@ -15,7 +14,7 @@ use_ok 'PublicInbox::Inbox';
 
 {
        sub quote_str {
-               my (undef, $s) = split(/ = /, Dumper($_[0]), 2);
+               my (undef, $s) = split(/ = /, Data::Dumper::Dumper($_[0]), 2);
                $s =~ s/;\n//;
                $s;
        }
@@ -109,7 +108,10 @@ use_ok 'PublicInbox::Inbox';
        is($ng->base_url, $u, 'URL expanded');
        my $mid = 'a@b';
        my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
-       PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 1, $mid);
+       my $hdr = $mime->header_obj;
+       my $mock_self = { nntpd => { grouplist => [], 
+                                    servername => 'example.com' } };
+       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
@@ -124,7 +126,7 @@ use_ok 'PublicInbox::Inbox';
                'Xref: set');
 
        $ng->{-base_url} = 'http://mirror.example.com/m/';
-       PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 2, $mid);
+       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],