<!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>[Tests][1161] trunk/tests: Prevent failures/fatals when jpeg support missing.</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, #logmsg > ol { margin-left: 0; 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://unit-tests.trac.wordpress.org/changeset/1161">1161</a></dd>
<dt>Author</dt> <dd>convissor</dd>
<dt>Date</dt> <dd>2012-11-30 19:09:18 +0000 (Fri, 30 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent failures/fatals when jpeg support missing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsfunctionsdeprecatedphp">trunk/tests/functions/deprecated.php</a></li>
<li><a href="#trunktestsimagefunctionsphp">trunk/tests/image/functions.php</a></li>
<li><a href="#trunktestsimageintermediate_sizephp">trunk/tests/image/intermediate_size.php</a></li>
<li><a href="#trunktestspostattachmentsphp">trunk/tests/post/attachments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsfunctionsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/functions/deprecated.php (1160 => 1161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/functions/deprecated.php 2012-11-29 16:04:21 UTC (rev 1160)
+++ trunk/tests/functions/deprecated.php 2012-11-30 19:09:18 UTC (rev 1161)
</span><span class="lines">@@ -138,6 +138,8 @@
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_wp_save_image_file_deprecated_with_gd_resource() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
</ins><span class="cx">
</span><span class="cx"> // Call wp_save_image_file
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
</span><span class="lines">@@ -157,6 +159,8 @@
</span><span class="cx"> * @ticket 6821
</span><span class="cx"> */
</span><span class="cx"> public function test_wp_save_image_file_not_deprecated_with_wp_image_editor() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
</ins><span class="cx">
</span><span class="cx"> // Call wp_save_image_file
</span><span class="cx"> include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
</span></span></pre></div>
<a id="trunktestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/functions.php (1160 => 1161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/functions.php 2012-11-29 16:04:21 UTC (rev 1160)
+++ trunk/tests/image/functions.php 2012-11-30 19:09:18 UTC (rev 1161)
</span><span class="lines">@@ -255,6 +255,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function test_wp_crop_image_file() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> $file = wp_crop_image( DIR_TESTDATA . '/images/canola.jpg',
</span><span class="cx"> 0, 0, 100, 100, 100, 100 );
</span><span class="cx"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="lines">@@ -266,6 +269,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function test_wp_crop_image_url() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
</span><span class="cx"> 0, 0, 100, 100, 100, 100, false,
</span><span class="cx"> DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
</span></span></pre></div>
<a id="trunktestsimageintermediate_sizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/image/intermediate_size.php (1160 => 1161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/image/intermediate_size.php 2012-11-29 16:04:21 UTC (rev 1160)
+++ trunk/tests/image/intermediate_size.php 2012-11-30 19:09:18 UTC (rev 1161)
</span><span class="lines">@@ -13,18 +13,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_make_intermediate_size_width() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
</span><span class="cx">
</span><span class="cx"> $this->assertInternalType( 'array', $image );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_make_intermediate_size_height() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
</span><span class="cx">
</span><span class="cx"> $this->assertInternalType( 'array', $image );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_make_intermediate_size_successful() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );
</span><span class="cx">
</span><span class="cx"> $this->assertInternalType( 'array', $image );
</span></span></pre></div>
<a id="trunktestspostattachmentsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/post/attachments.php (1160 => 1161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/attachments.php 2012-11-29 16:04:21 UTC (rev 1160)
+++ trunk/tests/post/attachments.php 2012-11-30 19:09:18 UTC (rev 1161)
</span><span class="lines">@@ -83,6 +83,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_insert_image_thumb_only() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> update_option( 'medium_size_w', 0 );
</span><span class="cx"> update_option( 'medium_size_h', 0 );
</span><span class="cx">
</span><span class="lines">@@ -126,6 +129,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_insert_image_medium() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> update_option('medium_size_w', 400);
</span><span class="cx"> update_option('medium_size_h', 0);
</span><span class="cx">
</span><span class="lines">@@ -169,6 +175,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> function test_insert_image_delete() {
</span><ins>+ if ( !function_exists( 'imagejpeg' ) )
+ $this->markTestSkipped( 'jpeg support unavailable' );
+
</ins><span class="cx"> update_option('medium_size_w', 400);
</span><span class="cx"> update_option('medium_size_h', 0);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>