X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Fmsg_iter.t;h=ae3594da08324f67b7747ce9b0d8a6432cad02ac;hb=refs%2Fheads%2Fmaster;hp=6adbf165b0713268cfb87bf73c9b7b9d7c45d1a9;hpb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;p=public-inbox.git
diff --git a/t/msg_iter.t b/t/msg_iter.t
index 6adbf165..ae3594da 100644
--- a/t/msg_iter.t
+++ b/t/msg_iter.t
@@ -1,15 +1,12 @@
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
-use strict;
-use warnings;
-use Test::More;
-use PublicInbox::TestCommon;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use PublicInbox::Hval qw(ascii_html);
-use PublicInbox::InboxWritable;
+use MIME::QuotedPrint 3.05 qw(encode_qp);
use_ok('PublicInbox::MsgIter');
{
- my $mime = mime_load 't/msg_iter-order.eml';
+ my $mime = eml_load 't/msg_iter-order.eml';
my @parts;
msg_iter($mime, sub {
my ($part, $level, @ex) = @{$_[0]};
@@ -21,7 +18,7 @@ use_ok('PublicInbox::MsgIter');
}
{
- my $mime = mime_load 't/msg_iter-nested.eml';
+ my $mime = eml_load 't/msg_iter-nested.eml';
my @parts;
msg_iter($mime, sub {
my ($part, $level, @ex) = @{$_[0]};
@@ -29,14 +26,12 @@ use_ok('PublicInbox::MsgIter');
$s =~ s/\s+//s;
push @parts, [ $s, $level, @ex ];
});
- is_deeply(\@parts, [ [qw(a 2 1 1)], [qw(b 2 1 2)], [qw(sig 1 2)] ],
+ is_deeply(\@parts, [ [qw(a 2 1.1)], [qw(b 2 1.2)], [qw(sig 1 2)] ],
'nested part shows up properly');
}
{
- my $f = 't/iso-2202-jp.eml';
- my $mime = PublicInbox::InboxWritable::mime_from_path($f) or
- die "open $f: $!";
+ my $mime = eml_load 't/iso-2202-jp.eml';
my $raw = '';
msg_iter($mime, sub {
my ($part, $level, @ex) = @{$_[0]};
@@ -49,9 +44,7 @@ use_ok('PublicInbox::MsgIter');
}
{
- my $f = 't/x-unknown-alpine.eml';
- my $mime = PublicInbox::InboxWritable::mime_from_path($f) or
- die "open $f: $!";
+ my $mime = eml_load 't/x-unknown-alpine.eml';
my $raw = '';
msg_iter($mime, sub {
my ($part, $level, @ex) = @{$_[0]};
@@ -93,5 +86,62 @@ use_ok('PublicInbox::MsgIter');
is($check[1], $nq, 'long quoted section matches');
}
+{
+ open my $fh, '<', 't/utf8.eml' or BAIL_OUT $!;
+ my $expect = do { local $/; <$fh> };
+ my $qp_patch = encode_qp($expect, "\r\n");
+ my $common = <new(<each_part(sub {
+ my ($part, $level, @ex) = @{$_[0]};
+ my ($s, $err) = msg_part_text($part, $part->content_type);
+ push @parts, $s;
+ });
+ $expect =~ s/\n/\r\n/sg;
+ utf8::decode($expect); # aka "bytes2str"
+ is_deeply(\@parts, [ "blah\r\n", $expect ],
+ 'fallback to application/octet-stream as UTF-8 text');
+
+ my $qp_binary = encode_qp("Binary\0crap", "\r\n");
+ $eml = PublicInbox::Eml->new(<each_part(sub {
+ my ($part, $level, @ex) = @{$_[0]};
+ my ($s, $err) = msg_part_text($part, $part->content_type);
+ push @parts, $s;
+ push @err, $err;
+ });
+ is_deeply(\@parts, [ "blah\r\n", undef ],
+ 'non-text ignored in octet-stream');
+ ok($err[1], 'got error for second element');
+}
+
done_testing();
-1;