X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmsg_iter.t;h=4ee3a201c797f4570a5ca2a1e719f062b442a71c;hb=d73d783ab2cf14ba28ca63723223d8c85a68cdd5;hp=ac2066a2780d8d4fd7acb09a242633ae1863a183;hpb=5d8dbb4aca5afcc6b98a4d951f03003fb7eaf356;p=public-inbox.git

diff --git a/t/msg_iter.t b/t/msg_iter.t
index ac2066a2..4ee3a201 100644
--- a/t/msg_iter.t
+++ b/t/msg_iter.t
@@ -5,16 +5,10 @@ use warnings;
 use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::Hval qw(ascii_html);
-use PublicInbox::InboxWritable;
 use_ok('PublicInbox::MsgIter');
 
 {
-	my $mime = mime_load 't/msg_iter-order.eml', sub {
-	my $parts = [ Email::MIME->create(body => "a\n"),
-			Email::MIME->create(body => "b\n") ];
-	Email::MIME->create(parts => $parts,
-				header_str => [ From => 'root@localhost' ]);
-	}; # mime_load sub
+	my $mime = eml_load 't/msg_iter-order.eml';
 	my @parts;
 	msg_iter($mime, sub {
 		my ($part, $level, @ex) = @{$_[0]};
@@ -26,15 +20,7 @@ use_ok('PublicInbox::MsgIter');
 }
 
 {
-	my $mime = mime_load 't/msg_iter-nested.eml', sub {
-	my $parts = [ Email::MIME->create(body => 'a'),
-			Email::MIME->create(body => 'b') ];
-	$parts = [ Email::MIME->create(parts => $parts,
-				header_str => [ From => 'sub@localhost' ]),
-			Email::MIME->create(body => 'sig') ];
-	Email::MIME->create(parts => $parts,
-				header_str => [ From => 'root@localhost' ]);
-	}; # mime_load sub
+	my $mime = eml_load 't/msg_iter-nested.eml';
 	my @parts;
 	msg_iter($mime, sub {
 		my ($part, $level, @ex) = @{$_[0]};
@@ -42,14 +28,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]};
@@ -62,9 +46,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]};