From e6b7a7f5f70fb89a54ff158bc6c8b564149947e5 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 21 Apr 2020 21:16:13 +0000 Subject: t/*.t: reduce dependency on Email::MIME APIs Instead, favor PublicInbox::MIME->new for non-attachment emails. We may support alternatives to Email::MIME down the line. We'll still keep Email::MIME->create to deal with attachments, for now, but there's also a fair amount of test duplication we should eliminate, later. --- t/msgtime.t | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 't/msgtime.t') diff --git a/t/msgtime.t b/t/msgtime.t index 058f3886..d9f8e641 100644 --- a/t/msgtime.t +++ b/t/msgtime.t @@ -6,28 +6,23 @@ use Test::More; use PublicInbox::MIME; use PublicInbox::MsgTime; use PublicInbox::TestCommon; -require_mods(qw(Email::MIME)); our $received_date = 'Mon, 22 Jan 2007 13:16:24 -0500'; sub datestamp ($) { my ($date) = @_; local $SIG{__WARN__} = sub {}; # Suppress warnings - my $mime = Email::MIME->create( - header => [ - From => 'a@example.com', - To => 'b@example.com', - 'Content-Type' => 'text/plain', - Subject => 'this is a subject', - 'Message-ID' => '', - Date => $date, - 'Received' => <); -\t$received_date + my $mime = PublicInbox::MIME->new(<<"EOF"); +From: a\@example.com +To: b\@example.com +Subject: this is a subject +Message-ID: +Date: $date +Received: (majordomo\@vger.kernel.org) by vger.kernel.org via listexpand + id S932173AbXAVSQY (ORCPT ); + $received_date + +hello world EOF - ], - body => "hello world\n", - ); my @ts = PublicInbox::MsgTime::msg_datestamp($mime->header_obj); return \@ts; } @@ -35,18 +30,18 @@ EOF sub timestamp ($) { my ($received) = @_; local $SIG{__WARN__} = sub {}; # Suppress warnings - my $mime = Email::MIME->create( - header => [ - From => 'a@example.com', - To => 'b@example.com', - 'Content-Type' => 'text/plain', - Subject => 'this is a subject', - 'Message-ID' => '', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - 'Received' => '(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932173AbXAVSQY (ORCPT );\n\t' . $received, - ], - body => "hello world\n", - ); + my $mime = PublicInbox::MIME->new(<<"EOF"); +From: a\@example.com +To: b\@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 +Received: (majordomo\@vger.kernel.org) by vger.kernel.org via listexpand + id S932173AbXAVSQY (ORCPT ); + $received + +hello world +EOF my @ts = PublicInbox::MsgTime::msg_timestamp($mime->header_obj); return \@ts; } -- cgit v1.2.3-24-ge0c7