Changeset 53833

Timestamp:

08/04/2022 05:18:36 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correct data providers for get_term_link() and get_edit_term_link() tests.

• The tests use named data providers which include a flag for passing either a term ID or term object to the test, but the values for the flag were the opposite of what the array key says.
• Some array keys were duplicated, which means the earlier test case with the same name did not actually run.

Follow-up to [52180], [52255], [52258], [52305].

See #55652.

Location:

trunk/tests/phpunit/tests

Files:

• link/editTermLink.php (modified) (1 diff)
• link/getEditTermLink.php (modified) (1 diff)
• term/getTermLink.php (modified) (1 diff)

trunk/tests/phpunit/tests/link/editTermLink.php

@@ -119 +119 @@
         public function data_edit_term_link() {
                 return array(
-                        'category passing term_id'          => array(
+                        'category passing term_id'              => array(
+                                'taxonomy' => 'category',
+                                'use_id'   => true,
+                                'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+                        ),
+                        'category passing term object'          => array(
                                 'taxonomy' => 'category',
                                 'use_id'   => false,
                                 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
                         ),
-                        'category passing term object'      => array(
-                                'taxonomy' => 'category',
+                        'post_tag passing term_id'              => array(
+                                'taxonomy' => 'post_tag',
                                 'use_id'   => true,
-                                'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+                                'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
                         ),
-                        'post_tag passing term_id'          => array(
+                        'post_tag passing term object'          => array(
                                 'taxonomy' => 'post_tag',
                                 'use_id'   => false,
                                 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
                         ),
-                        'post_tag passing term object'      => array(
-                                'taxonomy' => 'post_tag',
+                        'a custom taxonomy passing term_id'     => array(
+                                'taxonomy' => 'custom_taxonomy',
                                 'use_id'   => true,
-                                'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+                                'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
                         ),
-                        'a custom taxonomy passing term_id' => array(
+                        'a custom taxonomy passing term object' => array(
                                 'taxonomy' => 'custom_taxonomy',
                                 'use_id'   => false,
-                                'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
-                        ),
-                        'a custom taxonomy passing term_id' => array(
-                                'taxonomy' => 'custom_taxonomy',
-                                'use_id'   => true,
                                 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
                         ),

trunk/tests/phpunit/tests/link/getEditTermLink.php

@@ -119 +119 @@
         public function data_get_edit_term_link() {
                 return array(
-                        'category passing term_id'          => array(
+                        'category passing term_id'              => array(
+                                'taxonomy' => 'category',
+                                'use_id'   => true,
+                                'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+                        ),
+                        'category passing term object'          => array(
                                 'taxonomy' => 'category',
                                 'use_id'   => false,
                                 'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
                         ),
-                        'category passing term object'      => array(
-                                'taxonomy' => 'category',
+                        'post_tag passing term_id'              => array(
+                                'taxonomy' => 'post_tag',
                                 'use_id'   => true,
-                                'expected' => 'term.php?taxonomy=category&tag_ID=%ID%&post_type=post',
+                                'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
                         ),
-                        'post_tag passing term_id'          => array(
+                        'post_tag passing term object'          => array(
                                 'taxonomy' => 'post_tag',
                                 'use_id'   => false,
                                 'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
                         ),
-                        'post_tag passing term object'      => array(
-                                'taxonomy' => 'post_tag',
+                        'a custom taxonomy passing term_id'     => array(
+                                'taxonomy' => 'custom_taxonomy',
                                 'use_id'   => true,
-                                'expected' => 'term.php?taxonomy=post_tag&tag_ID=%ID%&post_type=post',
+                                'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
                         ),
-                        'a custom taxonomy passing term_id' => array(
+                        'a custom taxonomy passing term object' => array(
                                 'taxonomy' => 'custom_taxonomy',
                                 'use_id'   => false,
-                                'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
-                        ),
-                        'a custom taxonomy passing term_id' => array(
-                                'taxonomy' => 'custom_taxonomy',
-                                'use_id'   => true,
                                 'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
                         ),

trunk/tests/phpunit/tests/term/getTermLink.php

@@ -295 +295 @@
         public function data_get_term_link() {
                 return array(
-                        'category passing term_id'          => array(
+                        'category passing term_id'              => array(
+                                'taxonomy' => 'category',
+                                'use_id'   => true,
+                        ),
+                        'category passing term object'          => array(
                                 'taxonomy' => 'category',
                                 'use_id'   => false,
                         ),
-                        'category passing term object'      => array(
-                                'taxonomy' => 'category',
+                        'post_tag passing term_id'              => array(
+                                'taxonomy' => 'post_tag',
                                 'use_id'   => true,
                         ),
-                        'post_tag passing term_id'          => array(
+                        'post_tag passing term object'          => array(
                                 'taxonomy' => 'post_tag',
                                 'use_id'   => false,
                         ),
-                        'post_tag passing term object'      => array(
-                                'taxonomy' => 'post_tag',
+                        'a custom taxonomy passing term_id'     => array(
+                                'taxonomy' => 'wptests_tax',
                                 'use_id'   => true,
                         ),
-                        'a custom taxonomy passing term_id' => array(
+                        'a custom taxonomy passing term object' => array(
                                 'taxonomy' => 'wptests_tax',
                                 'use_id'   => false,
-                        ),
-                        'a custom taxonomy passing term_id' => array(
-                                'taxonomy' => 'wptests_tax',
-                                'use_id'   => true,
-                                'expected' => 'term.php?taxonomy=custom_taxonomy&tag_ID=%ID%&post_type=post',
                         ),
                 );