Changeset 25972

Timestamp:

10/28/2013 09:49:27 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Move test_get_pages_include_exclude() and test_get_pages_parent() to tests/post/getPages.php. Add a @ticket reference. see [25168] and [25244].

Location:

trunk/tests/phpunit/tests

Files:

• post.php (modified) (1 diff)
• post/getPages.php (modified) (1 diff)

trunk/tests/phpunit/tests/post.php

@@ -830 +830 @@
         return $counts;
     }
-
-    /**
-     * @ticket 22074
-     */
-    function test_get_pages_include_exclude() {
-        $page_ids = array();
-
-        foreach ( range( 1, 20 ) as $i )
-            $page_ids[] = $this->factory->post->create( array( 'post_type' => 'page' ) );
-
-        $inc = array_slice( $page_ids, 0, 10 );
-        sort( $inc );
-        $exc = array_slice( $page_ids, 10 );
-        sort( $exc );
-
-        $include = get_pages( array( 'include' => $inc ) );
-        $inc_result = wp_list_pluck( $include, 'ID' );
-        sort( $inc_result );
-        $this->assertEquals( $inc, $inc_result );
-
-        $exclude = get_pages( array( 'exclude' => $exc ) );
-        $exc_result = wp_list_pluck( $exclude, 'ID' );
-        sort( $exc_result );
-        $this->assertEquals( $inc, $exc_result );
-    }
-
-    function test_get_pages_parent() {
-        $page_id1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
-        $page_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
-        $page_id3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
-        $page_id4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
-
-        $pages = get_pages( array( 'parent' => 0, 'hierarchical' => false ) );
-        $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
-
-        $pages = get_pages( array( 'parent' => $page_id1, 'hierarchical' => false ) );
-        $this->assertEqualSets( array( $page_id2, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
-
-        $pages = get_pages( array( 'parent' => array( $page_id1, $page_id2 ), 'hierarchical' => false ) );
-        $this->assertEqualSets( array( $page_id2, $page_id3, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
-
-        $pages = get_pages( array( 'parent' => 0 ) );
-        $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
-
-        $pages = get_pages( array( 'parent' => $page_id1 ) );
-        $this->assertEqualSets( array( $page_id2, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
-
-        $pages = get_pages( array( 'parent' => array( $page_id1, $page_id2 ) ) );
-        $this->assertEqualSets( array( $page_id2, $page_id3, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
-    }
 }

trunk/tests/phpunit/tests/post/getPages.php

@@ -109 +109 @@
 
     /**
+     * @ticket 22074
+     */
+    function test_get_pages_include_exclude() {
+        $page_ids = array();
+
+        foreach ( range( 1, 20 ) as $i )
+            $page_ids[] = $this->factory->post->create( array( 'post_type' => 'page' ) );
+
+        $inc = array_slice( $page_ids, 0, 10 );
+        sort( $inc );
+        $exc = array_slice( $page_ids, 10 );
+        sort( $exc );
+
+        $include = get_pages( array( 'include' => $inc ) );
+        $inc_result = wp_list_pluck( $include, 'ID' );
+        sort( $inc_result );
+        $this->assertEquals( $inc, $inc_result );
+
+        $exclude = get_pages( array( 'exclude' => $exc ) );
+        $exc_result = wp_list_pluck( $exclude, 'ID' );
+        sort( $exc_result );
+        $this->assertEquals( $inc, $exc_result );
+    }
+
+    /**
+     * @ticket 9470
+     */
+    function test_get_pages_parent() {
+        $page_id1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $page_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
+        $page_id3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
+        $page_id4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
+
+        $pages = get_pages( array( 'parent' => 0, 'hierarchical' => false ) );
+        $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
+
+        $pages = get_pages( array( 'parent' => $page_id1, 'hierarchical' => false ) );
+        $this->assertEqualSets( array( $page_id2, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
+
+        $pages = get_pages( array( 'parent' => array( $page_id1, $page_id2 ), 'hierarchical' => false ) );
+        $this->assertEqualSets( array( $page_id2, $page_id3, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
+
+        $pages = get_pages( array( 'parent' => 0 ) );
+        $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
+
+        $pages = get_pages( array( 'parent' => $page_id1 ) );
+        $this->assertEqualSets( array( $page_id2, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
+
+        $pages = get_pages( array( 'parent' => array( $page_id1, $page_id2 ) ) );
+        $this->assertEqualSets( array( $page_id2, $page_id3, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
+    }
+
+    /**
      * @ticket 22389
      */