X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F01_mime.t;h=dcd3b7608f869c41d6f1eed8d666d8ba55832393;hb=9ba439f0dec2d3980de21b01d5f335a9d213158f;hp=5a1aa60d4c00e68f5278935e48b8b212633980bc;hpb=d61a76fc5e1b52929a02705c07ac03936fd14244;p=debbugs.git

diff --git a/t/01_mime.t b/t/01_mime.t
index 5a1aa60..dcd3b76 100644
--- a/t/01_mime.t
+++ b/t/01_mime.t
@@ -6,37 +6,36 @@ use Test::More tests => 6;
 use warnings;
 use strict;
 
-use utf8;
 use Encode;
 
 use_ok('Debbugs::MIME');
 
 # encode_headers testing
 
-my $test_str = <<'END';
+my $test_str = decode_utf8(<<'END');
 Döñ Ärḿßtrøñĝ <don@donarmstrong.com>
 END
 
-my $test_str2 = <<'END';
+my $test_str2 = decode_utf8(<<'END');
  Döñ Ärḿßtrøñĝ <don@donarmstrong.com>
 END
 
-my $test_str3 =<<'END';
+my $test_str3 =decode_utf8(<<'END');
 foo@bar.com (J fö"ø)
 END
 
 # 1: test decode
 ok(Debbugs::MIME::decode_rfc1522(q(=?iso-8859-1?Q?D=F6n_Armstr=F3ng?= <don@donarmstrong.com>)) eq
-  encode_utf8(q(Dön Armstróng <don@donarmstrong.com>)),"decode_rfc1522 decodes and converts to UTF8 properly");
+  decode_utf8(q(Dön Armstróng <don@donarmstrong.com>)),"decode_rfc1522 decodes and converts to UTF8 properly");
 
 
 # 2: test encode
-ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522($test_str)) eq encode_utf8($test_str),
+ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522(encode_utf8($test_str))) eq $test_str,
   "encode_rfc1522 encodes strings that decode_rfc1522 can decode");
-ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522($test_str2)) eq encode_utf8($test_str2),
+ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522(encode_utf8($test_str2))) eq $test_str2,
   "encode_rfc1522 encodes strings that decode_rfc1522 can decode");
-ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522($test_str3)) eq encode_utf8($test_str3),
-  "encode_rfc1522 properly handles parentesis and \"");
+ok(Debbugs::MIME::decode_rfc1522(Debbugs::MIME::encode_rfc1522(encode_utf8($test_str3))) eq $test_str3,
+  "encode_rfc1522 properly handles parenthesis and \"");
 
 
 # Make sure that create_mime_message has encoded headers and doesn't enclude any 8-bit characters