Changeset 48907

Timestamp:

08/30/2020 01:34:38 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move the tests for selected() and checked() to a more appropriate place.

Convert the tests to use data providers.

Props wittich.
Fixes #51166.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesTemplate.php (modified) (1 diff)
• general/template.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesTemplate.php

@@ -4 +4 @@
  */
 class Tests_Admin_includesTemplate extends WP_UnitTestCase {
-
-        function test_equal() {
-                $this->assertEquals( ' selected=\'selected\'', selected( 'foo', 'foo', false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( 'foo', 'foo', false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( '1', 1, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( '1', 1, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( '1', true, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( '1', true, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( 1, 1, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( 1, 1, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( 1, true, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( 1, true, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( true, true, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( true, true, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( '0', 0, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( '0', 0, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( 0, 0, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( 0, 0, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( '', false, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( '', false, false ) );
-
-                $this->assertEquals( ' selected=\'selected\'', selected( false, false, false ) );
-                $this->assertEquals( ' checked=\'checked\'', checked( false, false, false ) );
-        }
-
-        function test_notequal() {
-                $this->assertEquals( '', selected( '0', '', false ) );
-                $this->assertEquals( '', checked( '0', '', false ) );
-
-                $this->assertEquals( '', selected( 0, '', false ) );
-                $this->assertEquals( '', checked( 0, '', false ) );
-
-                $this->assertEquals( '', selected( 0, false, false ) );
-                $this->assertEquals( '', checked( 0, false, false ) );
-        }
 
         /**

trunk/tests/phpunit/tests/general/template.php

@@ -691 +691 @@
                 get_template_part( 'template', 'part', array( 'foo' => 'baz' ) );
         }
+
+        /**
+         * @ticket 9862
+         * @dataProvider data_selected_and_checked_with_equal_values
+         */
+        function test_selected_and_checked_with_equal_values( $selected, $current ) {
+                $this->assertEquals( " selected='selected'", selected( $selected, $current, false ) );
+                $this->assertEquals( " checked='checked'", checked( $selected, $current, false ) );
+        }
+
+        function data_selected_and_checked_with_equal_values() {
+                return array(
+                        array( 'foo', 'foo' ),
+                        array( '1', 1 ),
+                        array( '1', true ),
+                        array( 1, 1 ),
+                        array( 1, true ),
+                        array( true, true ),
+                        array( '0', 0 ),
+                        array( 0, 0 ),
+                        array( '', false ),
+                        array( false, false ),
+                );
+        }
+
+        /**
+         * @ticket 9862
+         * @dataProvider data_selected_and_checked_with_non_equal_values
+         */
+        function test_selected_and_checked_with_non_equal_values( $selected, $current ) {
+                $this->assertEquals( '', selected( $selected, $current, false ) );
+                $this->assertEquals( '', checked( $selected, $current, false ) );
+        }
+
+        function data_selected_and_checked_with_non_equal_values() {
+                return array(
+                        array( '0', '' ),
+                        array( 0, '' ),
+                        array( 0, false ),
+                );
+        }
 }