Changeset 863 in tests

Timestamp:

07/02/2012 05:58:37 PM (14 years ago)

Author:

nacin

Message:

Move all factory work for test_query.php into individual tests. No skipped tests, no incomplete tests. see #96. see #WP21138.

File:

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

trunk/wp-testcase/test_query.php

@@ -22 +22 @@
         $GLOBALS['wp_rewrite']->init();
         flush_rewrite_rules();
-
-        $this->post_ids[] = $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
-        $this->factory->comment->create_post_comments( $post_id, 2 );
-
-        $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
-        $this->page_ids[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
-        $post_ids = $this->factory->post->create_many( 15, array( 'post_date' => '2007-09-04 00:00:00', 'post_content' => 'This content includes "test"', 'post_author' => $user_id ) );
-        foreach ( $post_ids as $post_id ) {
-            $this->factory->comment->create_post_comments( $post_id, 2 );
-            $this->factory->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
-        }
-        $this->post_ids = array_merge( $this->post_ids, $post_ids );
-
-        $this->factory->post->create( array( 'import_id' => 8, 'post_type' => 'attachment' ) );
-        $this->post_ids[] = $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00', 'post_title' => 'a-post-with-multiple-pages', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
-
-        $this->post_ids[] = $post_id = $this->factory->post->create();
-        $cat_id = $this->factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
-        $this->factory->term->add_post_terms( $post_id, $cat_id, 'category' );
-
-        $this->page_ids[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'lorem-ipsum' ) );
-        $this->page_ids[] = $post_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-        $this->page_ids[] = $post_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $post_id ) );
-        $this->page_ids[] = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $post_id ) );
     }
 
@@ -113 +89 @@
 
     function test_permalink() {
-        $this->go_to( get_permalink( get_page_by_path( 'hello-world', OBJECT, 'post' ) ) );
+        $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
+        $this->go_to( get_permalink( $post_id ) );
         $this->assertQueryTrue('is_single', 'is_singular');
     }
 
     function test_post_comments_feed() {
-        $this->go_to( get_post_comments_feed_link( get_page_by_path( 'hello-world', OBJECT, 'post' )->ID ) );
+        $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->go_to( get_post_comments_feed_link( $post_id ) );
         $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
     }
 
     function test_page() {
-        $page_id = get_page_by_path( 'about' );
-        $this->go_to(get_permalink($page_id));
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
+        $this->go_to( get_permalink( $page_id ) );
         $this->assertQueryTrue('is_page','is_singular');
     }
 
     function test_parent_page() {
-        $page_id = get_page_by_path( 'parent-page' );
-        $this->go_to(get_permalink($page_id));
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+        $this->go_to( get_permalink( $page_id ) );
 
         $this->assertQueryTrue('is_page','is_singular');
@@ -136 +116 @@
 
     function test_child_page_1() {
-        $page_id = get_page_by_path( 'parent-page/child-page-1' );
-        $this->go_to(get_permalink($page_id));
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+        $this->go_to( get_permalink( $page_id ) );
 
         $this->assertQueryTrue('is_page','is_singular');
@@ -143 +124 @@
 
     function test_child_page_2() {
-        $page_id = get_page_by_path( 'parent-page/child-page-1/child-page-2' );
-        $this->go_to(get_permalink($page_id));
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+        $this->go_to( get_permalink( $page_id ) );
 
         $this->assertQueryTrue('is_page','is_singular');
@@ -151 +134 @@
     // '(about)/trackback/?$' => 'index.php?pagename=$matches[1]&tb=1'
     function test_page_trackback() {
-        foreach ($this->page_ids as $page_id) {
-            $url = get_permalink($page_id);
+        $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}trackback/");
 
@@ -166 +153 @@
     //'(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
     function test_page_feed() {
-        foreach ($this->page_ids as $page_id) {
-            $url = get_permalink($page_id);
+        $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 ) {
+            // Comments aren't needed for this test to pass.
+            // $this->factory->comment->create_post_comments( $page_id, 2 );
+
+            $url = get_permalink( $page_id );
             $this->go_to("{$url}feed/");
 
@@ -182 +176 @@
     // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
     function test_page_feed_atom() {
-        foreach ($this->page_ids as $page_id) {
-            $url = get_permalink($page_id);
+        $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 ) {
+            // Comments aren't needed for this test to pass.
+            // $this->factory->comment->create_post_comments( $page_id, 2 );
+
+            $url = get_permalink( $page_id );
             $this->go_to("{$url}feed/atom/");
 
@@ -197 +198 @@
     // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
     function test_page_page_2() {
-        foreach ($this->page_ids as $page_id) {
-            $url = get_permalink($page_id);
-            $this->go_to("{$url}page/2/");
-
-            // make sure the correct wp_query flags are set
-            $this->assertQueryTrue('is_page', 'is_singular', 'is_paged');
-
-            // make sure the correct page was fetched
-            global $wp_query;
-            $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
-        }
-    }
-
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+        $this->go_to("/about/page/2/");
+
+        // make sure the correct wp_query flags are set
+        $this->assertQueryTrue('is_page', 'is_singular', 'is_paged');
+
+        // make sure the correct page was fetched
+        global $wp_query;
+        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
+    }
+
+    // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
+    function test_page_page_2_no_slash() {
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+        $this->go_to("/about/page2/");
+
+        // make sure the correct wp_query flags are set
+        $this->assertQueryTrue('is_page', 'is_singular', 'is_paged');
+
+        // make sure the correct page was fetched
+        global $wp_query;
+        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
+    }
+    
     // FIXME: what is this for?
     // '(about)(/[0-9]+)?/?$' => 'index.php?pagename=$matches[1]&page=$matches[2]'
-    function test_page_page_2_short() {
-        //return $this->markTestSkipped();
-        // identical to /about/page/2/ ?
+    function test_pagination_of_posts_page() {
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+        update_option( 'show_on_front', 'page' );
+        update_option( 'page_for_posts', $page_id );
+
         $this->go_to('/about/2/');
 
-        $this->assertQueryTrue('is_page', 'is_singular');
+        $this->assertQueryTrue( 'is_home', 'is_posts_page' );
+
+        // make sure the correct page was fetched
+        global $wp_query;
+        $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
     }
 
@@ -229 +247 @@
     // '(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
     function test_main_feed_2() {
+        $this->factory->post->create(); // @test_404
         $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
@@ -246 +265 @@
 
     function test_main_feed() {
+        $this->factory->post->create(); // @test_404
         $types = array('rss2', 'rss', 'atom');
         foreach ($types as $type) {
@@ -255 +275 @@
     // 'page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
     function test_paged() {
-        for ($i=2; $i<4; $i++) {
+        $this->factory->post->create_many( 15 );
+        for ( $i = 2; $i <= 3; $i++ ) {
             $this->go_to("/page/{$i}/");
             $this->assertQueryTrue('is_home', 'is_paged');
@@ -264 +285 @@
     // 'comments/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
     function test_main_comments_feed() {
+        $post_id = $this->factory->post->create( array( 'post_title' => 'hello-world' ) );
+        $this->factory->comment->create_post_comments( $post_id, 2 );
+
         // check the url as generated by get_post_comments_feed_link()
-        $this->go_to( get_post_comments_feed_link( get_page_by_path( 'hello-world', OBJECT, 'post' )->ID ) );
+        $this->go_to( get_post_comments_feed_link( $post_id ) );
         $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
 
@@ -283 +307 @@
 
     }
-
-    // 'comments/page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
-    function test_comments_page() {
-        $this->go_to('/comments/page/2/');
-        $this->assertQueryTrue('is_home', 'is_paged');
-    }
-
 
     // 'search/(.+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?s=$matches[1]&feed=$matches[2]',
@@ -311 +328 @@
     // 'search/(.+)/page/?([0-9]{1,})/?$' => 'index.php?s=$matches[1]&paged=$matches[2]',
     function test_search_paged() {
+        $this->factory->post->create_many( 10, array( 'post_title' => 'test' ) );
         $this->go_to('/search/test/page/2/');
         $this->assertQueryTrue('is_search', 'is_paged');
@@ -322 +340 @@
 
     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' );
@@ -330 +348 @@
     // 'category/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
     function test_category_feed() {
+        $this->factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -347 +366 @@
     // 'category/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?category_name=$matches[1]&paged=$matches[2]',
     function test_category_paged() {
+        $this->factory->post->create_many( 10 );
         $this->go_to('/category/uncategorized/page/2/');
         $this->assertQueryTrue('is_archive', 'is_category', 'is_paged');
@@ -353 +373 @@
     // 'category/(.+?)/?$' => 'index.php?category_name=$matches[1]',
     function test_category() {
+        $this->factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
         $this->go_to('/category/cat-a/');
         $this->assertQueryTrue('is_archive', 'is_category');
@@ -360 +381 @@
     // 'tag/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
     function test_tag_feed() {
+        $this->factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -377 +399 @@
     // 'tag/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?tag=$matches[1]&paged=$matches[2]',
     function test_tag_paged() {
-        $this->markTestSkipped(); // tag-a doesn't have enough posts -> 404
+        $post_ids = $this->factory->post->create_many( 10 );
+        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');
@@ -384 +409 @@
     // 'tag/(.+?)/?$' => 'index.php?tag=$matches[1]',
     function test_tag() {
+        $this->factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
         $this->go_to('/tag/tag-a/');
         $this->assertQueryTrue('is_archive', 'is_tag');
@@ -391 +417 @@
     // 'author/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
     function test_author_feed() {
+        $this->factory->user->create( array( 'user_login' => 'user-a' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -408 +435 @@
     // 'author/([^/]+)/page/?([0-9]{1,})/?$' => 'index.php?author_name=$matches[1]&paged=$matches[2]',
     function test_author_paged() {
+        $user_id = $this->factory->user->create( array( 'user_login' => 'user-a' ) );
+        $this->factory->post->create_many( 10, array( 'post_author' => $user_id ) );
         $this->go_to('/author/user-a/page/2/');
         $this->assertQueryTrue('is_archive', 'is_author', 'is_paged');
@@ -414 +443 @@
     // 'author/([^/]+)/?$' => 'index.php?author_name=$matches[1]',
     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->go_to('/author/user-a/');
         $this->assertQueryTrue('is_archive', 'is_author');
@@ -421 +453 @@
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
     function test_ymd_feed() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -438 +471 @@
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&paged=$matches[4]',
     function test_ymd_paged() {
+        $this->factory->post->create_many( 10, array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/09/04/page/2/');
         $this->assertQueryTrue('is_archive', 'is_day', 'is_date', 'is_paged');
@@ -444 +478 @@
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]',
     function test_ymd() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/09/04/');
         $this->assertQueryTrue('is_archive', 'is_day', 'is_date');
@@ -451 +486 @@
     // '([0-9]{4})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
     function test_ym_feed() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -468 +504 @@
     // '([0-9]{4})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&paged=$matches[3]',
     function test_ym_paged() {
+        $this->factory->post->create_many( 10, array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/09/page/2/');
         $this->assertQueryTrue('is_archive', 'is_date', 'is_month', 'is_paged');
@@ -474 +511 @@
     // '([0-9]{4})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]',
     function test_ym() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/09/');
         $this->assertQueryTrue('is_archive', 'is_date', 'is_month');
@@ -481 +519 @@
     // '([0-9]{4})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
     function test_y_feed() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         // check the long form
         $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -498 +537 @@
     // '([0-9]{4})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&paged=$matches[2]',
     function test_y_paged() {
+        $this->factory->post->create_many( 10, array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/page/2/');
         $this->assertQueryTrue('is_archive', 'is_date', 'is_year', 'is_paged');
@@ -504 +544 @@
     // '([0-9]{4})/?$' => 'index.php?year=$matches[1]',
     function test_y() {
+        $this->factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
         $this->go_to('/2007/');
         $this->assertQueryTrue('is_archive', 'is_date', 'is_year');
     }
 
-
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/trackback/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&tb=1',
     function test_post_trackback() {
-        foreach ( $this->post_ids as $post_id ) {
-            $permalink = get_permalink( $post_id );
-            $this->go_to("{$permalink}trackback/");
-            $this->assertQueryTrue('is_single', 'is_singular', 'is_trackback');
-        }
+        $post_id = $this->factory->post->create();
+        $permalink = get_permalink( $post_id );
+        $this->go_to("{$permalink}trackback/");
+        $this->assertQueryTrue('is_single', 'is_singular', 'is_trackback');
     }
 
@@ -521 +560 @@
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
     function test_post_comment_feed() {
-        foreach ( $this->post_ids as $post_id ) {
-            $permalink = get_permalink( $post_id );
-
-            $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
-            foreach ($types as $type) {
-                    $this->go_to("{$permalink}feed/{$type}");
-                    $this->assertQueryTrue('is_single', 'is_singular', 'is_feed', 'is_comment_feed');
-            }
-
-            // check the short form
-            $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
-            foreach ($types as $type) {
-                    $this->go_to("{$permalink}{$type}");
-                    $this->assertQueryTrue('is_single', 'is_singular', 'is_feed', 'is_comment_feed');
-            }
-
-        }
-    }
-
-    // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&paged=$matches[5]',
-    function test_post_paged_long() {
-        $this->markTestSkipped(); // @todo post doesn't exist in Data Set 1, plus /page/x isn't for single posts
-        // the long version
-        $this->go_to('/2007/09/04/a-post-with-multiple-pages/page/2/');
-        // should is_paged be true also?
-        $this->assertQueryTrue('is_single', 'is_singular');
+        $post_id = $this->factory->post->create();
+        $permalink = get_permalink( $post_id );
+
+        $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
+        foreach ($types as $type) {
+                $this->go_to("{$permalink}feed/{$type}");
+                $this->assertQueryTrue('is_single', 'is_singular', 'is_feed', 'is_comment_feed');
+        }
+
+        // check the short form
+        $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
+        foreach ($types as $type) {
+                $this->go_to("{$permalink}{$type}");
+                $this->assertQueryTrue('is_single', 'is_singular', 'is_feed', 'is_comment_feed');
+        }
     }
 
     // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)(/[0-9]+)?/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&page=$matches[5]',
     function test_post_paged_short() {
-        $this->markTestSkipped(); // @todo post doesn't exist in Data Set 1
+        $this->factory->post->create( array(
+            'post_date' => '2007-09-04 00:00:00',
+            'post_title' => 'a-post-with-multiple-pages',
+            '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/');
@@ -561 +594 @@
     // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/([^/]+)/?$' => 'index.php?attachment=$matches[1]',
     function test_post_attachment() {
-        $this->markTestSkipped(); // @todo ID 8 is a page in Data Set 1
-        $permalink = get_attachment_link(8);
+        $post_id = $this->factory->post->create( array( 'post_type' => 'attachment' ) );
+        $permalink = get_attachment_link( $post_id );
         $this->go_to($permalink);
-        $this->assertQueryTrue('is_attachment', 'is_singular');
+        $this->assertQueryTrue('is_single', 'is_attachment', 'is_singular');
     }