X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F13_utf8_mail.t;h=b98154e9f015cc16e19b6f900ddaf603799c635f;hb=1fbaca61f2f551b5b2645ce2233a1d964bc93b30;hp=588598432277c93666fef90aa9cda54043e0263b;hpb=8c49b61db50d7fcb86e294d64eb127dd405c5a9e;p=debbugs.git

diff --git a/t/13_utf8_mail.t b/t/13_utf8_mail.t
index 5885984..b98154e 100644
--- a/t/13_utf8_mail.t
+++ b/t/13_utf8_mail.t
@@ -1,11 +1,13 @@
 # -*- mode: cperl;-*-
 # $Id: 05_mail.t,v 1.1 2005/08/17 21:46:17 don Exp $
 
-use Test::More tests => 12;
+use Test::More tests => 13;
 
 use warnings;
 use strict;
 
+use utf8;
+
 # Here, we're going to shoot messages through a set of things that can
 # happen.
 
@@ -22,39 +24,28 @@ use File::Basename qw(dirname basename);
 use lib qw(t/lib);
 use DebbugsTest qw(:all);
 use Data::Dumper;
-use Encode qw(decode encode);
+use Encode qw(decode encode decode_utf8 encode_utf8);
 
 # HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here.
 $SIG{CHLD} = sub {};
-my %config;
-eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
-};
-if ($@) {
-     BAIL_OUT($@);
-}
+my %config = create_debbugs_configuration();
+
 
 my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-	  diag("spool_dir:   $spool_dir\n");
-	  diag("config_dir:   $config_dir\n");
-	  diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.
 
 send_message(to=>'submit@bugs.something',
 	     headers => [To   => 'submit@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'föoff@bugs.something',
 			 Subject => 'Submiting a bug',
 			],
-	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=><<EOF2}]) or fail('Unable to send message');
+	     body => <<EOF,attachments => [{Type=>"text/plain",Charset=>"utf-8",Data=>encode_utf8(<<EOF2)}]) or fail('Unable to send message');
 Package: foo
 Severity: normal
 
@@ -89,7 +80,7 @@ $SD_SIZE =
 
 send_message(to => '1@bugs.something',
 	     headers => [To   => '1@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'föoff@bugs.something',
 			 Subject => 'Sending a message to a bug',
 			],
 	     body => <<EOF) or fail('sending message to 1@bugs.someting failed');
@@ -107,7 +98,7 @@ $SD_SIZE =
 # just check to see that control doesn't explode
 send_message(to => 'control@bugs.something',
 	     headers => [To   => 'control@bugs.something',
-			 From => 'foo@bugs.something',
+			 From => 'föoff@bugs.something',
 			 Subject => 'Munging a bug',
 			],
 	     body => <<EOF) or fail 'message to control@bugs.something failed';
@@ -129,6 +120,7 @@ eval "use Debbugs::Status qw(read_bug writebug);";
 my $status = read_bug(bug=>1);
 ok($status->{subject} eq 'ütff8 title encoding test','bug 1 retitled');
 ok($status->{severity} eq 'wishlist','bug 1 wishlisted');
-ok(system('sh','-c','[ $(grep "encoding test" '.$spool_dir.'/db-h/01/1.log|grep -v "ütff8"|wc -l) -eq 0 ]') == 0,
+ok(system('sh','-c','[ $(egrep "retitle.*encoding test" '.$spool_dir.'/db-h/01/1.log|grep -v "=C3=BCt=EF=AC=808"|wc -l) -eq 0 ]') == 0,
    'Control messages escaped properly');
-
+ok(system('sh','-c',encode_utf8('grep -q "föoff@bugs.something" '.$spool_dir.'/index.db'))==0,
+   'index.db not double escaped');