<!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>[34775] trunk/tests/phpunit/tests/image/intermediate_size.php: More explicit tests for `image_get_intermediate_size()`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34775">34775</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34775","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-02 14:13:15 +0000 (Fri, 02 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>More explicit tests for `image_get_intermediate_size()`.
After <a href="https://core.trac.wordpress.org/changeset/33807">[33807]</a>, `Tests_Image_Intermediate_Size::test_get_intermediate_sizes_by_array_zero_width()`
was failing intermittently. This failure was due to the use of a random number
for the image height. When the height was sufficiently large - $height >= 202 -
to change the aspect ratio of the cropped image (based on WP's threshold of a
1px difference), the test passed. And when the height was exactly 200, the
medium image size was hit exactly. The failure occurred only with a height of
201, which is close enough to 200 so that WP determined that the aspect ratio
of the potential crop was close enough to match.
The current changeset splits the test into two, in order to demonstrate the
failure.
See <a href="https://core.trac.wordpress.org/ticket/17626">#17626</a>. Fixes <a href="https://core.trac.wordpress.org/ticket/34087">#34087</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsimageintermediate_sizephp">trunk/tests/phpunit/tests/image/intermediate_size.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsimageintermediate_sizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/intermediate_size.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediate_size.php 2015-10-02 13:50:18 UTC (rev 34774)
+++ trunk/tests/phpunit/tests/image/intermediate_size.php 2015-10-02 14:13:15 UTC (rev 34775)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,26 +214,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 17626
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 17626
+ * @ticket 34087
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_array_zero_width() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Generate random height
- $random_h = rand( 200, 300 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 202 is the smallest height that will trigger a miss for 'false-height'.
+ $height = 202;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only one dimention match shouldn't return false positive (see: 17626)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_image_size( 'test-size', 0, $random_h, false );
- add_image_size( 'false-height', 300, $random_h, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_image_size( 'test-size', 0, $height, false );
+ add_image_size( 'false-height', 300, $height, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->_make_attachment( $file, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original = wp_get_attachment_metadata( $id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_h = $random_h;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_h = $height;
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_w = round( ( $image_h / $original['height'] ) * $original['width'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // look for a size by array that exists
</span><span class="cx" style="display: block; padding: 0 10px"> // note: staying larger than 300px to miss default medium crop
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = image_get_intermediate_size( $id, array( 0, $random_h ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = image_get_intermediate_size( $id, array( 0, $height ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // test for the expected string because the array will by definition
</span><span class="cx" style="display: block; padding: 0 10px"> // return with the correct height and width attributes
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,4 +244,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'test-size' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_image_size( 'false-height' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 17626
+ * @ticket 34087
+ */
+ public function test_get_intermediate_sizes_should_match_size_with_off_by_one_aspect_ratio() {
+ // Original is 600x400. 300x201 is close enough to match.
+ $width = 300;
+ $height = 201;
+ add_image_size( 'off-by-one', $width, $height, true );
+
+ $file = DIR_TESTDATA . '/images/waffles.jpg';
+ $id = $this->_make_attachment( $file, 0 );
+
+ $original = wp_get_attachment_metadata( $id );
+ $image_h = $height;
+ $image_w = round( ( $image_h / $original['height'] ) * $original['width'] );
+
+ // look for a size by array that exists
+ // note: staying larger than 300px to miss default medium crop
+ $image = image_get_intermediate_size( $id, array( 0, $height ) );
+
+ $this->assertTrue( strpos( $image['file'], $width . 'x' . $height ) > 0 );
+
+ // cleanup
+ remove_image_size( 'off-by-one' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>