Returning back the insert part of a merged test

Author: SirLouen

tests/phpunit/tests/post/wpInsertPost.php

@@ -529,7 +529,6 @@ public function test_wp_insert_post_should_invalidate_post_cache_before_generati
 
 	/**
 	 * @ticket 55877
-	 * @covers ::wp_insert_post
 	 */
 	public function test_wp_insert_post_should_not_trigger_warning_for_pending_posts_with_unknown_cpt() {
 		$post_id = wp_insert_post(
@@ -634,6 +633,20 @@ public function test_get_post_ancestors_within_loop() {
 		$this->assertSame( array( $parent_id ), get_post_ancestors( 0 ) );
 	}
 
+	/**
+	 * @ticket 23474
+	 */
+	public function test_insert_invalid_post_id() {
+		$post_id = self::factory()->post->create();
+		$post    = get_post( $post_id, ARRAY_A );
+
+		$post['ID'] = 123456789;
+
+		$this->assertSame( 0, wp_insert_post( $post ) );
+
+		$this->assertInstanceOf( 'WP_Error', wp_insert_post( $post, true ) );
+	}
+
 	/**
 	 * @ticket 19373
 	 */

tests/phpunit/tests/post/wpUpdatePost.php

@@ -109,10 +109,8 @@ public function test_update_invalid_post_id() {
 
 		$post['ID'] = 123456789;
 
-		$this->assertSame( 0, wp_insert_post( $post ) );
 		$this->assertSame( 0, wp_update_post( $post ) );
 
-		$this->assertInstanceOf( 'WP_Error', wp_insert_post( $post, true ) );
 		$this->assertInstanceOf( 'WP_Error', wp_update_post( $post, true ) );
 	}
 
@@ -194,11 +192,11 @@ public function test_wp_update_post_with_content_filtering() {
 	 *
 	 * @ticket 62468
 	 *
-	 * @dataProvider data_post_status_transitions
+	 * @dataProvider data_update_post_preserves_date_for_future_posts
 	 *
 	 * @param string $initial_status Initial post status.
 	 */
-	public function test_update_post_preserves_date( $initial_status ) {
+	public function test_update_post_preserves_date_for_future_posts( $initial_status ) {
 
 		$post_id = self::factory()->post->create(
 			array(
@@ -220,11 +218,11 @@ public function test_update_post_preserves_date( $initial_status ) {
 	}
 
 	/**
-	 * Data provider for test_update_post_preserves_date
+	 * Data provider for test_update_post_preserves_date_for_future_posts
 	 *
 	 * @return array[] Test parameters
 	 */
-	public function data_post_status_transitions() {
+	public function data_update_post_preserves_date_for_future_posts() {
 		return array(
 			'pending to future' => array(
 				'initial_status' => 'pending',