Index: tests/media.php
===================================================================
--- tests/media.php	(revision 1309)
+++ tests/media.php	(working copy)
@@ -198,126 +198,6 @@
 	/**
 	 * @ticket 22960
 	 */
-	function test_get_attached_image_srcs() {
-		$post_id = $this->factory->post->create();
-		$this->factory->attachment->create_object( $this->img_name, $post_id, array(
-			'post_mime_type' => 'image/jpeg',
-			'post_type' => 'attachment'
-		) );
-
-		$images = get_attached_image_srcs( $post_id );
-		$this->assertEquals( $images, array( $this->img_url ) );
-	}
-
-	/**
-	 * @ticket 22960
-	 */
-	function test_content_images() {
-		$src1 = $this->img_url;
-		$html1 = $this->img_html;
-		$src2 = str_replace( '.jpg', '2.jpg', $this->img_url );
-		$html2 = str_replace( $src1, $src2, $this->img_html );
-		$src3 = str_replace( '.jpg', '3.jpg', $this->img_url );
-		$html3 = str_replace( $src1, $src3, $this->img_html );
-
-		$blob =<<<BLOB
-This is a sentence that will all of a sudden contain {$html1} and then {$html2} and why not {$html3}
-BLOB;
-
-		$images = get_content_images( $blob );
-		$this->assertEquals( $images, array( $html1, $html2, $html3 ) );
-
-		$images = get_content_images( $blob, false );
-		$this->assertEquals( $images, array( $src1, $src2, $src3 ) );
-
-		$images = get_content_images( $blob, true );
-		$this->assertEquals( $images, array( $html1, $html2, $html3 ) );
-
-		$images = get_content_images( $blob, false );
-		$this->assertEquals( $images, array( $src1, $src2, $src3 ) );
-
-		$images = get_content_images( $blob, true, 1 );
-		$this->assertEquals( $images, array( $html1 ) );
-
-		$images = get_content_images( $blob, false, 1 );
-		$this->assertEquals( $images, array( $src1 ) );
-	}
-
-	/**
-	 * @ticket 22960
-	 */
-	function test_content_image() {
-		$blob =<<<BLOB
-This is a sentence that will all of a sudden contain {$this->img_html}
-BLOB;
-
-		$image = get_content_image( $blob );
-		$this->assertEquals( $image, $this->img_html );
-
-		$image = get_content_image( $blob, false );
-		$this->assertEquals( $image, $this->img_url );
-
-		$linked_html = '<a href="http://woo.com">' . $this->img_html . '</a>';
-		$blob = "This is a sentence that will all of a sudden contain $linked_html";
-		$image = get_content_image( $blob );
-		$this->assertEquals( $image, $linked_html );
-
-		$captioned_html = '[caption width="300"]<a href="http://woo.com">' . $this->img_html . '</a> A Caption[/caption]';
-		$blob = "This is a sentence that will all of a sudden contain $captioned_html";
-		$result = '<div class="wp-caption alignnone" style="width: 310px"><a href="http://woo.com"><img src="http://example.org/wp-content/uploads/image.jpg"/></a><p class="wp-caption-text">A Caption</p></div>';
-		$image = get_content_image( $blob );
-		$this->assertEquals( $image, $result );
-	}
-
-	/**
-	 * @ticket 22960
-	 */
-	function test_content_galleries() {
-		$ids1 = array();
-		$ids1_srcs = array();
-		foreach ( range( 1, 3 ) as $i ) {
-			$attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
-				'post_mime_type' => 'image/jpeg',
-				'post_type' => 'attachment'
-			) );
-			wp_update_attachment_metadata( $attachment_id, $this->img_dimensions );
-			$ids1[] = $attachment_id;
-			$ids1_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
-		}
-
-		$ids2 = array();
-		$ids2_srcs = array();
-		foreach ( range( 4, 6 ) as $i ) {
-			$attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
-				'post_mime_type' => 'image/jpeg',
-				'post_type' => 'attachment'
-			) );
-			wp_update_attachment_metadata( $attachment_id, $this->img_dimensions );
-			$ids2[] = $attachment_id;
-			$ids2_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
-		}
-
-		$ids1_joined = join( ',', $ids1 );
-		$ids2_joined = join( ',', $ids2 );
-
-		$blob =<<<BLOB
-[gallery ids="$ids1_joined"]
-
-[gallery ids="$ids2_joined"]
-BLOB;
-
-		$post_id = $this->factory->post->create( array( 'post_content' => $blob ) );
-		$galleries = get_content_galleries( get_post_field( 'post_content', $post_id ), false );
-		$expected = array(
-			array( 'ids' => $ids1_joined, 'src' => $ids1_srcs ),
-			array( 'ids' => $ids2_joined, 'src' => $ids2_srcs )
-		);
-		$this->assertEquals( $galleries, $expected );
-	}
-
-	/**
-	 * @ticket 22960
-	 */
 	function test_post_galleries_images() {
 		$ids1 = array();
 		$ids1_srcs = array();
@@ -356,95 +236,4 @@
 		$this->assertEquals( $srcs, array( $ids1_srcs, $ids2_srcs ) );
 	}
 
-	/**
-	 * @ticket 22960
-	 */
-	function test_post_gallery_images() {
-		$ids1 = array();
-		$ids1_srcs = array();
-		foreach ( range( 1, 3 ) as $i ) {
-			$attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
-				'post_mime_type' => 'image/jpeg',
-				'post_type' => 'attachment'
-			) );
-			wp_update_attachment_metadata( $attachment_id, $this->img_dimensions );
-			$ids1[] = $attachment_id;
-			$ids1_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
-		}
-
-		$ids2 = array();
-		$ids2_srcs = array();
-		foreach ( range( 4, 6 ) as $i ) {
-			$attachment_id = $this->factory->attachment->create_object( "image$i.jpg", 0, array(
-				'post_mime_type' => 'image/jpeg',
-				'post_type' => 'attachment'
-			) );
-			wp_update_attachment_metadata( $attachment_id, $this->img_dimensions );
-			$ids2[] = $attachment_id;
-			$ids2_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
-		}
-
-		$ids1_joined = join( ',', $ids1 );
-		$ids2_joined = join( ',', $ids2 );
-
-		$blob =<<<BLOB
-[gallery ids="$ids1_joined"]
-
-[gallery ids="$ids2_joined"]
-BLOB;
-		$post_id = $this->factory->post->create( array( 'post_content' => $blob ) );
-		$srcs = get_post_gallery_images( $post_id );
-		$this->assertEquals( $srcs, $ids1_srcs );
-	}
-
-	function test_get_embedded_media() {
-		$obj =<<<OBJ
-<object src="this" data="that">
-	<param name="value"/>
-</object>
-OBJ;
-		$embed =<<<EMBED
-<embed src="something.mp4"/>
-EMBED;
-		$iframe =<<<IFRAME
-<iframe src="youtube.com" width="7000" />
-IFRAME;
-		$audio =<<<AUDIO
-<audio preload="none">
-	<source />
-</audio>
-AUDIO;
-		$video =<<<VIDEO
-<video preload="none">
-	<source />
-</video>
-VIDEO;
-
-		$content =<<<CONTENT
-This is a comment
-$obj
-
-This is a comment
-$embed
-
-This is a comment
-$iframe
-
-This is a comment
-$audio
-
-This is a comment
-$video
-
-This is a comment
-CONTENT;
-
-		$audios = array_values( compact( 'audio', 'obj', 'embed', 'iframe' ) );
-		$videos = array_values( compact( 'video', 'obj', 'embed', 'iframe' ) );
-
-		$matches = get_embedded_media( 'audio', $content );
-		$this->assertEquals( $matches, $audios );
-		$matches = get_embedded_media( 'video', $content );
-		$this->assertEquals( $matches, $videos );
-	}
 }