Changeset 41201 for branches/4.8/tests/phpunit/tests/formatting/Emoji.php

Timestamp:

08/01/2017 09:15:07 PM (8 years ago)

Author:

westi

Message:

Emoji: Revert [41069] as the new Regular Expressions performance on balance significantly worse that the old ones.

See #35293 props @jmdodd

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/formatting/Emoji.php (modified) (5 diffs)

branches/4.8/tests/phpunit/tests/formatting/Emoji.php

@@ -3 +3 @@
 /**
  * @group formatting
- * @group emoji
  */
 class Tests_Formatting_Emoji extends WP_UnitTestCase {
-
-    private $png_cdn = 'https://s.w.org/images/core/emoji/2.3/72x72/';
-    private $svn_cdn = 'https://s.w.org/images/core/emoji/2.3/svg/';
-
     /**
      * @ticket 36525
      */
     public function test_unfiltered_emoji_cdns() {
+        $png_cdn = 'https://s.w.org/images/core/emoji/2.3/72x72/';
+        $svn_cdn = 'https://s.w.org/images/core/emoji/2.3/svg/';
+
         $output = get_echo( '_print_emoji_detection_script' );
 
-        $this->assertContains( wp_json_encode( $this->png_cdn ), $output );
-        $this->assertContains( wp_json_encode( $this->svn_cdn ), $output );
+        $this->assertContains( wp_json_encode( $png_cdn ), $output );
+        $this->assertContains( wp_json_encode( $svn_cdn ), $output );
     }
 
@@ -28 +26 @@
      */
     public function test_filtered_emoji_svn_cdn() {
+        $png_cdn = 'https://s.w.org/images/core/emoji/2.3/72x72/';
+        $svn_cdn = 'https://s.w.org/images/core/emoji/2.3/svg/';
+
         $filtered_svn_cdn = $this->_filtered_emoji_svn_cdn();
 
@@ -34 +35 @@
         $output = get_echo( '_print_emoji_detection_script' );
 
-        $this->assertContains( wp_json_encode( $this->png_cdn ), $output );
-        $this->assertNotContains( wp_json_encode( $this->svn_cdn ), $output );
+        $this->assertContains( wp_json_encode( $png_cdn ), $output );
+        $this->assertNotContains( wp_json_encode( $svn_cdn ), $output );
         $this->assertContains( wp_json_encode( $filtered_svn_cdn ), $output );
 
@@ -49 +50 @@
      */
     public function test_filtered_emoji_png_cdn() {
+        $png_cdn = 'https://s.w.org/images/core/emoji/2.3/72x72/';
+        $svn_cdn = 'https://s.w.org/images/core/emoji/2.3/svg/';
+
         $filtered_png_cdn = $this->_filtered_emoji_png_cdn();
 
@@ -56 +60 @@
 
         $this->assertContains( wp_json_encode( $filtered_png_cdn ), $output );
-        $this->assertNotContains( wp_json_encode( $this->png_cdn ), $output );
-        $this->assertContains( wp_json_encode( $this->svn_cdn ), $output );
+        $this->assertNotContains( wp_json_encode( $png_cdn ), $output );
+        $this->assertContains( wp_json_encode( $svn_cdn ), $output );
 
         remove_filter( 'emoji_url', array( $this, '_filtered_emoji_png_cdn' ) );
     }
 
-    /**
-     * @ticket 35293
-     */
-    public function test_wp_emoji_regex_returns_regexen() {
-        $default = wp_emoji_regex();
-        $this->assertNotEmpty( $default );
-
-        $codepoints = wp_emoji_regex( 'codepoints' );
-        $this->assertNotEmpty( $codepoints );
-
-        $this->assertSame( $default, $codepoints );
-
-        $entities = wp_emoji_regex( 'entities' );
-        $this->assertNotEmpty( $entities );
-
-        $this->assertNotSame( $default, $entities );
-    }
-
-    public function data_wp_encode_emoji() {
-        return array(
-            array(
-                // Not emoji
-                '’',
-                '’',
-            ),
-            array(
-                // Simple emoji
-                '🙂',
-                '🙂',
-            ),
-            array(
-                // Skin tone, gender, ZWJ, emoji selector
-                '👮🏼‍♀️',
-                '👮🏼‍♀️',
-            ),
-            array(
-                // Unicode 10
-                '🧚',
-                '🧚',
-            ),
-        );
-    }
-
-    /**
-     * @ticket 35293
-     * @dataProvider data_wp_encode_emoji
-     */
-    public function test_wp_encode_emoji( $emoji, $expected ) {
-        $this->assertSame( $expected, wp_encode_emoji( $emoji ) );
-    }
-
-    public function data_wp_staticize_emoji() {
-        $data = array(
-            array(
-                // Not emoji
-                '’',
-                '’',
-            ),
-            array(
-                // Simple emoji
-                '🙂',
-                '<img src="' . $this->png_cdn . '1f642.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
-            ),
-            array(
-                // Skin tone, gender, ZWJ, emoji selector
-                '👮🏼‍♀️',
-                '<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
-            ),
-            array(
-                // Unicode 10
-                '🧚',
-                '<img src="' . $this->png_cdn . '1f9da.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
-            ),
-        );
-
-        // Older versions of PHP don't html_entity_decode() emoji, so we need to make sure they're testing in the expected form.
-        foreach ( $data as $key => $datum ) {
-            $emoji = html_entity_decode( wp_encode_emoji( $datum[0] ) );
-            $data[ $key ][1] = str_replace( 'alt=""', 'alt="' . $emoji . '"', $datum[1] );
-        }
-
-        return $data;
-    }
-
-    /**
-     * @ticket 35293
-     * @dataProvider data_wp_staticize_emoji
-     */
-    public function test_wp_staticize_emoji( $emoji, $expected ) {
-        $this->assertSame( $expected, wp_staticize_emoji( $emoji ) );
-    }
 }