X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmsgtime.t;h=00d579997ac2694170d1c8416cb0903e079651e1;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=f969fa25f6aa5f1bd22ed739544c40494ab93d40;hpb=754647b28663aae0e07b7a5307bcf8ecf91b1795;p=public-inbox.git

diff --git a/t/msgtime.t b/t/msgtime.t
index f969fa25..00d57999 100644
--- a/t/msgtime.t
+++ b/t/msgtime.t
@@ -1,26 +1,28 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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 PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::MsgTime;
+use PublicInbox::TestCommon;
 
+our $received_date = 'Mon, 22 Jan 2007 13:16:24 -0500';
 sub datestamp ($) {
 	my ($date) = @_;
 	local $SIG{__WARN__} = sub {};  # Suppress warnings
-	my $mime = PublicInbox::MIME->create(
-		header => [
-			From => 'a@example.com',
-			To => 'b@example.com',
-			'Content-Type' => 'text/plain',
-			Subject => 'this is a subject',
-			'Message-ID' => '<a@example.com>',
-			Date => $date,
-			'Received' => '(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932173AbXAVSQY (ORCPT <rfc822;w@1wt.eu>);\n\tMon, 22 Jan 2007 13:16:24 -0500',
-		],
-		body => "hello world\n",
-	    );
+	my $mime = PublicInbox::Eml->new(<<"EOF");
+From: a\@example.com
+To: b\@example.com
+Subject: this is a subject
+Message-ID: <a\@example.com>
+Date: $date
+Received: (majordomo\@vger.kernel.org) by vger.kernel.org via listexpand
+	id S932173AbXAVSQY (ORCPT <rfc822;w\@1wt.eu>);
+	$received_date
+
+hello world
+EOF
 	my @ts = PublicInbox::MsgTime::msg_datestamp($mime->header_obj);
 	return \@ts;
 }
@@ -28,18 +30,18 @@ sub datestamp ($) {
 sub timestamp ($) {
 	my ($received) = @_;
 	local $SIG{__WARN__} = sub {};  # Suppress warnings
-	my $mime = PublicInbox::MIME->create(
-		header => [
-			From => 'a@example.com',
-			To => 'b@example.com',
-			'Content-Type' => 'text/plain',
-			Subject => 'this is a subject',
-			'Message-ID' => '<a@example.com>',
-			Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
-			'Received' => '(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932173AbXAVSQY (ORCPT <rfc822;w@1wt.eu>);\n\t' . $received,
-		],
-		body => "hello world\n",
-	    );
+	my $mime = PublicInbox::Eml->new(<<"EOF");
+From: a\@example.com
+To: b\@example.com
+Subject: this is a subject
+Message-ID: <a\@example.com>
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+Received: (majordomo\@vger.kernel.org) by vger.kernel.org via listexpand
+	id S932173AbXAVSQY (ORCPT <rfc822;w\@1wt.eu>);
+	$received
+
+hello world
+EOF
 	my @ts = PublicInbox::MsgTime::msg_timestamp($mime->header_obj);
 	return \@ts;
 }
@@ -92,4 +94,31 @@ is_datestamp('Tue, 3 Jun 2003 8:58:23 --500', [1054648703, '-0500']);
 is_datestamp('Thu, 18 May 100 10:40:43 +0200 (MET DST)', [958639243, '+0200']);
 is_datestamp('Thu, 18 May 2000 10:40:43 +0200', [958639243, '+0200']);
 is_datestamp('Tue, 27 Feb 2007 16:23:25 -0060', [1172597005, '-0100']);
+is_datestamp('Wed, 20 Dec 2006 05:32:58 -0420', [1166608378, '-0420']);
+is_datestamp('Wed, 20 Dec 2006 05:32:58 +0420', [1166577178, '+0420']);
+is_datestamp('Thu, 14 Dec 2006 00:20:24 +0480', [1166036424, '+0520']);
+is_datestamp('Thu, 14 Dec 2006 00:20:24 -0480', [1166074824, '-0520']);
+is_datestamp('Mon, 14 Apr 2014 07:59:01 -0007', [1397462761, '-0007']);
+
+SKIP: {
+	require_mods('Date::Parse', 1);
+	my $now = time;
+	if (join("\0", gmtime($now)) ne join("\0", localtime($now))) {
+		skip('needs TZ=UTC to test zone-less parsing', 1);
+	}
+	is_datestamp('Sat, 27 Sep 1997 10:02:32', [875354552, '+0000']);
+}
+
+# obsolete formats described in RFC2822
+for (qw(UT GMT Z)) {
+	is_datestamp('Fri, 02 Oct 1993 00:00:00 '.$_, [ 749520000, '+0000']);
+}
+is_datestamp('Fri, 02 Oct 1993 00:00:00 EDT', [ 749534400, '-0400']);
+
+# fallback to Received: header if Date: is out-of-range:
+is_datestamp('Fri, 1 Jan 1904 10:12:31 +0100',
+	PublicInbox::MsgTime::str2date_zone($received_date));
+is_datestamp('Fri, 9 Mar 71685 18:45:56 +0000', # Y10K is not my problem :P
+	PublicInbox::MsgTime::str2date_zone($received_date));
+
 done_testing();