<!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>[26005] trunk/tests/phpunit: Move `Tests_Query_Conditionals::assertQueryTrue()` to `WP_UnitTestCase`.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26005">26005</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-04 21:55:12 +0000 (Mon, 04 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move `Tests_Query_Conditionals::assertQueryTrue()` to `WP_UnitTestCase`. It should be available to all unit test classes. The conditionals class is huge, other classes are necessary for better coverage.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/testcase.php (26004 => 26005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/testcase.php 2013-11-04 21:39:35 UTC (rev 26004)
+++ trunk/tests/phpunit/includes/testcase.php 2013-11-04 21:55:12 UTC (rev 26005)
</span><span class="lines">@@ -278,4 +278,48 @@
</span><span class="cx"> $tmp_dir = realpath( $dir );
</span><span class="cx"> return tempnam( $tmp_dir, 'wpunit' );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Check each of the WP_Query is_* functions/properties against expected boolean value.
+ *
+ * Any properties that are listed by name as parameters will be expected to be true; any others are
+ * expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
+ * and is_feed() must be true and everything else must be false to pass.
+ *
+ * @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
+ */
+ function assertQueryTrue(/* ... */) {
+ global $wp_query;
+ $all = array(
+ 'is_single', 'is_preview', 'is_page', 'is_archive', 'is_date', 'is_year', 'is_month', 'is_day', 'is_time',
+ 'is_author', 'is_category', 'is_tag', 'is_tax', 'is_search', 'is_feed', 'is_comment_feed', 'is_trackback',
+ 'is_home', 'is_404', 'is_comments_popup', 'is_paged', 'is_admin', 'is_attachment', 'is_singular', 'is_robots',
+ 'is_posts_page', 'is_post_type_archive',
+ );
+ $true = func_get_args();
+
+ $passed = true;
+ $not_false = $not_true = array(); // properties that were not set to expected values
+
+ foreach ( $all as $query_thing ) {
+ $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
+
+ if ( in_array( $query_thing, $true ) ) {
+ if ( ! $result ) {
+ array_push( $not_true, $query_thing );
+ $passed = false;
+ }
+ } else if ( $result ) {
+ array_push( $not_false, $query_thing );
+ $passed = false;
+ }
+ }
+
+ $message = '';
+ if ( count($not_true) )
+ $message .= implode( $not_true, ', ' ) . ' should be true. ';
+ if ( count($not_false) )
+ $message .= implode( $not_false, ', ' ) . ' should be false.';
+ $this->assertTrue( $passed, $message );
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/conditionals.php (26004 => 26005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/conditionals.php 2013-11-04 21:39:35 UTC (rev 26004)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2013-11-04 21:55:12 UTC (rev 26005)
</span><span class="lines">@@ -34,50 +34,6 @@
</span><span class="cx"> $GLOBALS['wp_rewrite']->init();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * Check each of the WP_Query is_* functions/properties against expected boolean value.
- *
- * Any properties that are listed by name as parameters will be expected to be true; any others are
- * expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
- * and is_feed() must be true and everything else must be false to pass.
- *
- * @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
- */
- function assertQueryTrue(/* ... */) {
- global $wp_query;
- $all = array(
- 'is_single', 'is_preview', 'is_page', 'is_archive', 'is_date', 'is_year', 'is_month', 'is_day', 'is_time',
- 'is_author', 'is_category', 'is_tag', 'is_tax', 'is_search', 'is_feed', 'is_comment_feed', 'is_trackback',
- 'is_home', 'is_404', 'is_comments_popup', 'is_paged', 'is_admin', 'is_attachment', 'is_singular', 'is_robots',
- 'is_posts_page', 'is_post_type_archive',
- );
- $true = func_get_args();
-
- $passed = true;
- $not_false = $not_true = array(); // properties that were not set to expected values
-
- foreach ( $all as $query_thing ) {
- $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
-
- if ( in_array( $query_thing, $true ) ) {
- if ( ! $result ) {
- array_push( $not_true, $query_thing );
- $passed = false;
- }
- } else if ( $result ) {
- array_push( $not_false, $query_thing );
- $passed = false;
- }
- }
-
- $message = '';
- if ( count($not_true) )
- $message .= implode( $not_true, ', ' ) . ' should be true. ';
- if ( count($not_false) )
- $message .= implode( $not_false, ', ' ) . ' should be false.';
- $this->assertTrue( $passed, $message );
- }
-
</del><span class="cx"> function test_home() {
</span><span class="cx"> $this->go_to('/');
</span><span class="cx"> $this->assertQueryTrue('is_home');
</span></span></pre>
</div>
</div>
</body>
</html>