-# 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-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 Data::Dumper;
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
- eval "require $mod";
- plan skip_all => "$mod missing for nntp.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
+require_mods(qw(DBD::SQLite Data::Dumper));
use_ok 'PublicInbox::NNTP';
-use_ok 'PublicInbox::NewsGroup';
+use_ok 'PublicInbox::Inbox';
+use PublicInbox::Config;
{
sub quote_str {
- my (undef, $s) = split(/ = /, Dumper($_[0]), 2);
+ my (undef, $s) = split(/ = /, Data::Dumper::Dumper($_[0]), 2);
$s =~ s/;\n//;
$s;
}
my ($date, $time, $gmt) = @_;
my $m = join(' ', @_);
my $ts = PublicInbox::NNTP::parse_time(@_);
- my @t = gmtime($ts);
- my ($d, $t);
- if (length($date) == 8) {
- ($d, $t) = split(' ', strftime('%Y%m%d %H%M%S', @t));
- } else {
- ($d, $t) = split(' ', strftime('%g%m%d %H%M%S', @t));
+ my @t = $gmt ? gmtime($ts) : localtime($ts);
+ my ($d, $t) = split(' ', strftime('%Y%m%d %H%M%S', @t));
+ if (length($date) != 8) { # Net::NNTP uses YYMMDD :<
+ $d =~ s/^[0-9]{2}//;
}
is_deeply([$d, $t], [$date, $time], "roundtripped: $m");
$ts;
my $x1 = time_roundtrip(qw(20141109 060606 GMT));
my $x2 = time_roundtrip(qw(141109 060606 GMT));
my $x3 = time_roundtrip(qw(930724 060606 GMT));
-
+ my $x5 = time_roundtrip(qw(710101 000000));
+ my $x6 = time_roundtrip(qw(720101 000000));
SKIP: {
- skip('YYMMDD test needs updating', 2) if (time > 0x7fffffff);
+ skip('YYMMDD test needs updating', 6) if (time > 0x7fffffff);
# our world probably ends in 2038, but if not we'll try to
# remember to update the test then
is($x1, $x2, 'YYYYMMDD and YYMMDD parse identically');
is(strftime('%Y', gmtime($x3)), '1993', '930724 was in 1993');
+
+ my $epoch = time_roundtrip(qw(700101 000000 GMT));
+ is($epoch, 0, 'epoch parsed correctly');
+ ok($x6 > $x5, '1972 > 1971');
+ ok($x5 > $epoch, '1971 > Unix epoch');
}
}
{ # test setting NNTP headers in HEAD and ARTICLE requests
- require Email::MIME;
my $u = 'https://example.com/a/';
- my $ng = PublicInbox::NewsGroup->new('test', 'test.git',
- 'a@example.com', '//example.com/a');
- is($ng->{url}, $u, 'URL expanded');
+ my $ibx = PublicInbox::Inbox->new({ name => 'test',
+ inboxdir => 'test.git',
+ address => 'a@example.com',
+ -primary_address => 'a@example.com',
+ newsgroup => 'test',
+ domain => 'example.com',
+ url => [ '//example.com/a' ]});
+ is($ibx->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 $mime = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n");
+ my $hdr = $mime->header_obj;
+ my $mock_self = {
+ nntpd => {
+ servername => 'example.com',
+ pi_cfg => bless {}, 'PublicInbox::Config',
+ },
+ ibx => $ibx,
+ };
+ my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ibx };
+ 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%40b/>" ],
- 'Archived-At: set');
- is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
- 'List-Archive: set');
- is_deeply([ $mime->header('List-Post') ], [ '<mailto:a@example.com>' ],
- 'List-Post: set');
is_deeply([ $mime->header('Newsgroups') ], [ 'test' ],
'Newsgroups: set');
is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
'Xref: set');
- $ng->{url} = 'http://mirror.example.com/m/';
- PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 2, $mid);
+ $ibx->{-base_url} = 'http://mirror.example.com/m/';
+ $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') ],
- [ "<${u}a%40b/>", '<http://mirror.example.com/m/a%40b/>' ],
- 'Archived-At: appended');
is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
'Old Xref: clobbered');
}