remove most internal Email::MIME usage

[public-inbox.git] / t / v2-add-remove-add.t

diff --git a/t/v2-add-remove-add.t b/t/v2-add-remove-add.t
index c0dec30045b821d92b4aa9933a54c4d0e01581de..cfdc8cf1ddbfc980fc0d3ebb8318c09281c9d33d 100644 (file)
--- a/t/v2-add-remove-add.t
+++ b/t/v2-add-remove-add.t
@@ -1,16 +1,12 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-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 PublicInbox::MIME;
-require './t/common.perl';
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
 require_git(2.6);
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for v2-add-remove-add.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
 my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
@@ -20,20 +16,19 @@ my $ibx = {
        -primary_address => 'test@example.com',
 };
 $ibx = PublicInbox::Inbox->new($ibx);
-my $mime = PublicInbox::MIME->create(
-       header => [
-               From => 'a@example.com',
-               To => 'test@example.com',
-               Subject => 'this is a subject',
-               Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
-               'Message-ID' => '<a-mid@b>',
-       ],
-       body => "hello world\n",
-);
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+Message-ID: <a-mid@b>
+
+hello world
+EOF
 my $im = PublicInbox::V2Writable->new($ibx, 1);
 $im->{parallel} = 0;
 ok($im->add($mime), 'message added');
-ok($im->remove($mime), 'message added');
+ok($im->remove($mime), 'message removed');
 ok($im->add($mime), 'message added again');
 $im->done;
 my $msgs = $ibx->recent({limit => 1000});