Changeset 904 in tests for trunk/tests/canonical.php

Timestamp:

07/18/2012 07:01:41 PM (12 years ago)

Author:

nacin

Message:

Rename tests to conform to this standard: the class Tests_A_B_C.php should be found in Tests/A/B/C.php.

One class per file. Tests are now organized by general component, rather than by the core file they are found in.

Work in progress. Some classes need to be renamed, and some files still need to be moved (and split up).

File:

• trunk/tests/canonical.php (copied) (copied from trunk/tests/test_includes_canonical.php) (2 diffs)

trunk/tests/canonical.php

@@ -9 +9 @@
  * @group query
  */
-class WP_Test_Canonical extends WP_UnitTestCase {
+class Tests_Canonical extends WP_UnitTestCase {
 
     // This can be defined in a subclass of this class which contains it's own data() method, those tests will be run against the specified permastruct
@@ -273 +273 @@
     }
 }
-
-/**
- * @group canonical
- * @group rewrite
- * @group query
- */
-class WP_Canonical_PageOnFront extends WP_Test_Canonical {
-    function setUp() {
-        parent::setUp();
-        global $wp_rewrite;
-        update_option( 'show_on_front', 'page' );
-        update_option( 'page_for_posts', $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
-        update_option( 'page_on_front', $this->factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
-        $wp_rewrite->init();
-        flush_rewrite_rules();
-    }
-
-    function data() {
-        /* Format:
-         * [0]: $test_url,
-         * [1]: expected results: Any of the following can be used
-         *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
-         *      array( expected query vars to be set, same as 'qv' above )
-         *      (string) expected redirect location
-         * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
-         */
-         return array(
-             // Check against an odd redirect
-             array( '/page/2/', '/page/2/', 20385 ),
-             // The page designated as the front page should redirect to the front of the site
-             array( '/front-page/', '/' ),
-             array( '/blog-page/?paged=2', '/blog-page/page/2/' ),
-         );
-    }
-}
-
-/**
- * @group canonical
- * @group rewrite
- * @group query
- */
-class WP_Canonical_CustomRules extends WP_Test_Canonical {
-    function setUp() {
-        parent::setUp();
-        global $wp_rewrite;
-        // Add a custom Rewrite rule to test category redirections.
-        $wp_rewrite->add_rule('ccr/(.+?)/sort/(asc|desc)', 'index.php?category_name=$matches[1]&order=$matches[2]', 'top'); // ccr = Custom_Cat_Rule
-        $wp_rewrite->flush_rules();
-    }
-
-    function data() {
-        /* Format:
-         * [0]: $test_url,
-         * [1]: expected results: Any of the following can be used
-         *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
-         *      array( expected query vars to be set, same as 'qv' above )
-         *      (string) expected redirect location
-         * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
-         */
-        return array(
-            // Custom Rewrite rules leading to Categories
-            array( '/ccr/uncategorized/sort/asc/', array( 'url' => '/ccr/uncategorized/sort/asc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'asc' ) ) ),
-            array( '/ccr/uncategorized/sort/desc/', array( 'url' => '/ccr/uncategorized/sort/desc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc' ) ) ),
-            array( '/ccr/uncategorized/sort/desc/?year=2008', array( 'url' => '/ccr/uncategorized/sort/desc/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc', 'year' => '2008' ) ), 17661 ),
-        );
-    }
-}
-
-/**
- * @group canonical
- * @group rewrite
- * @group query
- */
-class WP_Canonical_NoRewrite extends WP_Test_Canonical {
-
-    var $structure = '';
-
-    // These test cases are run against the test handler in WP_Canonical
-
-    function data() {
-        /* Format:
-         * [0]: $test_url,
-         * [1]: expected results: Any of the following can be used
-         *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
-         *      array( expected query vars to be set, same as 'qv' above )
-         *      (string) expected redirect location
-         * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
-         */
-        return array(
-            array( '/?p=123', '/?p=123' ),
-
-            // This post_type arg should be stripped, because p=1 exists, and does not have post_type= in its query string
-            array( '/?post_type=fake-cpt&p=1', '/?p=1' ),
-
-            // Strip an existing but incorrect post_type arg
-            array( '/?post_type=page&page_id=1', '/?p=1' ),
-
-            array( '/?p=358 ', array('url' => '/?p=358',  'qv' => array('p' => '358') ) ), // Trailing spaces
-            array( '/?p=358%20', array('url' => '/?p=358',  'qv' => array('p' => '358') ) ),
-
-            array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another
-            array( '/?page_id=1&post_type=revision', '/?p=1' ),
-
-        );
-    }
-}