Changeset 53850

Timestamp:

08/07/2022 01:56:35 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove dynamic properties in Tests_POMO_PO.

In this particular case, the test class contains a set_up() method which sets properties only used by select tests, while the fixture method is being run for all tests.

There were a few ways this could be fixed:

• As the values do not change across tests, use set_up_before_class() to set (static) properties instead.
• For those values which are set up without a function call or variable interpolation, set the values in class constants.
• Or set these values as local variables for those tests which actually use them.

The implemented solution is a combination of options 2 and 3.

Follow-up to [1106/tests], [53557], [53558].

Props jrf.
See #56033.

File:

• trunk/tests/phpunit/tests/pomo/po.php (modified) (6 diffs)

trunk/tests/phpunit/tests/pomo/po.php

@@ -6 +6 @@
 class Tests_POMO_PO extends WP_UnitTestCase {
 
-    public static function set_up_before_class() {
-        parent::set_up_before_class();
-
-        require_once ABSPATH . '/wp-includes/pomo/po.php';
-    }
-
-    public function set_up() {
-        parent::set_up();
-
-        // Not so random wordpress.pot string -- multiple lines.
-        $this->mail    = 'Your new WordPress blog has been successfully set up at:
+    /**
+     * Mail content.
+     *
+     * @var string
+     */
+    const MAIL_TEXT = 'Your new WordPress blog has been successfully set up at:
 
 %1$s
@@ -30 +25 @@
 http://wordpress.org/
 ';
-        $this->mail    = str_replace( "\r\n", "\n", $this->mail );
-        $this->po_mail = '""
+
+    /**
+     * Mail content for translation readiness.
+     *
+     * @var string
+     */
+    const PO_MAIL = '""
 "Your new WordPress blog has been successfully set up at:\n"
 "\n"
@@ -45 +45 @@
 "--The WordPress Team\n"
 "http://wordpress.org/\n"';
-        $this->a90     = str_repeat( 'a', 90 );
-        $this->po_a90  = "\"$this->a90\"";
+
+    public static function set_up_before_class() {
+        parent::set_up_before_class();
+
+        require_once ABSPATH . '/wp-includes/pomo/po.php';
     }
 
@@ -61 +64 @@
         $this->assertSame( '"baba"', $po->poify( 'baba' ) );
         // Long word.
-        $this->assertSame( $this->po_a90, $po->poify( $this->a90 ) );
+        $long_word    = str_repeat( 'a', 90 );
+        $po_long_word = "\"$long_word\"";
+        $this->assertSame( $po_long_word, $po->poify( $long_word ) );
         // Tab.
         $this->assertSame( '"ba\tba"', $po->poify( "ba\tba" ) );
@@ -72 +77 @@
         $this->assertSame( '"Categories can be selectively converted to tags using the <a href=\\"%s\\">category to tag converter</a>."', $po->poify( $src ) );
 
-        $this->assertSameIgnoreEOL( $this->po_mail, $po->poify( $this->mail ) );
+        $mail = str_replace( "\r\n", "\n", self::MAIL_TEXT );
+        $this->assertSameIgnoreEOL( self::PO_MAIL, $po->poify( $mail ) );
     }
 
@@ -79 +85 @@
         $this->assertSame( 'baba', $po->unpoify( '"baba"' ) );
         $this->assertSame( "baba\ngugu", $po->unpoify( '"baba\n"' . "\t\t\t\n" . '"gugu"' ) );
-        $this->assertSame( $this->a90, $po->unpoify( $this->po_a90 ) );
+
+        $long_word    = str_repeat( 'a', 90 );
+        $po_long_word = "\"$long_word\"";
+        $this->assertSame( $long_word, $po->unpoify( $po_long_word ) );
         $this->assertSame( '\\t\\n', $po->unpoify( '"\\\\t\\\\n"' ) );
         // Wordwrapped.
         $this->assertSame( 'babadyado', $po->unpoify( "\"\"\n\"baba\"\n\"dyado\"" ) );
-        $this->assertSameIgnoreEOL( $this->mail, $po->unpoify( $this->po_mail ) );
+
+        $mail = str_replace( "\r\n", "\n", self::MAIL_TEXT );
+        $this->assertSameIgnoreEOL( $mail, $po->unpoify( self::PO_MAIL ) );
     }