<!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][1221] trunk/includes: During test execution, all wp_die() calls should throw an exception.</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://core.trac.wordpress.org/changeset/1221/tests">1221</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-02-28 16:30:21 +0000 (Thu, 28 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>During test execution, all wp_die() calls should throw an exception.
If the wp_die() call is not expected, the test will result in an error. Expected wp_die() calls may be caught with $this->setExpectedException( $exception ), @expectedException, etc. For more, see http://www.phpunit.de/manual/3.8/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.exceptions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesexceptionsphp">trunk/includes/exceptions.php</a></li>
<li><a href="#trunkincludestestcasephp">trunk/includes/testcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesexceptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/exceptions.php (1220 => 1221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/exceptions.php 2013-02-28 04:30:35 UTC (rev 1220)
+++ trunk/includes/exceptions.php 2013-02-28 16:30:21 UTC (rev 1221)
</span><span class="lines">@@ -5,17 +5,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Exception for cases of wp_die()
</del><ins>+ * General exception for wp_die()
+ */
+class WPDieException extends Exception {}
+
+/**
+ * Exception for cases of wp_die(), for ajax tests.
</ins><span class="cx"> * This means there was an error (no output, and a call to wp_die)
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Unit Tests
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>-class WPAjaxDieStopException extends Exception {}
</del><ins>+class WPAjaxDieStopException extends WPDieException {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * Exception for cases of wp_die()
</del><ins>+ * Exception for cases of wp_die(), for ajax tests.
</ins><span class="cx"> * This means execution of the ajax function should be halted, but the unit
</span><span class="cx"> * test can continue. The function finished normally and there was not an
</span><span class="cx"> * error (output happened, but wp_die was called to end execution) This is
</span><span class="lines">@@ -25,4 +30,4 @@
</span><span class="cx"> * @subpackage Unit Tests
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>-class WPAjaxDieContinueException extends Exception {}
</del><ins>+class WPAjaxDieContinueException extends WPDieException {}
</ins></span></pre></div>
<a id="trunkincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/includes/testcase.php (1220 => 1221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/testcase.php 2013-02-28 04:30:35 UTC (rev 1220)
+++ trunk/includes/testcase.php 2013-02-28 16:30:21 UTC (rev 1221)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> $this->factory = new WP_UnitTest_Factory;
</span><span class="cx"> $this->clean_up_global_scope();
</span><span class="cx"> $this->start_transaction();
</span><ins>+ add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="lines">@@ -25,6 +26,7 @@
</span><span class="cx"> $wpdb->query( 'ROLLBACK' );
</span><span class="cx"> remove_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
</span><span class="cx"> remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
</span><ins>+ remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function clean_up_global_scope() {
</span><span class="lines">@@ -63,6 +65,14 @@
</span><span class="cx"> return $query;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function get_wp_die_handler( $handler ) {
+ return array( $this, 'wp_die_handler' );
+ }
+
+ function wp_die_handler( $message ) {
+ throw new WPDieException( $message );
+ }
+
</ins><span class="cx"> function assertWPError( $actual, $message = '' ) {
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', $actual, $message );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>