Changeset 865 in tests for trunk/wp-testcase/test_query.php

Timestamp:

07/02/2012 06:15:04 PM (14 years ago)

Author:

nacin

Message:

For query tests that don't require a post (or comment) to pass, test twice - with and without posts/comments.

Remove cruft. Uncomment knownWPBug (it passes in 3.5, but the ticket is currently open for discussion).

Remove @ticket, as these get picked up as groups.

Exclude final file to be ported, this time with a relative path. see #97.

File:

• trunk/wp-testcase/test_query.php (modified) (9 diffs)

trunk/wp-testcase/test_query.php

@@ -31 +31 @@
                 parent::tearDown();
                 $GLOBALS['wp_rewrite']->init();
-        }
-
-        function _all_post_ids( $type='post' ) {
-                global $wpdb;
-                return $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s and post_status='publish'", $type ) );
         }
 
@@ -100 +95 @@
         function test_post_comments_feed() {
                 $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
-                // Comments aren't needed for this test to pass.
-                // $this->factory->comment->create_post_comments( $post_id, 2 );
+                $this->factory->comment->create_post_comments( $post_id, 2 );
+                $this->go_to( get_post_comments_feed_link( $post_id ) );
+                $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
+        }
+
+
+        function test_post_comments_feed_with_no_comments() {
+                $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
                 $this->go_to( get_post_comments_feed_link( $post_id ) );
                 $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
@@ -162 +163 @@
                 $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
-                        // Comments aren't needed for this test to pass.
-                        // $this->factory->comment->create_post_comments( $page_id, 2 );
-
+                        $this->factory->comment->create_post_comments( $page_id, 2 );
                         $url = get_permalink( $page_id );
                         $this->go_to("{$url}feed/");
@@ -175 +174 @@
                         $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
                 }
-
+        }
+
+        function test_page_feed_with_no_comments() {
+                $page_ids = array();
+                $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                foreach ( $page_ids as $page_id ) {
+                        $url = get_permalink( $page_id );
+                        $this->go_to("{$url}feed/");
+
+                        // make sure the correct wp_query flags are set
+                        $this->assertQueryTrue('is_page', 'is_singular', 'is_feed', 'is_comment_feed');
+
+                        // make sure the correct page was fetched
+                        global $wp_query;
+                        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
+                }
         }
 
@@ -185 +201 @@
                 $page_ids[] = $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
-                        // Comments aren't needed for this test to pass.
-                        // $this->factory->comment->create_post_comments( $page_id, 2 );
+                        $this->factory->comment->create_post_comments( $page_id, 2 );
 
                         $url = get_permalink( $page_id );
@@ -344 +359 @@
 
         function test_search_encoded_chars() {
-                // $this->knownWPBug(13961);
+                $this->knownWPBug(13961);
                 $this->go_to('/search/F%C3%BCnf%2Bbar/');
                 $this->assertEquals( get_query_var( 's' ), 'Fünf+bar' );
@@ -406 +421 @@
                 foreach ( $post_ids as $post_id )
                         $this->factory->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
-                // $this->markTestSkipped(); // tag-a doesn't have enough posts -> 404
                 $this->go_to('/tag/tag-a/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_tag', 'is_paged');
@@ -448 +462 @@
         function test_author() {
                 $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
-                // A post isn't needed for this test to pass.
-                // $this->factory->post->create( array( 'post_author' => $user_id ) );
+                $this->factory->post->create( array( 'post_author' => $user_id ) );
+                $this->go_to('/author/user-a/');
+                $this->assertQueryTrue('is_archive', 'is_author');
+        }
+
+        function test_author_with_no_posts() {
+                $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
                 $this->go_to('/author/user-a/');
                 $this->assertQueryTrue('is_archive', 'is_author');
@@ -588 +607 @@
                         'post_content' => 'Page 1 <!--nextpage--> Page 2'
                 ) );
-                // $this->markTestSkipped(); // @todo post doesn't exist in Data Set 1
-                // and the short version
                 $this->go_to('/2007/09/04/a-post-with-multiple-pages/2/');
                 // should is_paged be true also?