Changeset 52248 for trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

Timestamp:

11/25/2021 07:39:31 PM (3 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Correct the order and naming of expected and actual values in various tests.

This corrects the order of the parameters when used in assertions so if/when they fail the failure message is correct.

See #53363

File:

• trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php (modified) (13 diffs)

trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -70 +70 @@
 
         $is_textdomain_loaded_before = is_textdomain_loaded( 'internationalized-plugin' );
-        $expected_output             = i18n_plugin_test();
+        $actual_output               = i18n_plugin_test();
         $is_textdomain_loaded_after  = is_textdomain_loaded( 'internationalized-plugin' );
 
@@ -76 +76 @@
 
         $this->assertFalse( $is_textdomain_loaded_before );
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output );
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual_output );
         $this->assertTrue( $is_textdomain_loaded_after );
     }
@@ -91 +91 @@
 
         $is_textdomain_loaded_before = is_textdomain_loaded( 'internationalized-theme' );
-        $expected_output             = i18n_theme_test();
+        $actual_output               = i18n_theme_test();
         $is_textdomain_loaded_after  = is_textdomain_loaded( 'internationalized-theme' );
 
@@ -97 +97 @@
 
         $this->assertFalse( $is_textdomain_loaded_before );
-        $this->assertSame( 'Das ist ein Dummy Theme', $expected_output );
+        $this->assertSame( 'Das ist ein Dummy Theme', $actual_output );
         $this->assertTrue( $is_textdomain_loaded_after );
     }
@@ -122 +122 @@
         require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
 
-        $expected_output_before      = i18n_plugin_test();
+        $actual_output_before        = i18n_plugin_test();
         $is_textdomain_loaded_before = is_textdomain_loaded( 'internationalized-plugin' );
 
@@ -128 +128 @@
         remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
 
-        $expected_output_after      = i18n_plugin_test();
+        $actual_output_after        = i18n_plugin_test();
         $is_textdomain_loaded_after = is_textdomain_loaded( 'internationalized-plugin' );
 
@@ -134 +134 @@
         load_textdomain( 'internationalized-plugin', WP_LANG_DIR . '/plugins/internationalized-plugin-de_DE.mo' );
 
-        $expected_output_final      = i18n_plugin_test();
+        $actual_output_final        = i18n_plugin_test();
         $is_textdomain_loaded_final = is_textdomain_loaded( 'internationalized-plugin' );
 
@@ -141 +141 @@
 
         // Text domain loaded just in time.
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output_before );
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual_output_before );
         $this->assertTrue( $is_textdomain_loaded_before );
 
         // Text domain unloaded.
-        $this->assertSame( 'This is a dummy plugin', $expected_output_after );
+        $this->assertSame( 'This is a dummy plugin', $actual_output_after );
         $this->assertFalse( $is_textdomain_loaded_after );
 
         // Text domain loaded manually again.
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output_final );
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual_output_final );
         $this->assertTrue( $is_textdomain_loaded_final );
     }
@@ -160 +160 @@
 
         switch_to_locale( 'de_DE' );
-        $expected = i18n_plugin_test();
+        $actual = i18n_plugin_test();
         restore_previous_locale();
 
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected );
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual );
     }
 
@@ -173 +173 @@
 
         switch_to_locale( 'de_DE' );
-        $expected_de_de = i18n_plugin_test();
+        $actual_de_de = i18n_plugin_test();
 
         switch_to_locale( 'es_ES' );
-        $expected_es_es = i18n_plugin_test();
+        $actual_es_es = i18n_plugin_test();
 
         restore_current_locale();
 
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_de );
-        $this->assertSame( 'This is a dummy plugin', $expected_es_es );
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual_de_de );
+        $this->assertSame( 'This is a dummy plugin', $actual_es_es );
     }
 
@@ -193 +193 @@
 
         switch_to_locale( 'de_DE' );
-        $expected = i18n_theme_test();
+        $actual = i18n_theme_test();
         restore_previous_locale();
 
         switch_theme( WP_DEFAULT_THEME );
 
-        $this->assertSame( 'Das ist ein Dummy Theme', $expected );
+        $this->assertSame( 'Das ist ein Dummy Theme', $actual );
     }
 
@@ -210 +210 @@
         wp_set_current_user( self::$user_id );
 
-        $expected = i18n_plugin_test();
-
-        $this->assertSame( 'Das ist ein Dummy Plugin', $expected );
+        $actual = i18n_plugin_test();
+
+        $this->assertSame( 'Das ist ein Dummy Plugin', $actual );
     }
 
@@ -225 +225 @@
         require_once get_stylesheet_directory() . '/functions.php';
 
-        $expected = i18n_theme_test();
+        $actual = i18n_theme_test();
 
         switch_theme( WP_DEFAULT_THEME );
 
-        $this->assertSame( 'Das ist ein Dummy Theme', $expected );
+        $this->assertSame( 'Das ist ein Dummy Theme', $actual );
     }