<!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>[49024] trunk/tests/phpunit/tests: Tests: Convert the checks for `imagejpeg()` function availability to use the `@requires` annotation.</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="https://core.trac.wordpress.org/changeset/49024">49024</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/49024","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-21 11:34:06 +0000 (Mon, 21 Sep 2020)</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'>Tests: Convert the checks for `imagejpeg()` function availability to use the `@requires` annotation.
This better utilizes the PHPUnit native functionality.
Props ayeshrajans, jrf, johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/50639">#50639</a>. See <a href="https://core.trac.wordpress.org/ticket/50640">#50640</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsdeprecatedphp">trunk/tests/phpunit/tests/functions/deprecated.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageintermediateSizephp">trunk/tests/phpunit/tests/image/intermediateSize.php</a></li>
<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsdeprecatedphp"></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/functions/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/deprecated.php 2020-09-21 11:11:10 UTC (rev 49023)
+++ trunk/tests/phpunit/tests/functions/deprecated.php 2020-09-21 11:34:06 UTC (rev 49024)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,14 +143,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6821
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_save_image_file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_save_image_file
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_save_image_file_deprecated_with_gd_resource() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Call wp_save_image_file().
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,14 +165,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests that wp_save_image_file() doesn't have a deprecated argument when passed a WP_Image_Editor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6821
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_save_image_file
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_save_image_file_not_deprecated_with_wp_image_editor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Call wp_save_image_file().
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_tempnam();
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2020-09-21 11:11:10 UTC (rev 49023)
+++ trunk/tests/phpunit/tests/image/functions.php 2020-09-21 11:34:06 UTC (rev 49024)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,11 +348,10 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_file() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canola.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,11 +371,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! extension_loaded( 'openssl' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() requires openssl.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsimageintermediateSizephp"></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/intermediateSize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php 2020-09-21 11:11:10 UTC (rev 49023)
+++ trunk/tests/phpunit/tests/image/intermediateSize.php 2020-09-21 11:34:06 UTC (rev 49024)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,31 +28,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $image );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_make_intermediate_size_width() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $image );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_make_intermediate_size_height() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $image );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_make_intermediate_size_successful() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $image );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,12 +64,9 @@
</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"> * @ticket 17626
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 330, 220, true );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,12 +85,9 @@
</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"> * @ticket 17626
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_array_exact() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Only one dimention match shouldn't return false positive (see: #17626).
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 330, 220, true );
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'false-height', 330, 400, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,12 +107,9 @@
</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"> * @ticket 17626
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_array_nearest() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If an exact size is not found, it should be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> // If not, find nearest size that is larger (see: #17626).
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 450, 300, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,12 +151,9 @@
</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"> * @ticket 17626
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_intermediate_sizes_by_array_zero_height() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Generate random width.
</span><span class="cx" style="display: block; padding: 0 10px"> $random_w = rand( 300, 400 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,12 +180,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34087
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><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">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // 202 is the smallest height that will trigger a miss for 'false-height'.
</span><span class="cx" style="display: block; padding: 0 10px"> $height = 202;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,12 +209,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17626
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34087
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_intermediate_sizes_should_match_size_with_off_by_one_aspect_ratio() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Original is 600x400. 300x201 is close enough to match.
</span><span class="cx" style="display: block; padding: 0 10px"> $width = 300;
</span><span class="cx" style="display: block; padding: 0 10px"> $height = 201;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,12 +233,9 @@
</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"> * @ticket 34384
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_intermediate_size_with_small_size_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add a hard cropped size that matches the aspect ratio we're going to test.
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( 'test-size', 200, 100, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,12 +251,9 @@
</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"> * @ticket 34384
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @requires function imagejpeg
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_intermediate_size_with_small_size_array_fallback() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><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></pre></div>
<a id="trunktestsphpunittestspostattachmentsphp"></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/post/attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/attachments.php 2020-09-21 11:11:10 UTC (rev 49023)
+++ trunk/tests/phpunit/tests/post/attachments.php 2020-09-21 11:34:06 UTC (rev 49024)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,11 +54,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 50, $downsize[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_insert_image_thumb_only() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,11 +105,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 300, $downsize[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_insert_image_medium_sizes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,12 +162,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1024, $downsize[2] );
</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">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @requires function imagejpeg
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_insert_image_delete() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'imagejpeg' ) ) {
- $this->fail( 'jpeg support unavailable' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_w', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'medium_size_h', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>