<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25382] trunk/tests/phpunit/tests/media.php: * Fix the horrendous whitespace in `tests/media.php`</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25382">25382</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 04:55:24 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Fix the horrendous whitespace in `tests/media.php`
* Suppress the deprecated function notice for `wp_convert_bytes_to_hr()`
* Add assertions for `size_format()`
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/media.php (25381 => 25382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/media.php 2013-09-12 04:46:49 UTC (rev 25381)
+++ trunk/tests/phpunit/tests/media.php 2013-09-12 04:55:24 UTC (rev 25382)
</span><span class="lines">@@ -6,108 +6,124 @@
</span><span class="cx"> */
</span><span class="cx"> class Tests_Media extends WP_UnitTestCase {
</span><span class="cx">
</span><del>- function setUp() {
- parent::setUp();
- $this->caption = 'A simple caption.';
- $this->html_content = <<<CAP
</del><ins>+ function setUp() {
+ parent::setUp();
+ $this->caption = 'A simple caption.';
+ $this->html_content = <<<CAP
</ins><span class="cx"> A <strong class='classy'>bolded</strong> <em>caption</em> with a <a href="#">link</a>.
</span><span class="cx"> CAP;
</span><del>- $this->img_content = <<<CAP
</del><ins>+ $this->img_content = <<<CAP
</ins><span class="cx"> <img src="pic.jpg" id='anId' alt="pic"/>
</span><span class="cx"> CAP;
</span><del>- $this->img_name = 'image.jpg';
- $this->img_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $this->img_name;
- $this->img_html = '<img src="' . $this->img_url . '"/>';
- $this->img_dimensions = array( 'width' => 100, 'height' => 100 );
- }
</del><ins>+ $this->img_name = 'image.jpg';
+ $this->img_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $this->img_name;
+ $this->img_html = '<img src="' . $this->img_url . '"/>';
+ $this->img_dimensions = array( 'width' => 100, 'height' => 100 );
+ add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
+ }
</ins><span class="cx">
</span><del>- function test_img_caption_shortcode_added() {
- global $shortcode_tags;
- $this->assertEquals( 'img_caption_shortcode', $shortcode_tags['caption'] );
- $this->assertEquals( 'img_caption_shortcode', $shortcode_tags['wp_caption'] );
- }
</del><ins>+ function tearDown() {
+ parent::tearDown();
+ remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
+ }
</ins><span class="cx">
</span><del>- function test_img_caption_shortcode_with_empty_params() {
- $result = img_caption_shortcode( array() );
- $this->assertNull( $result );
- }
</del><ins>+ function deprecated_function_run( $function ) {
+ if ( in_array( $function, array( 'wp_convert_bytes_to_hr' ) ) )
+ add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+ }
</ins><span class="cx">
</span><del>- function test_img_caption_shortcode_with_bad_attr() {
- $result = img_caption_shortcode( array(), 'content' );
- $this->assertEquals( 'content', 'content' );
- }
</del><ins>+ function deprecated_function_trigger_error() {
+ remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+ return false;
+ }
</ins><span class="cx">
</span><del>- function test_img_caption_shortcode_with_old_format() {
- $result = img_caption_shortcode(
- array( 'width' => 20, 'caption' => $this->caption )
- );
- $this->assertEquals( 2, preg_match_all( '/wp-caption/', $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( '/alignnone/', $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "/width: 30/", $result, $_r ) );
- }
</del><ins>+ function test_img_caption_shortcode_added() {
+ global $shortcode_tags;
+ $this->assertEquals( 'img_caption_shortcode', $shortcode_tags['caption'] );
+ $this->assertEquals( 'img_caption_shortcode', $shortcode_tags['wp_caption'] );
+ }
</ins><span class="cx">
</span><del>- function test_img_caption_shortcode_with_old_format_id_and_align() {
- $result = img_caption_shortcode(
- array(
- 'width' => 20,
- 'caption' => $this->caption,
- 'id' => '"myId',
- 'align' => '&myAlignment'
- )
- );
- $this->assertEquals( 1, preg_match_all( '/wp-caption &myAlignment/', $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( '/id=""myId"/', $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
- }
</del><ins>+ function test_img_caption_shortcode_with_empty_params() {
+ $result = img_caption_shortcode( array() );
+ $this->assertNull( $result );
+ }
</ins><span class="cx">
</span><del>- function test_new_img_caption_shortcode_with_html_caption() {
- $result = img_caption_shortcode(
- array( 'width' => 20, 'caption' => $this->html_content )
- );
- $our_preg = preg_quote( $this->html_content );
</del><ins>+ function test_img_caption_shortcode_with_bad_attr() {
+ $result = img_caption_shortcode( array(), 'content' );
+ $this->assertEquals( 'content', 'content' );
+ }
</ins><span class="cx">
</span><del>- $this->assertEquals( 1, preg_match_all( "~{$our_preg}~", $result, $_r ) );
- }
</del><ins>+ function test_img_caption_shortcode_with_old_format() {
+ $result = img_caption_shortcode(
+ array( 'width' => 20, 'caption' => $this->caption )
+ );
+ $this->assertEquals( 2, preg_match_all( '/wp-caption/', $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( '/alignnone/', $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "/width: 30/", $result, $_r ) );
+ }
</ins><span class="cx">
</span><del>- function test_new_img_caption_shortcode_new_format() {
- $result = img_caption_shortcode(
- array( 'width' => 20 ),
- $this->img_content . $this->html_content
- );
- $img_preg = preg_quote( $this->img_content );
- $content_preg = preg_quote( $this->html_content );
</del><ins>+ function test_img_caption_shortcode_with_old_format_id_and_align() {
+ $result = img_caption_shortcode(
+ array(
+ 'width' => 20,
+ 'caption' => $this->caption,
+ 'id' => '"myId',
+ 'align' => '&myAlignment'
+ )
+ );
+ $this->assertEquals( 1, preg_match_all( '/wp-caption &myAlignment/', $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( '/id=""myId"/', $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
+ }
</ins><span class="cx">
</span><del>- $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
- }
</del><ins>+ function test_new_img_caption_shortcode_with_html_caption() {
+ $result = img_caption_shortcode(
+ array( 'width' => 20, 'caption' => $this->html_content )
+ );
+ $our_preg = preg_quote( $this->html_content );
</ins><span class="cx">
</span><del>- function test_new_img_caption_shortcode_new_format_and_linked_image() {
- $linked_image = "<a href='#'>{$this->img_content}</a>";
- $result = img_caption_shortcode(
- array( 'width' => 20 ),
- $linked_image . $this->html_content
- );
- $img_preg = preg_quote( $linked_image );
- $content_preg = preg_quote( $this->html_content );
</del><ins>+ $this->assertEquals( 1, preg_match_all( "~{$our_preg}~", $result, $_r ) );
+ }
</ins><span class="cx">
</span><del>- $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
- }
</del><ins>+ function test_new_img_caption_shortcode_new_format() {
+ $result = img_caption_shortcode(
+ array( 'width' => 20 ),
+ $this->img_content . $this->html_content
+ );
+ $img_preg = preg_quote( $this->img_content );
+ $content_preg = preg_quote( $this->html_content );
</ins><span class="cx">
</span><del>- function test_new_img_caption_shortcode_new_format_and_linked_image_with_newline() {
- $linked_image = "<a href='#'>{$this->img_content}</a>";
- $result = img_caption_shortcode(
- array( 'width' => 20 ),
- $linked_image . "\n\n" . $this->html_content
- );
- $img_preg = preg_quote( $linked_image );
- $content_preg = preg_quote( $this->html_content );
</del><ins>+ $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+ }
</ins><span class="cx">
</span><del>- $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
- $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
- }
</del><ins>+ function test_new_img_caption_shortcode_new_format_and_linked_image() {
+ $linked_image = "<a href='#'>{$this->img_content}</a>";
+ $result = img_caption_shortcode(
+ array( 'width' => 20 ),
+ $linked_image . $this->html_content
+ );
+ $img_preg = preg_quote( $linked_image );
+ $content_preg = preg_quote( $this->html_content );
</ins><span class="cx">
</span><ins>+ $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+ }
+
+ function test_new_img_caption_shortcode_new_format_and_linked_image_with_newline() {
+ $linked_image = "<a href='#'>{$this->img_content}</a>";
+ $result = img_caption_shortcode(
+ array( 'width' => 20 ),
+ $linked_image . "\n\n" . $this->html_content
+ );
+ $img_preg = preg_quote( $linked_image );
+ $content_preg = preg_quote( $this->html_content );
+
+ $this->assertEquals( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
+ $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+ }
+
</ins><span class="cx"> function test_add_remove_oembed_provider() {
</span><span class="cx"> wp_oembed_add_provider( 'http://foo.bar/*', 'http://foo.bar/oembed' );
</span><span class="cx"> $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
</span><span class="lines">@@ -163,6 +179,11 @@
</span><span class="cx"> $this->assertEquals( '1MB', wp_convert_bytes_to_hr( $mb ) );
</span><span class="cx"> $this->assertEquals( '1kB', wp_convert_bytes_to_hr( $kb ) );
</span><span class="cx">
</span><ins>+ $this->assertEquals( '1 TB', size_format( $tb ) );
+ $this->assertEquals( '1 GB', size_format( $gb ) );
+ $this->assertEquals( '1 MB', size_format( $mb ) );
+ $this->assertEquals( '1 kB', size_format( $kb ) );
+
</ins><span class="cx"> // now some values around
</span><span class="cx"> $hr = wp_convert_bytes_to_hr( $tb + $tb / 2 + $mb );
</span><span class="cx"> $this->assertTrue( abs( 1.50000095367 - (float) str_replace( ',', '.', $hr ) ) < 0.0001 );
</span></span></pre>
</div>
</div>
</body>
</html>