<!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>[503] wp-testcase/test_image.php: Skip remaining gd functions if gd not installed.</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/503">503</a></dd>
<dt>Author</dt> <dd>convissor</dd>
<dt>Date</dt> <dd>2012-02-01 06:33:16 +0000 (Wed, 01 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skip remaining gd functions if gd not installed. Move method callable skips to setUp. Use message parameter when skipping.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_imagephp">wp-testcase/test_image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_imagephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_image.php (502 => 503)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_image.php 2012-02-01 05:53:31 UTC (rev 502)
+++ wp-testcase/test_image.php 2012-02-01 06:33:16 UTC (rev 503)
</span><span class="lines">@@ -1,11 +1,14 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class TestImageMetaFunctions extends WPTestCase {
</span><del>-
- function test_exif_d70() {
</del><ins>+ function setUp() {
+ $this->checkPHPExtension('gd');
</ins><span class="cx"> if (!is_callable('wp_read_image_metadata'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_read_image_metadata() is not callable.');
+ parent::setUp();
+ }
</ins><span class="cx">
</span><ins>+ function test_exif_d70() {
</ins><span class="cx"> // exif from a Nikon D70
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2004-07-22-DSC_0008.jpg');
</span><span class="cx">
</span><span class="lines">@@ -22,9 +25,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exif_d70_mf() {
</span><del>- if (!is_callable('wp_read_image_metadata'))
- $this->markTestSkipped();
-
</del><span class="cx"> // exif from a Nikon D70 - manual focus lens, so some data is unavailable
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG');
</span><span class="cx">
</span><span class="lines">@@ -42,9 +42,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exif_d70_iptc() {
</span><del>- if (!is_callable('wp_read_image_metadata'))
- $this->markTestSkipped();
-
</del><span class="cx"> // exif from a Nikon D70 with IPTC data added later
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2004-07-22-DSC_0007.jpg');
</span><span class="cx">
</span><span class="lines">@@ -61,9 +58,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exif_fuji() {
</span><del>- if (!is_callable('wp_read_image_metadata'))
- $this->markTestSkipped();
-
</del><span class="cx"> // exif from a Fuji FinePix S5600 (thanks Mark)
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/a2-small.jpg');
</span><span class="cx">
</span><span class="lines">@@ -81,15 +75,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exif_error() {
</span><del>- if (!is_callable('wp_read_image_metadata'))
- $this->markTestSkipped();
-
</del><span class="cx"> $this->knownWPBug(6571);
</span><span class="cx">
</span><span class="cx"> // http://trac.wordpress.org/ticket/6571
</span><span class="cx"> // this triggers a warning mesage when reading the exif block
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/waffles.jpg');
</span><span class="cx">
</span><ins>+ $this->assertFalse($out, 'Should have returned FASLE on error.');
</ins><span class="cx"> $this->assertEquals(0, $out['aperture']);
</span><span class="cx"> $this->assertEquals('', $out['credit']);
</span><span class="cx"> $this->assertEquals('', $out['camera']);
</span><span class="lines">@@ -103,12 +95,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_exif_no_data() {
</span><del>- if (!is_callable('wp_read_image_metadata'))
- $this->markTestSkipped();
-
</del><span class="cx"> // no exif data in this image (from burningwell.org)
</span><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/canola.jpg');
</span><span class="cx">
</span><ins>+ $this->assertFalse($out, 'Should have returned FASLE on error.');
</ins><span class="cx"> $this->assertEquals(0, $out['aperture']);
</span><span class="cx"> $this->assertEquals('', $out['credit']);
</span><span class="cx"> $this->assertEquals('', $out['camera']);
</span><span class="lines">@@ -126,7 +116,7 @@
</span><span class="cx"> class TestImageSizeFunctions extends WpTestCase {
</span><span class="cx"> function test_constrain_dims_zero() {
</span><span class="cx"> if (!is_callable('wp_constrain_dimensions'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</ins><span class="cx">
</span><span class="cx"> // no constraint - should have no effect
</span><span class="cx"> $out = wp_constrain_dimensions(640, 480, 0, 0);
</span><span class="lines">@@ -141,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> function test_constrain_dims_smaller() {
</span><span class="cx"> if (!is_callable('wp_constrain_dimensions'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</ins><span class="cx">
</span><span class="cx"> // image size is smaller than the constraint - no effect
</span><span class="cx"> $out = wp_constrain_dimensions(500, 600, 1024, 768);
</span><span class="lines">@@ -156,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> function test_constrain_dims_equal() {
</span><span class="cx"> if (!is_callable('wp_constrain_dimensions'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</ins><span class="cx">
</span><span class="cx"> // image size is equal to the constraint - no effect
</span><span class="cx"> $out = wp_constrain_dimensions(1024, 768, 1024, 768);
</span><span class="lines">@@ -171,7 +161,7 @@
</span><span class="cx">
</span><span class="cx"> function test_constrain_dims_larger() {
</span><span class="cx"> if (!is_callable('wp_constrain_dimensions'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</ins><span class="cx">
</span><span class="cx"> // image size is larger than the constraint - result should be constrained
</span><span class="cx"> $out = wp_constrain_dimensions(1024, 768, 500, 600);
</span><span class="lines">@@ -196,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> function test_constrain_dims_boundary() {
</span><span class="cx"> if (!is_callable('wp_constrain_dimensions'))
</span><del>- $this->markTestSkipped();
</del><ins>+ $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</ins><span class="cx">
</span><span class="cx"> // one dimension is larger than the constraint, one smaller - result should be constrained
</span><span class="cx"> $out = wp_constrain_dimensions(1024, 768, 500, 800);
</span></span></pre>
</div>
</div>
</body>
</html>