simplify tests

horde · Aug 19, 2014 · ed70375 · ed70375
1 parent 6364476
commit ed70375
Showing 1 changed file with 14 additions and 25 deletions.
diff --git a/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php b/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php
@@ -27,7 +27,9 @@ class Horde_Imap_Client_MailboxTest extends PHPUnit_Framework_TestCase
 {
     public function testMailboxSerialize()
     {
-        $mailbox = new Horde_Imap_Client_Mailbox('Envoyé');
+        $mailbox = unserialize(
+            serialize(new Horde_Imap_Client_Mailbox('Envoyé'))
+        );
 
         $this->assertEquals(
             'Envoyé',
@@ -37,18 +39,6 @@ public function testMailboxSerialize()
             'Envoy&AOk-',
             $mailbox->utf7imap
         );
-
-        $a = serialize($mailbox);
-        $b = unserialize($a);
-
-        $this->assertEquals(
-            'Envoyé',
-            $b->utf8
-        );
-        $this->assertEquals(
-            'Envoy&AOk-',
-            $b->utf7imap
-        );
     }
 
     public function testMailboxGet()
@@ -61,7 +51,6 @@ public function testMailboxGet()
         );
 
         $mailbox = new Horde_Imap_Client_Mailbox('A');
-
         $b = Horde_Imap_Client_Mailbox::get($mailbox);
 
         $this->assertEquals(
@@ -86,24 +75,24 @@ public function testBug10093()
         );
     }
 
-    public function testListEscape()
+    /**
+     * @dataProvider listEscapeProvider
+     */
+    public function testListEscape($orig, $expected)
     {
-        $orig = '***Foo***';
-
         $mailbox = new Horde_Imap_Client_Mailbox($orig);
 
         $this->assertEquals(
-            '%Foo%',
+            $expected,
             $mailbox->list_escape
         );
+    }
 
-        $orig = 'IN.***Foo**.Bar.Test**';
-
-        $mailbox = new Horde_Imap_Client_Mailbox($orig);
-
-        $this->assertEquals(
-            'IN.%Foo%.Bar.Test%',
-            $mailbox->list_escape
+    public function listEscapeProvider()
+    {
+        return array(
+            array('***Foo***', '%Foo%'),
+            array('IN.***Foo**.Bar.Test**', 'IN.%Foo%.Bar.Test%')
         );
     }