Changeset 49697

Timestamp:

11/25/2020 04:49:04 AM (6 years ago)

Author:

peterwilsoncc

Message:

Build/Test Tools: Use dataProviders for some kses tests.

Refactor several kses tests to use dataProviers rather than looping through assertions.

See #51802.

File:

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

trunk/tests/phpunit/tests/kses.php

@@ -9 +9 @@
 
         /**
+         * @dataProvider data_wp_filter_post_kses_address
          * @ticket 20210
-         */
-        function test_wp_filter_post_kses_address() {
+         *
+         * @param string $string        Test string for kses.
+         * @param string $expect_string Expected result after passing through kses.
+         */
+        function test_wp_filter_post_kses_address( $string, $expect_string ) {
                 global $allowedposttags;
 
+                $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+        }
+
+        /**
+         * Data provider for test_wp_filter_post_kses_address.
+         *
+         * @return array[] Arguments {
+         *     @type string $string        Test string for kses.
+         *     @type string $expect_string Expected result after passing through kses.
+         * }
+         */
+        function data_wp_filter_post_kses_address() {
                 $attributes = array(
                         'class' => 'classname',
@@ -26 +42 @@
                 );
 
+                $data = array();
+
                 foreach ( $attributes as $name => $values ) {
                         foreach ( (array) $values as $value ) {
                                 $string        = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
                                 $expect_string = "<address $name='" . str_replace( '; ', ';', trim( $value, ';' ) ) . "'>1 WordPress Avenue, The Internet.</address>";
-                                $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+
+                                $data[] = array( $string, $expect_string );
                         }
                 }
-        }
-
-        /**
+
+                return $data;
+        }
+
+        /**
+         * @dataProvider data_wp_filter_post_kses_a
          * @ticket 20210
-         */
-        function test_wp_filter_post_kses_a() {
+         *
+         * @param string $string        Test string for kses.
+         * @param string $expect_string Expected result after passing through kses.
+         * @return void
+         */
+        function test_wp_filter_post_kses_a( $string, $expect_string ) {
                 global $allowedposttags;
 
+                $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+        }
+
+        /**
+         * Data provider for test_wp_filter_post_kses_a.
+         *
+         * @return array[] Arguments {
+         *     @type string $string        Test string for kses.
+         *     @type string $expect_string Expected result after passing through kses.
+         * }
+         */
+        function data_wp_filter_post_kses_a() {
                 $attributes = array(
                         'class'    => 'classname',
@@ -54 +92 @@
                 );
 
+                $data = array();
+
                 foreach ( $attributes as $name => $value ) {
                         if ( $value ) {
@@ -64 +104 @@
                         $string        = "<a $attr>I link this</a>";
                         $expect_string = "<a $expected_attr>I link this</a>";
-                        $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+                        $data[]        = array( $string, $expect_string );
                 }
+
+                return $data;
         }
 
@@ -123 +165 @@
 
         /**
+         * @dataProvider data_wp_filter_post_kses_abbr
          * @ticket 20210
-         */
-        function test_wp_filter_post_kses_abbr() {
+         *
+         * @param string $string        Test string for kses.
+         * @param string $expect_string Expected result after passing through kses.
+         * @return void
+         */
+        function test_wp_filter_post_kses_abbr( $string, $expect_string ) {
                 global $allowedposttags;
 
+                $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+        }
+
+        /**
+         * Data provider for data_wp_filter_post_kses_abbr.
+         *
+         * @return array[] Arguments {
+         *     @type string $string        Test string for kses.
+         *     @type string $expect_string Expected result after passing through kses.
+         * }
+         */
+        function data_wp_filter_post_kses_abbr() {
                 $attributes = array(
                         'class' => 'classname',
@@ -135 +194 @@
                 );
 
+                $data = array();
+
                 foreach ( $attributes as $name => $value ) {
                         $string        = "<abbr $name='$value'>WP</abbr>";
                         $expect_string = "<abbr $name='" . trim( $value, ';' ) . "'>WP</abbr>";
-                        $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+                        $data[]        = array( $string, $expect_string );
                 }
+
+                return $data;
         }