Changeset 55562 for trunk/tests/phpunit/tests/pomo/pluralForms.php

Timestamp:

03/19/2023 12:03:30 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use the data_ prefix for various data provider methods.

This aims to bring more consistency to the test suite, as the vast majority of data providers already use that prefix.

Includes moving some data providers next to the tests they are used in.

Follow-up to [55464].

See #57841.

File:

• trunk/tests/phpunit/tests/pomo/pluralForms.php (modified) (4 diffs)

trunk/tests/phpunit/tests/pomo/pluralForms.php

@@ -40 +40 @@
         /**
          * @ticket 41562
+         * @dataProvider data_locales
          * @group external-http
          */
-        public function test_locales_provider() {
-                $locales = self::locales_provider();
+        public function test_regression( $lang, $nplurals, $expression ) {
+                require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
+
+                $parenthesized = self::parenthesize_plural_expression( $expression );
+                $old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
+                $plural_forms  = new Plural_Forms( $expression );
+
+                $generated_old = array();
+                $generated_new = array();
+
+                foreach ( range( 0, 200 ) as $i ) {
+                        $generated_old[] = $old_style( $i );
+                        $generated_new[] = $plural_forms->get( $i );
+                }
+
+                $this->assertSame( $generated_old, $generated_new );
+        }
+
+        /**
+         * @ticket 41562
+         * @group external-http
+         */
+        public function test_locales_file_not_empty() {
+                $locales = self::data_locales();
 
                 $this->assertNotEmpty( $locales, 'Unable to retrieve GP_Locales file' );
         }
 
-        public static function locales_provider() {
+        public static function data_locales() {
                 if ( ! class_exists( 'GP_Locales' ) ) {
                         $filename = download_url( 'https://raw.githubusercontent.com/GlotPress/GlotPress-WP/develop/locales/locales.php' );
@@ -71 +94 @@
         /**
          * @ticket 41562
-         * @dataProvider locales_provider
-         * @group external-http
-         */
-        public function test_regression( $lang, $nplurals, $expression ) {
-                require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
-
-                $parenthesized = self::parenthesize_plural_expression( $expression );
-                $old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
-                $plural_forms  = new Plural_Forms( $expression );
-
-                $generated_old = array();
-                $generated_new = array();
-
-                foreach ( range( 0, 200 ) as $i ) {
-                        $generated_old[] = $old_style( $i );
-                        $generated_new[] = $plural_forms->get( $i );
-                }
-
-                $this->assertSame( $generated_old, $generated_new );
-        }
-
-        public static function simple_provider() {
+         * @dataProvider data_simple
+         */
+        public function test_simple( $expression, $expected ) {
+                $plural_forms = new Plural_Forms( $expression );
+                $actual       = array();
+                foreach ( array_keys( $expected ) as $num ) {
+                        $actual[ $num ] = $plural_forms->get( $num );
+                }
+
+                $this->assertSame( $expected, $actual );
+        }
+
+        public static function data_simple() {
                 return array(
                         array(
@@ -144 +158 @@
 
         /**
-         * @ticket 41562
-         * @dataProvider simple_provider
-         */
-        public function test_simple( $expression, $expected ) {
+         * Ensures that an exception is thrown when an invalid plural form is encountered.
+         *
+         * @ticket 41562
+         * @dataProvider data_exceptions
+         */
+        public function test_exceptions( $expression, $expected_message, $call_get ) {
+                $this->expectException( 'Exception' );
+                $this->expectExceptionMessage( $expected_message );
+
                 $plural_forms = new Plural_Forms( $expression );
-                $actual       = array();
-                foreach ( array_keys( $expected ) as $num ) {
-                        $actual[ $num ] = $plural_forms->get( $num );
-                }
-
-                $this->assertSame( $expected, $actual );
+                if ( $call_get ) {
+                        $plural_forms->get( 1 );
+                }
         }
 
@@ -195 +211 @@
                         ),
                 );
-        }
-
-        /**
-         * Ensures that an exception is thrown when an invalid plural form is encountered.
-         *
-         * @ticket 41562
-         * @dataProvider data_exceptions
-         */
-        public function test_exceptions( $expression, $expected_message, $call_get ) {
-                $this->expectException( 'Exception' );
-                $this->expectExceptionMessage( $expected_message );
-
-                $plural_forms = new Plural_Forms( $expression );
-                if ( $call_get ) {
-                        $plural_forms->get( 1 );
-                }
         }