X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fnntp.t;h=655af39825b2f514d621600399964db7ba4b450e;hp=03c7f08361a25fd7107db1be733d565cf7469e4c;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f

diff --git a/t/nntp.t b/t/nntp.t
index 03c7f083..655af398 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,21 +1,18 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# 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::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;
 	}
@@ -73,12 +70,10 @@ use_ok 'PublicInbox::Inbox';
 		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;
@@ -86,50 +81,55 @@ use_ok 'PublicInbox::Inbox';
 	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::Inbox->new({ name => 'test',
-					mainrepo => 'test.git',
+	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($ng->base_url, $u, 'URL expanded');
+					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\@b/>" ],
-		'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->{-base_url} = 'http://mirror.example.com/m/';
-	PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $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') ],
-		[ "<${u}a\@b/>", '<http://mirror.example.com/m/a@b/>' ],
-		'Archived-At: appended');
 	is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
 		'Old Xref: clobbered');
 }