Fix handling setlocale in unit tests

Need to put in setUp/tearDown, since we need to guarantee that the locale will be reset after a failed test.
horde · Dec 29, 2014 · 250c149 · 250c149
1 parent 0bf739c
commit 250c149
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 90 deletions.
diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml
@@ -382,6 +382,9 @@
        <file name="sample_msg_eai_4.txt" role="test" />
        <file name="uudecode.txt" role="test" />
       </dir> <!-- /test/Horde/Mime/fixtures -->
+      <dir name="Mdn">
+       <file name="NonTranslatedTest.php" role="test" />
+      </dir> <!-- /test/Horde/Mime/Mdn -->
       <file name="AllTests.php" role="test" />
       <file name="bootstrap.php" role="test" />
       <file name="ContentParamTest.php" role="test" />
@@ -674,6 +677,7 @@
    <install as="Horde/Mime/fixtures/sample_msg_eai_3.txt" name="test/Horde/Mime/fixtures/sample_msg_eai_3.txt" />
    <install as="Horde/Mime/fixtures/sample_msg_eai_4.txt" name="test/Horde/Mime/fixtures/sample_msg_eai_4.txt" />
    <install as="Horde/Mime/fixtures/uudecode.txt" name="test/Horde/Mime/fixtures/uudecode.txt" />
+   <install as="Horde/Mime/Mdn/NonTranslatedTest.php" name="test/Horde/Mime/Mdn/NonTranslatedTest.php" />
   </filelist>
  </phprelease>
  <changelog>

diff --git a/framework/Mime/test/Horde/Mime/Mdn/NonTranslatedTest.php b/framework/Mime/test/Horde/Mime/Mdn/NonTranslatedTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright 2014 Horde LLC (http://www.horde.org/)
+ *
+ * @category   Horde
+ * @copyright  2014 Horde LLC
+ * @license    http://www.horde.org/licenses/lgpl21 LGPL 2.1
+ * @package    Mime
+ * @subpackage UnitTests
+ */
+
+/**
+ * Tests for the Horde_Mime_Mdn object that require translations to not occur.
+ *
+ * @author     Michael Slusarz <slusarz@horde.org>
+ * @category   Horde
+ * @copyright  2014 Horde LLC
+ * @internal
+ * @license    http://www.horde.org/licenses/lgpl21 LGPL 2.1
+ * @package    Mime
+ * @subpackage UnitTests
+ */
+class Horde_Mime_Mdn_NonTranslatedTest extends PHPUnit_Framework_TestCase
+{
+    private $oldlocale;
+
+    public function setUp()
+    {
+        $this->oldlocale = setlocale(LC_MESSAGES, 0);
+        setlocale(LC_MESSAGES, 'C');
+    }
+
+    public function tearDown()
+    {
+        setlocale(LC_MESSAGES, $this->oldlocale);
+    }
+
+    public function testGenerate()
+    {
+        $h = new Horde_Mime_Headers();
+        $ob = new Horde_Mime_Mdn($h);
+
+        try {
+            $ob->generate(true, true, 'deleted', 'foo', null);
+            $this->fail('Expected Exception');
+        } catch (RuntimeException $e) {}
+
+        $date = 'Tue, 18 Nov 2014 20:14:17 -0700';
+        $mdn_addr = 'Aäb <foo@example.com>';
+
+        $h->addHeader('Date', $date);
+        $h->addHeader('Subject', 'Test');
+        $h->addHeader('To', '"BAR" <bar@example.com>');
+
+        $ob->addMdnRequestHeaders($mdn_addr);
+
+        $mailer = new Horde_Mail_Transport_Mock();
+
+        $ob->generate(
+            true,
+            true,
+            'displayed',
+            'test.example.com',
+            $mailer,
+            array(
+                'from_addr' => 'bar@example.com'
+            ),
+            array('error'),
+            array('error' => 'Foo')
+        );
+
+        $sent = str_replace("\r\n", "\n", $mailer->sentMessages[0]);
+
+        $this->assertEquals(
+            'auto-replied',
+            $sent['headers']['Auto-Submitted']
+        );
+        $this->assertEquals(
+            'bar@example.com',
+            $sent['headers']['From']
+        );
+        $this->assertEquals(
+            $mdn_addr,
+            Horde_Mime::decode($sent['headers']['To'])
+        );
+        $this->assertEquals(
+            'Disposition Notification',
+            $sent['headers']['Subject']
+        );
+
+        $this->assertStringMatchesFormat(
+'This message is in MIME format.
+
+--=%s
+Content-Type: text/plain; format=flowed; DelSp=Yes
+
+The message sent on Tue, 18 Nov 2014 20:14:17 -0700 to BAR  
+<bar@example.com> with subject "Test" has been displayed.
+
+This is no guarantee that the message has been read or understood.
+
+--=%s
+Content-Type: message/disposition-notification
+
+Reporting-UA: test.example.com; Horde Application Framework 5
+Final-Recipient: rfc822;bar@example.com
+Disposition: manual-action/MDN-sent-manually; displayed/error
+Error: Foo
+
+--=%s
+Content-Type: message/rfc822
+
+Date: Tue, 18 Nov 2014 20:14:17 -0700
+Subject: Test
+To: BAR <bar@example.com>
+Disposition-Notification-To: =?utf-8?b?QcOkYg==?= <foo@example.com>
+
+--=%s
+',
+            $sent['body']
+        );
+    }
+
+}
diff --git a/framework/Mime/test/Horde/Mime/MdnTest.php b/framework/Mime/test/Horde/Mime/MdnTest.php
@@ -92,94 +92,4 @@ public function userConfirmationNeededProvider()
         return $out;
     }
 
-    public function testGenerate()
-    {
-        $locale = setlocale(LC_MESSAGES, 0);
-        setlocale(LC_MESSAGES, 'C');
-        $h = new Horde_Mime_Headers();
-        $ob = new Horde_Mime_Mdn($h);
-
-        try {
-            $ob->generate(true, true, 'deleted', 'foo', null);
-            $this->fail('Expected Exception');
-        } catch (RuntimeException $e) {}
-
-        $date = 'Tue, 18 Nov 2014 20:14:17 -0700';
-        $mdn_addr = 'Aäb <foo@example.com>';
-
-        $h->addHeader('Date', $date);
-        $h->addHeader('Subject', 'Test');
-        $h->addHeader('To', '"BAR" <bar@example.com>');
-
-        $ob->addMdnRequestHeaders($mdn_addr);
-
-        $mailer = new Horde_Mail_Transport_Mock();
-
-        $ob->generate(
-            true,
-            true,
-            'displayed',
-            'test.example.com',
-            $mailer,
-            array(
-                'from_addr' => 'bar@example.com'
-            ),
-            array('error'),
-            array('error' => 'Foo')
-        );
-
-        $sent = str_replace("\r\n", "\n", $mailer->sentMessages[0]);
-
-        $this->assertEquals(
-            'auto-replied',
-            $sent['headers']['Auto-Submitted']
-        );
-        $this->assertEquals(
-            'bar@example.com',
-            $sent['headers']['From']
-        );
-        $this->assertEquals(
-            $mdn_addr,
-            Horde_Mime::decode($sent['headers']['To'])
-        );
-        $this->assertEquals(
-            'Disposition Notification',
-            $sent['headers']['Subject']
-        );
-
-        $this->assertStringMatchesFormat(
-'This message is in MIME format.
-
---=%s
-Content-Type: text/plain; format=flowed; DelSp=Yes
-
-The message sent on Tue, 18 Nov 2014 20:14:17 -0700 to BAR  
-<bar@example.com> with subject "Test" has been displayed.
-
-This is no guarantee that the message has been read or understood.
-
---=%s
-Content-Type: message/disposition-notification
-
-Reporting-UA: test.example.com; Horde Application Framework 5
-Final-Recipient: rfc822;bar@example.com
-Disposition: manual-action/MDN-sent-manually; displayed/error
-Error: Foo
-
---=%s
-Content-Type: message/rfc822
-
-Date: Tue, 18 Nov 2014 20:14:17 -0700
-Subject: Test
-To: BAR <bar@example.com>
-Disposition-Notification-To: =?utf-8?b?QcOkYg==?= <foo@example.com>
-
---=%s
-',
-            $sent['body']
-        );
-
-        setlocale(LC_MESSAGES, $locale);
-    }
-
 }