<!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>[BuddyPress][12840] trunk/tests/phpunit: PHPUnit: fix failing tests about media</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 { white-space: pre-line; 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="http://buddypress.trac.wordpress.org/changeset/12840">12840</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12840","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-02-06 19:15:14 +0000 (Sat, 06 Feb 2021)</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'>PHPUnit: fix failing tests about media
Since WP [https://core.trac.wordpress.org/browser/trunk?rev=50170 50170] revision, errors about `getimagesize()` and `exif_read_data()` are not silenced anymore. We must now make sure to write media files where they should be for these two functions.
Tests involving `exif_read_data()` will be skipped from now on when testing against PHP 5.6 as no matter the image you use, you'll always get an `Illegal IDF size` error. It appears to be a bug with this version of PHP.
See <a href="http://buddypress.trac.wordpress.org/ticket/8432">#8432</a> (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasescoreclassbpattachmentphp">trunk/tests/phpunit/testcases/core/class-bp-attachment.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreclassbpmediaextractorphp">trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitassetscanolajpg">trunk/tests/phpunit/assets/canola.jpg</a></li>
<li><a href="#trunktestsphpunitassetstestimagelargejpg">trunk/tests/phpunit/assets/test-image-large.jpg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitassetscanolajpg"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/assets/canola.jpg</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk/tests/phpunit/assets/canola.jpg
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk/tests/phpunit/assets/canola.jpg 2021-02-05 18:35:27 UTC (rev 12839)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/tests/phpunit/assets/canola.jpg 2021-02-06 19:15:14 UTC (rev 12840)
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/assets/canola.jpg
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mime-type</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+image/jpeg
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitassetstestimagelargejpg"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/assets/test-image-large.jpg</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk/tests/phpunit/assets/test-image-large.jpg
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk/tests/phpunit/assets/test-image-large.jpg 2021-02-05 18:35:27 UTC (rev 12839)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/tests/phpunit/assets/test-image-large.jpg 2021-02-06 19:15:14 UTC (rev 12840)
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/assets/test-image-large.jpg
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mime-type</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+image/jpeg
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunittestcasescoreclassbpattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/class-bp-attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-attachment.php 2021-02-05 18:35:27 UTC (rev 12839)
+++ trunk/tests/phpunit/testcases/core/class-bp-attachment.php 2021-02-06 19:15:14 UTC (rev 12840)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,8 +377,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group avatars
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_attachment_avatar_shrink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === _wp_image_editor_choose() ) {
- $this->markTestSkipped( 'This test requires PHP to have a valid image editor that is compatible with WordPress.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === _wp_image_editor_choose() || version_compare( phpversion(), '7.0' , '<' ) ) {
+ $this->markTestSkipped( 'This test requires PHP >= 7.0 and to have a valid image editor that is compatible with WordPress.' );
</ins><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"> $image = BP_TESTS_DIR . 'assets/upside-down.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,11 +429,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test requires PHP to have a valid image editor that is compatible with WordPress.' );
</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">- $image = BP_TESTS_DIR . 'assets/upside-down.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = BP_TESTS_DIR . 'assets/test-image-large.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cover_image_class = new BP_Attachment_Cover_Image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $abs_path_copy = $cover_image_class->upload_path . '/upside-down.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $abs_path_copy = $cover_image_class->upload_path . '/test-image-large.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> copy( $image, $abs_path_copy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,8 +464,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group cover_images
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_attachment_get_image_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_callable( 'exif_read_data' ) ) {
- $this->markTestSkipped( 'This test requires PHP to be compiled with EXIF support.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_callable( 'exif_read_data' ) || version_compare( phpversion(), '7.0' , '<' ) ) {
+ $this->markTestSkipped( 'This test requires PHP >= 7.0 and to be compiled with EXIF support.' );
</ins><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"> $image_data = BP_Attachment::get_image_data( BP_TESTS_DIR . 'assets/upside-down.jpg' );
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreclassbpmediaextractorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php 2021-02-05 18:35:27 UTC (rev 12839)
+++ trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php 2021-02-06 19:15:14 UTC (rev 12840)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,12 +321,17 @@
</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"> public function test_extract_images_from_content_with_galleries_variant_ids() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_ids = array();
- $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/test-image-large.png' );
- $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/canola.jpg' );
- $attachment_ids = join( ',', $attachment_ids );
- $post_id = self::factory()->post->create( array( 'post_content' => "[gallery ids='{$attachment_ids}']" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_ids = array(
+ 'large' => 0,
+ 'canola' => 0,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_ids['large'] = self::factory()->attachment->create_upload_object( BP_TESTS_DIR . 'assets/test-image-large.jpg' );
+ $attachment_ids['canola'] = self::factory()->attachment->create_upload_object( BP_TESTS_DIR . 'assets/canola.jpg' );
+
+ $attachments = join( ',', $attachment_ids );
+ $post_id = self::factory()->post->create( array( 'post_content' => "[gallery ids='{$attachments}']" ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Extract the gallery images.
</span><span class="cx" style="display: block; padding: 0 10px"> $media = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => get_post( $post_id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,8 +341,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $media = array_values( wp_list_filter( $media['images'], array( 'source' => 'galleries' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $media );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( WP_CONTENT_URL . '/uploads/test-image-large.png', $media[0]['url'] );
- $this->assertSame( WP_CONTENT_URL . '/uploads/canola.jpg', $media[1]['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_urls = array(
+ 'large' => wp_get_attachment_url( $attachment_ids['large'] ),
+ 'canola' => wp_get_attachment_url( $attachment_ids['canola'] ),
+ );
+
+ $this->assertSame( $expected_urls['large'], $media[0]['url'] );
+ $this->assertSame( $expected_urls['canola'], $media[1]['url'] );
</ins><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"> public function test_extract_no_images_from_content_with_invalid_galleries_variant_no_ids() {
</span></span></pre>
</div>
</div>
</body>
</html>