X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=ff72ec6a001cabc92d725154608a7bda2956702a;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=c39a05fa23def914fe179e656fc770d66e8ac57b;hpb=cd50d183273c105a7f08b1875ba6f7a51d9f8e9a;p=public-inbox.git

diff --git a/t/nntp.t b/t/nntp.t
index c39a05fa..ff72ec6a 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,21 +1,16 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 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 PublicInbox::DS)) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for nntp.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Data::Dumper));
 use_ok 'PublicInbox::NNTP';
 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;
 	}
@@ -73,12 +68,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,13 +79,19 @@ 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');
 	}
 }
 
@@ -100,12 +99,12 @@ use_ok 'PublicInbox::Inbox';
 	require Email::MIME;
 	my $u = 'https://example.com/a/';
 	my $ng = PublicInbox::Inbox->new({ name => 'test',
-					mainrepo => 'test.git',
+					inboxdir => 'test.git',
 					address => 'a@example.com',
 					-primary_address => 'a@example.com',
 					newsgroup => 'test',
 					domain => 'example.com',
-					url => '//example.com/a'});
+					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");