Changeset 59516

Timestamp:

12/15/2024 11:22:22 PM (22 months ago)

Author:

SergeyBiryukov

Message:

Tests: Clean up convert_smilies() tests.

Includes:

• Removing redundant use_smilies option switches, as it is set to 1 by default.
• Restoring the $wpsmiliestrans array before performing assertions, not after.
• Moving most of the smilies_init() calls to a set_up() method.

Follow-up to [409/tests], [26191], [28717].

See #62278.

File:

• trunk/tests/phpunit/tests/formatting/convertSmilies.php (modified) (9 diffs)

trunk/tests/phpunit/tests/formatting/convertSmilies.php

@@ -9 +9 @@
 class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
 
+        public function set_up() {
+                parent::set_up();
+
+                smilies_init();
+        }
+
         /**
          * Basic validation test to confirm that smilies are converted to image
@@ -16 +22 @@
          */
         public function test_convert_standard_smilies( $input, $converted ) {
-                // Standard smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-
-                smilies_init();
-
-                $this->assertSame( $converted, convert_smilies( $input ) );
-
-                // Standard smilies, use_smilies: OFF.
+                $this->assertSame( $converted, convert_smilies( $input ) );
+
+                // Disable smilies.
                 update_option( 'use_smilies', 0 );
 
@@ -77 +78 @@
         public function test_convert_custom_smilies( $input, $converted ) {
                 global $wpsmiliestrans;
-
-                // Custom smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-
-                if ( ! isset( $wpsmiliestrans ) ) {
-                        smilies_init();
-                }
 
                 $trans_orig = $wpsmiliestrans; // Save original translations array.
@@ -98 +92 @@
                 $this->assertSame( $converted, convert_smilies( $input ) );
 
-                // Standard smilies, use_smilies: OFF.
+                // Disable smilies.
                 update_option( 'use_smilies', 0 );
 
+                $wpsmiliestrans = $trans_orig; // Reset original translations array.
+
                 $this->assertSame( $input, convert_smilies( $input ) );
-
-                $wpsmiliestrans = $trans_orig; // Reset original translations array.
         }
 
@@ -148 +142 @@
                 $expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
 
-                // Standard smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-                smilies_init();
-
                 $this->assertSame( $expected, convert_smilies( $input ) );
-
-                // Standard smilies, use_smilies: OFF.
-                update_option( 'use_smilies', 0 );
         }
 
@@ -185 +172 @@
          */
         public function test_smilies_combinations( $input, $converted ) {
-                // Custom smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-                smilies_init();
-
-                $this->assertSame( $converted, convert_smilies( $input ) );
-
-                // Custom smilies, use_smilies: OFF.
+                $this->assertSame( $converted, convert_smilies( $input ) );
+
+                // Disable smilies.
                 update_option( 'use_smilies', 0 );
 
@@ -248 +231 @@
                 global $wpsmiliestrans;
 
-                // Standard smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-
-                if ( ! isset( $wpsmiliestrans ) ) {
-                        smilies_init();
-                }
-
                 $orig_trans = $wpsmiliestrans; // Save original translations array.
 
@@ -265 +241 @@
                 $this->assertSame( $converted, convert_smilies( $input ) );
 
-                // Standard smilies, use_smilies: OFF.
+                // Disable smilies.
                 update_option( 'use_smilies', 0 );
 
+                $wpsmiliestrans = $orig_trans; // Reset original translations array.
+
                 $this->assertSame( $input, convert_smilies( $input ) );
-
-                $wpsmiliestrans = $orig_trans; // Reset original translations array.
         }
 
@@ -313 +289 @@
          */
         public function test_spaces_around_smilies( $input, $converted ) {
-                // Standard smilies, use_smilies: ON.
-                update_option( 'use_smilies', 1 );
-
-                smilies_init();
-
-                $this->assertSame( $converted, convert_smilies( $input ) );
-
-                // Standard smilies, use_smilies: OFF.
-                update_option( 'use_smilies', 0 );
+                $this->assertSame( $converted, convert_smilies( $input ) );
         }