X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Ft%2Fmail%2Fcharsets-outgoing.t;h=e3f13fb6c14e5145cc03cc744f59873f75da3165;hp=ca44bbd2784562b3ca3d3aac9b68799d4c07993b;hb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd

diff --git a/rt/t/mail/charsets-outgoing.t b/rt/t/mail/charsets-outgoing.t
index ca44bbd27..e3f13fb6c 100644
--- a/rt/t/mail/charsets-outgoing.t
+++ b/rt/t/mail/charsets-outgoing.t
@@ -1,10 +1,22 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use utf8;
-
-use RT::Test tests => 30;
-
+use Encode;
+
+use RT::Test tests => 78;
+
+my %string = (
+    ru => {
+        test      => "\x{442}\x{435}\x{441}\x{442}",
+        autoreply => "\x{410}\x{432}\x{442}\x{43e}\x{43e}\x{442}\x{432}\x{435}\x{442}",
+        support   => "\x{43f}\x{43e}\x{434}\x{434}\x{435}\x{440}\x{436}\x{43a}\x{430}",
+    },
+    latin1 => {
+        test      => Encode::decode('latin1', "t\xE9st"),
+        autoreply => Encode::decode('latin1', "a\xFCtoreply"),
+        support   => Encode::decode('latin1', "supp\xF5rt"),
+    },
+);
 
 RT::Test->set_mail_catcher;
 
@@ -49,17 +61,13 @@ diag "basic test of autoreply" if $ENV{'TEST_VERBOSE'};
     ok @mails, "got some outgoing emails";
 }
 
-my $str_ru_test = "\x{442}\x{435}\x{441}\x{442}";
-my $str_ru_autoreply = "\x{410}\x{432}\x{442}\x{43e}\x{43e}\x{442}\x{432}\x{435}\x{442}";
-my $str_ru_support = "\x{43f}\x{43e}\x{434}\x{434}\x{435}\x{440}\x{436}\x{43a}\x{430}";
-
 diag "non-ascii Subject with ascii prefix set in the template"
     if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -69,15 +77,17 @@ diag "non-ascii Subject with ascii prefix set in the template"
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_test/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
+foreach my $tag_set ( 'ru', 'latin1' ) {
+
 diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
 {
-    my ($status, $msg) = $queue->SetSubjectTag( $str_ru_support );
+    my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
@@ -96,18 +106,18 @@ diag "ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_support/
+        $subject =~ /$string{$tag_set}{support}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
 diag "non-ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -117,20 +127,25 @@ diag "non-ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_support/
+        $subject =~ /$string{$tag_set}{support}/
             or do { $status = 0; diag "wrong subject: $subject" };
-        $subject =~ /$str_ru_test/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
+} # subject tag
+
 diag "return back the empty subject tag" if $ENV{'TEST_VERBOSE'};
 {
     my ($status, $msg) = $queue->SetSubjectTag( undef );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
+
+foreach my $prefix_set ( 'ru', 'latin1' ) {
+
 diag "add non-ascii subject prefix in the autoreply template" if $ENV{'TEST_VERBOSE'};
 {
     my $template = RT::Template->new( $RT::SystemUser );
@@ -138,7 +153,7 @@ diag "add non-ascii subject prefix in the autoreply template" if $ENV{'TEST_VERB
     ok $template->id, "loaded autoreply tempalte";
 
     my ($status, $msg) = $template->SetContent(
-        "Subject: $str_ru_autoreply { \$Ticket->Subject }\n"
+        "Subject: $string{$prefix_set}{autoreply} { \$Ticket->Subject }\n"
         ."\n"
         ."hi there it's an autoreply.\n"
         ."\n"
@@ -161,7 +176,7 @@ diag "ascii subject with non-ascii subject prefix in template" if $ENV{'TEST_VER
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$prefix_set}{autoreply}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
@@ -169,11 +184,11 @@ diag "ascii subject with non-ascii subject prefix in template" if $ENV{'TEST_VER
 
 diag "non-ascii subject with non-ascii subject prefix in template"
     if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -183,27 +198,28 @@ diag "non-ascii subject with non-ascii subject prefix in template"
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$prefix_set}{autoreply}/
             or do { $status = 0; diag "wrong subject: $subject" };
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
+foreach my $tag_set ( 'ru', 'latin1' ) {
 diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
 {
-    my ($status, $msg) = $queue->SetSubjectTag( $str_ru_support );
+    my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
 diag "non-ascii subject, non-ascii prefix in template and non-ascii tag"
     if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -213,24 +229,30 @@ diag "non-ascii subject, non-ascii prefix in template and non-ascii tag"
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$prefix_set}{autoreply}/
             or do { $status = 0; diag "wrong subject: $subject" };
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$tag_set}{support}/
             or do { $status = 0; diag "wrong subject: $subject" };
-        $subject =~ /$str_ru_autoreply/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
+} # subject tag
+
 diag "flush subject tag of the queue" if $ENV{'TEST_VERBOSE'};
 {
     my ($status, $msg) = $queue->SetSubjectTag( undef );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
+} # prefix set
+
 
 diag "don't change subject via template" if $ENV{'TEST_VERBOSE'};
+# clean DB has autoreply that always changes subject in template,
+# we should test situation when subject is not changed from template
 {
     my $template = RT::Template->new( $RT::SystemUser );
     $template->Load('Autoreply');
@@ -246,11 +268,11 @@ diag "don't change subject via template" if $ENV{'TEST_VERBOSE'};
 }
 
 diag "non-ascii Subject without changes in template" if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -260,25 +282,26 @@ diag "non-ascii Subject without changes in template" if $ENV{'TEST_VERBOSE'};
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_test/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
+foreach my $tag_set ( 'ru', 'latin1' ) {
 diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
 {
-    my ($status, $msg) = $queue->SetSubjectTag( $str_ru_support );
+    my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
 diag "non-ascii Subject without changes in template and with non-ascii subject tag"
     if $ENV{'TEST_VERBOSE'};
-{
+foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
         Queue => $queue->id,
-        Subject => $str_ru_test,
+        Subject => $string{$set}{test},
         Requestor => 'root@localhost',
     );
     my @mails = RT::Test->fetch_caught_mails;
@@ -288,19 +311,12 @@ diag "non-ascii Subject without changes in template and with non-ascii subject t
     foreach my $mail ( @mails ) {
         my $entity = parse_mail( $mail );
         my $subject = Encode::decode_utf8( $entity->head->get('Subject') );
-        $subject =~ /$str_ru_test/
+        $subject =~ /$string{$set}{test}/
             or do { $status = 0; diag "wrong subject: $subject" };
-        $subject =~ /$str_ru_support/
+        $subject =~ /$string{$tag_set}{support}/
             or do { $status = 0; diag "wrong subject: $subject" };
     }
     ok $status, "all mails have correct data";
 }
 
-sub parse_mail {
-    my $mail = shift;
-    require RT::EmailParser;
-    my $parser = new RT::EmailParser;
-    $parser->ParseMIMEEntityFromScalar( $mail );
-    return $parser->Entity;
-}
-
+} # subject tag set