Changeset 36337

Timestamp:

01/17/2016 11:37:51 PM (9 years ago)

Author:

iseulde

Message:

Fix unit tests after [36336]

File:

• trunk/tests/phpunit/tests/formatting/Smilies.php (modified) (6 diffs)

trunk/tests/phpunit/tests/formatting/Smilies.php

@@ -21 +21 @@
             array (
                 '<strong>Welcome to the jungle!</strong> We got fun n games! :) We got everything you want 8-) <em>Honey we know the names :)</em>',
-                "<strong>Welcome to the jungle!</strong> We got fun n games! <img src=\"${includes_path}simple-smile.png\" alt=\":)\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> We got everything you want \xf0\x9f\x98\x8e <em>Honey we know the names <img src=\"${includes_path}simple-smile.png\" alt=\":)\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /></em>"
+                "<strong>Welcome to the jungle!</strong> We got fun n games! \xf0\x9f\x99\x82 We got everything you want \xf0\x9f\x98\x8e <em>Honey we know the names \xf0\x9f\x99\x82</em>"
             ),
             array (
@@ -170 +170 @@
             array (
                 '8-O :-(',
-                "\xf0\x9f\x98\xaf <img src=\"{$includes_path}frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
+                "\xf0\x9f\x98\xaf \xf0\x9f\x99\x81"
             ),
             array (
@@ -182 +182 @@
             array (
                 '8-) :-(',
-                "\xf0\x9f\x98\x8e <img src=\"{$includes_path}frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
+                "\xf0\x9f\x98\x8e \xf0\x9f\x99\x81"
             ),
             array (
@@ -189 +189 @@
             ),
             array (
-                '8O :twisted: :( :? :(',
-                "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 <img src=\"{$includes_path}frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> \xf0\x9f\x98\x95 <img src=\"{$includes_path}frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
+                '8O :twisted: :( :? :roll:',
+                "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x99\x81 \xf0\x9f\x98\x95 <img src=\"{$includes_path}rolleyes.png\" alt=\":roll:\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
             ),
         );
@@ -273 +273 @@
     }
 
+    public function get_spaces_around_smilies() {
+        $nbsp = "\xC2\xA0";
+
+        return array(
+            array(
+                'test :) smile',
+                "test \xf0\x9f\x99\x82 smile"
+            ),
+            array(
+                'test &nbsp;:)&nbsp;smile',
+                "test &nbsp;\xf0\x9f\x99\x82&nbsp;smile"
+            ),
+            array(
+                "test {$nbsp}:){$nbsp}smile",
+                "test {$nbsp}\xf0\x9f\x99\x82{$nbsp}smile"
+            )
+        );
+    }
+
     /**
      * Check that $wp_smiliessearch pattern will match smilies
@@ -281 +300 @@
      *
      * @ticket 22692
-     */
-    function test_spaces_around_smilies() {
-        $nbsp = "\xC2\xA0";
-
+     * @dataProvider get_spaces_around_smilies
+     */
+    function test_spaces_around_smilies( $in_txt, $converted_txt ) {
         // standard smilies, use_smilies: ON
         update_option( 'use_smilies', 1 );
-        smilies_init();
-
-        $input  = array();
-        $output = array();
-
-        $input[]  = 'My test :) smile';
-        $output[] = array('test <img ', 'alt=":)"', ' /> smile');
-
-        $input[]  = 'My test &nbsp;:)&nbsp;smile';
-        $output[] = array('test &nbsp;<img ', 'alt=":)"', ' />&nbsp;smile');
-
-        $input[]  = "My test {$nbsp}:){$nbsp}smile";
-        $output[] = array("test {$nbsp}<img ", 'alt=":)"', " />{$nbsp}smile");
-
-        foreach($input as $key => $in) {
-            $result = convert_smilies( $in );
-            foreach($output[$key] as $out) {
-
-                // Each output element must appear in the results.
-                $this->assertContains( $out, $result );
-
-            }
-        }
+
+        smilies_init();
+
+        $this->assertEquals( $converted_txt, convert_smilies( $in_txt ) );
 
         // standard smilies, use_smilies: OFF