<!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][903] trunk: Pinking shears</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/903">903</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-07-16 17:24:25 +0000 (Mon, 16 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesexceptionsphp">trunk/includes/exceptions.php</a></li>
<li><a href="#trunkincludesmockmailerphp">trunk/includes/mock-mailer.php</a></li>
<li><a href="#trunkincludestestcaseajaxphp">trunk/includes/testcase-ajax.php</a></li>
<li><a href="#trunkteststest_admin_includes_miscphp">trunk/tests/test_admin_includes_misc.php</a></li>
<li><a href="#trunkteststest_admin_includes_screenphp">trunk/tests/test_admin_includes_screen.php</a></li>
<li><a href="#trunkteststest_dbphp">trunk/tests/test_db.php</a></li>
<li><a href="#trunkteststest_httpphp">trunk/tests/test_http.php</a></li>
<li><a href="#trunkteststest_imagephp">trunk/tests/test_image.php</a></li>
<li><a href="#trunkteststest_includes_balance_tagsphp">trunk/tests/test_includes_balance_tags.php</a></li>
<li><a href="#trunkteststest_includes_canonicalphp">trunk/tests/test_includes_canonical.php</a></li>
<li><a href="#trunkteststest_includes_classwpxmlrpcserverphp">trunk/tests/test_includes_class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkteststest_includes_formattingphp">trunk/tests/test_includes_formatting.php</a></li>
<li><a href="#trunkteststest_includes_functionsphp">trunk/tests/test_includes_functions.php</a></li>
<li><a href="#trunkteststest_includes_ksesphp">trunk/tests/test_includes_kses.php</a></li>
<li><a href="#trunkteststest_includes_mediaphp">trunk/tests/test_includes_media.php</a></li>
<li><a href="#trunkteststest_includes_postphp">trunk/tests/test_includes_post.php</a></li>
<li><a href="#trunkteststest_includes_wpscriptsphp">trunk/tests/test_includes_wp-scripts.php</a></li>
<li><a href="#trunkteststest_includes_wpstylesphp">trunk/tests/test_includes_wp-styles.php</a></li>
<li><a href="#trunkteststest_metaphp">trunk/tests/test_meta.php</a></li>
<li><a href="#trunkteststest_msphp">trunk/tests/test_ms.php</a></li>
<li><a href="#trunkteststest_optionphp">trunk/tests/test_option.php</a></li>
<li><a href="#trunkteststest_queryphp">trunk/tests/test_query.php</a></li>
<li><a href="#trunkteststest_query_resultsphp">trunk/tests/test_query_results.php</a></li>
<li><a href="#trunkteststest_shortcodephp">trunk/tests/test_shortcode.php</a></li>
<li><a href="#trunkteststest_uploadsphp">trunk/tests/test_uploads.php</a></li>
<li><a href="#trunkteststest_userphp">trunk/tests/test_user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesexceptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/exceptions.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/exceptions.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/includes/exceptions.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class WP_Tests_Exception extends PHPUnit_Framework_Exception {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkincludesmockmailerphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/mock-mailer.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/mock-mailer.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/includes/mock-mailer.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> require_once(ABSPATH . '/wp-includes/class-phpmailer.php');
</span><del>-
</del><ins>+
</ins><span class="cx"> class MockPHPMailer extends PHPMailer {
</span><span class="cx"> var $mock_sent = array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkincludestestcaseajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/testcase-ajax.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/testcase-ajax.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/includes/testcase-ajax.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -15,16 +15,16 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Last AJAX response. This is set via echo -or- wp_die.
</span><del>- * @var type
</del><ins>+ * @var type
</ins><span class="cx"> */
</span><span class="cx"> protected $_last_response = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of ajax actions called via POST
</span><del>- * @var type
</del><ins>+ * @var type
</ins><span class="cx"> */
</span><span class="cx"> protected $_core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed_cache' );
</span><span class="cx">
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of ajax actions called via GET
</span><del>- * @var type
</del><ins>+ * @var type
</ins><span class="cx"> */
</span><span class="cx"> protected $_core_actions_post = array(
</span><span class="cx"> 'oembed_cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> // Make some posts
</span><span class="cx"> $this->factory->post->create_many( 5 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Tear down the test fixture.
</span><span class="cx"> * Reset $_POST, remove the wp_die() override, restore error reporting
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> * <code>
</span><span class="cx"> * $this->setExpectedException( 'WPAjaxDieContinueException', 'something contained in $message' );
</span><span class="cx"> * </code>
</span><del>- * @param string $message
</del><ins>+ * @param string $message
</ins><span class="cx"> */
</span><span class="cx"> public function dieHandler( $message ) {
</span><span class="cx"> $this->_last_response .= ob_get_clean();
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Switch between user roles
</span><span class="cx"> * E.g. administrator, editor, author, contributor, subscriber
</span><del>- * @param string $role
</del><ins>+ * @param string $role
</ins><span class="cx"> */
</span><span class="cx"> protected function _setRole( $role ) {
</span><span class="cx"> $post = $_POST;
</span><span class="lines">@@ -155,10 +155,10 @@
</span><span class="cx"> * Mimic the ajax handling of admin-ajax.php
</span><span class="cx"> * Capture the output via output buffering, and if there is any, store
</span><span class="cx"> * it in $this->_last_message.
</span><del>- * @param string $action
</del><ins>+ * @param string $action
</ins><span class="cx"> */
</span><span class="cx"> protected function _handleAjax($action) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Start output buffering
</span><span class="cx"> ini_set( 'implicit_flush', false );
</span><span class="cx"> ob_start();
</span></span></pre></div>
<a id="trunkteststest_admin_includes_miscphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_admin_includes_misc.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_admin_includes_misc.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_admin_includes_misc.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> 'http://wordpress.org/about/philosophy/#decisions'
</span><span class="cx"> => 'wordpress.org/about/philosophy/#...', // shorten to 32 if > 35 after cleaning
</span><span class="cx"> );
</span><del>- foreach ( $tests as $k => $v )
</del><ins>+ foreach ( $tests as $k => $v )
</ins><span class="cx"> $this->assertEquals( $v, url_shorten( $k ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkteststest_admin_includes_screenphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_admin_includes_screen.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_admin_includes_screen.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_admin_includes_screen.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> // The post type wins here. convert_to_screen( $post_type ) is only relevant for meta boxes anyway.
</span><span class="cx"> $screen = convert_to_screen( 'comments' );
</span><span class="cx"> $this->assertEquals( $screen->base, 'post' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Core wins.
</span><span class="cx"> $screen = convert_to_screen( 'edit-tags' );
</span><span class="cx"> $this->assertEquals( $screen->base, 'edit-tags' );
</span></span></pre></div>
<a id="trunkteststest_dbphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_db.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_db.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_db.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><span class="cx"> protected $_queries = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Set up the test fixture
</span><span class="cx"> */
</span><span class="lines">@@ -51,23 +51,23 @@
</span><span class="cx">
</span><span class="cx"> // Save the current locale
</span><span class="cx"> $current_locale = setlocale( LC_ALL, NULL );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Switch to Russian
</span><span class="cx"> $flag = setlocale( LC_ALL, 'ru_RU.utf8', 'rus', 'fr_FR.utf8', 'fr_FR', 'de_DE.utf8', 'de_DE', 'es_ES.utf8', 'es_ES' );
</span><span class="cx"> if ( false === $flag )
</span><span class="cx"> $this->markTestSkipped( 'No European languages available for testing' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Try an update query
</span><span class="cx"> $wpdb->suppress_errors( true );
</span><del>- $wpdb->update(
- 'test_table',
- array( 'float_column' => 0.7 ),
- array( 'meta_id' => 5 ),
- array( '%f' ),
- array( '%d' )
</del><ins>+ $wpdb->update(
+ 'test_table',
+ array( 'float_column' => 0.7 ),
+ array( 'meta_id' => 5 ),
+ array( '%f' ),
+ array( '%d' )
</ins><span class="cx"> );
</span><span class="cx"> $wpdb->suppress_errors( false );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Ensure the float isn't 0,700
</span><span class="cx"> $this->assertContains( '0.700', array_pop( $this->_queries ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_httpphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_http.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_http.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_http.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> $this->markTestSkipped( "This version of WP_HTTP doesn't support WP_HTTP::make_absolute_url()" );
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $actual = WP_HTTP::make_absolute_url( $relative_url, $absolute_url );
</span><span class="cx"> $this->assertEquals( $expected, $actual );
</span><span class="cx"> }
</span><span class="lines">@@ -229,18 +229,18 @@
</span><span class="cx"> return array(
</span><span class="cx"> array( 'http://site.com/', 'http://example.com/', 'http://site.com/' ), // Absolute URL provided
</span><span class="cx"> array( '/location', '', '/location' ), // No current url provided
</span><del>-
</del><ins>+
</ins><span class="cx"> array( '', 'http://example.com', 'http://example.com/' ), // No location provided
</span><del>-
</del><ins>+
</ins><span class="cx"> // Location provided relative to site root
</span><span class="cx"> array( '/root-relative-link.ext', 'http://example.com/', 'http://example.com/root-relative-link.ext' ),
</span><span class="cx"> array( '/root-relative-link.ext?with=query', 'http://example.com/index.ext?query', 'http://example.com/root-relative-link.ext?with=query' ),
</span><del>-
</del><ins>+
</ins><span class="cx"> // Location provided relative to current file/directory
</span><span class="cx"> array( 'relative-file.ext', 'http://example.com/', 'http://example.com/relative-file.ext' ),
</span><span class="cx"> array( 'relative-file.ext', 'http://example.com/filename', 'http://example.com/relative-file.ext' ),
</span><span class="cx"> array( 'relative-file.ext', 'http://example.com/directory/', 'http://example.com/directory/relative-file.ext' ),
</span><del>-
</del><ins>+
</ins><span class="cx"> // Location provided relative to current file/directory but in a parent directory
</span><span class="cx"> array( '../file-in-parent.ext', 'http://example.com', 'http://example.com/file-in-parent.ext' ),
</span><span class="cx"> array( '../file-in-parent.ext', 'http://example.com/filename', 'http://example.com/file-in-parent.ext' ),
</span><span class="lines">@@ -253,13 +253,13 @@
</span><span class="cx"> array( '../../file-in-grand-parent.ext', 'http://example.com/directory/', 'http://example.com/file-in-grand-parent.ext' ),
</span><span class="cx"> array( '../../file-in-grand-parent.ext', 'http://example.com/directory/filename/', 'http://example.com/file-in-grand-parent.ext' ),
</span><span class="cx"> array( '../../file-in-grand-parent.ext', 'http://example.com/directory1/directory2/filename', 'http://example.com/file-in-grand-parent.ext' ),
</span><del>-
</del><ins>+
</ins><span class="cx"> // Query strings should attach, or replace existing query string.
</span><span class="cx"> array( '?query=string', 'http://example.com', 'http://example.com/?query=string' ),
</span><span class="cx"> array( '?query=string', 'http://example.com/file.ext', 'http://example.com/file.ext?query=string' ),
</span><span class="cx"> array( '?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/file.ext?query=string' ),
</span><span class="cx"> array( 'otherfile.ext?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/otherfile.ext?query=string' ),
</span><del>-
</del><ins>+
</ins><span class="cx"> // A file with a leading dot
</span><span class="cx"> array( '.ext', 'http://example.com/', 'http://example.com/.ext' )
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkteststest_imagephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_image.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_image.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_image.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -124,12 +124,12 @@
</span><span class="cx"> */
</span><span class="cx"> function test_utf8_iptc_tags() {
</span><span class="cx">
</span><del>- // trilingual UTF-8 text in the ITPC caption-abstract field
</del><ins>+ // trilingual UTF-8 text in the ITPC caption-abstract field
</ins><span class="cx"> $out = wp_read_image_metadata(DIR_TESTDATA.'/images/test-image-iptc.jpg');
</span><span class="cx">
</span><span class="cx"> $this->assertEquals('This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $out['caption']);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * wp_read_image_metadata() should false if the image file doesn't exist
</span><span class="cx"> * @return void
</span></span></pre></div>
<a id="trunkteststest_includes_balance_tagsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_balance_tags.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_balance_tags.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_balance_tags.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> $this->assertEquals( "<$tag />", balanceTags( "<$tag>", true ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * If a recognized valid single tag appears unclosed, it should get self-closed
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkteststest_includes_canonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_canonical.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_canonical.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_canonical.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> // Already created by install defaults:
</span><span class="cx"> // $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->term_ids = array();
</span><span class="cx">
</span><span class="cx"> $this->factory->post->create( array( 'import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00' ) );
</span><span class="lines">@@ -52,11 +52,11 @@
</span><span class="cx"> $this->factory->comment->create_post_comments( $post_id, 15 );
</span><span class="cx">
</span><span class="cx"> $this->factory->post->create( array( 'post_date' => '2008-09-05 00:00:00' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->factory->post->create( array( 'import_id' => 123 ) );
</span><span class="cx"> $this->factory->post->create( array( 'import_id' => 1 ) );
</span><span class="cx"> $this->factory->post->create( array( 'import_id' => 358 ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'sample-page' ) );
</span><span class="cx"> $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
</span><span class="cx"> $post_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'cat-a' ) );
</span><span class="cx"> $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'cat-b' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->factory->term->create( array( 'name' => 'post-formats' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> $this->knownWPBug( $ticket );
</span><span class="cx">
</span><span class="cx"> $ticket_ref = ($ticket > 0) ? 'Ticket #' . $ticket : null;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_string($expected) )
</span><span class="cx"> $expected = array('url' => $expected);
</span><span class="cx"> elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) )
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> * array( expected query vars to be set, same as 'qv' above )
</span><span class="cx"> * (string) expected redirect location
</span><span class="cx"> * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> return array(
</span><span class="cx"> array( '/?p=123', '/?p=123' ),
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_includes_classwpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_class-wp-xmlrpc-server.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_class-wp-xmlrpc-server.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_class-wp-xmlrpc-server.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> function test_disabled() {
</span><span class="cx"> $myxmlrpcserver = new wp_xmlrpc_server();
</span><span class="cx"> $result = $myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx"> $this->assertEquals( 405, $result->code );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststest_includes_formattingphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_formatting.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_formatting.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_formatting.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> 'blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software).)moreurl blah blah',
</span><span class="cx"> 'In his famous speech “You and Your research” (here:
</span><span class="cx"> http://www.cs.virginia.edu/~robins/YouAndYourResearch.html)
</span><del>- Richard Hamming wrote about people getting more done with their doors closed, but',
</del><ins>+ Richard Hamming wrote about people getting more done with their doors closed, but',
</ins><span class="cx"> );
</span><span class="cx"> $urls_expected = array(
</span><span class="cx"> '<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>',
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> 'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.)moreurl blah blah',
</span><span class="cx"> 'In his famous speech “You and Your research” (here:
</span><span class="cx"> <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>)
</span><del>- Richard Hamming wrote about people getting more done with their doors closed, but',
</del><ins>+ Richard Hamming wrote about people getting more done with their doors closed, but',
</ins><span class="cx"> );
</span><span class="cx"> foreach ($urls_before as $key => $url) {
</span><span class="cx"> $this->assertEquals($urls_expected[$key], make_clickable($url));
</span><span class="lines">@@ -753,19 +753,19 @@
</span><span class="cx"> * wpautop() Should not alter the contents of "<pre>" elements
</span><span class="cx"> *
</span><span class="cx"> * @ticket 19855
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> public function test_skip_pre_elements() {
</span><span class="cx"> $code = file_get_contents( DIR_TESTDATA . '/formatting/sizzle.js' );
</span><span class="cx"> $code = str_replace( "\r", '', $code );
</span><span class="cx"> $code = htmlentities( $code );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Not wrapped in <p> tags
</span><span class="cx"> $str = "<pre>$code</pre>";
</span><span class="cx"> $this->assertEquals( $str, trim( wpautop( $str ) ) );
</span><span class="cx">
</span><span class="cx"> // Text before/after is wrapped in <p> tags
</span><span class="cx"> $str = "Look at this code\n\n<pre>$code</pre>\n\nIsn't that cool?";
</span><del>-
</del><ins>+
</ins><span class="cx"> // Expected text after wpautop
</span><span class="cx"> $expected = '<p>Look at this code</p>' . "\n<pre>" . $code . "</pre>\n" . '<p>Isn\'t that cool?</p>';
</span><span class="cx"> $this->assertEquals( $expected, trim( wpautop( $str ) ) );
</span><span class="lines">@@ -775,12 +775,12 @@
</span><span class="cx"> $expected = "<p>Look at this code</p>\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n<p>Cool, huh?</p>";
</span><span class="cx"> $this->assertEquals( $expected, trim( wpautop( $str ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * wpautop() Should not add <br/> to "<input>" elements
</span><span class="cx"> *
</span><span class="cx"> * @ticket 16456
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> public function test_skip_input_elements() {
</span><span class="cx"> $str = 'Username: <input type="text" id="username" name="username" /><br />Password: <input type="password" id="password1" name="password1" />';
</span><span class="cx"> $this->assertEquals( "<p>$str</p>", trim( wpautop( $str ) ) );
</span><span class="lines">@@ -1457,7 +1457,7 @@
</span><span class="cx"> $this->assertEquals( $trimmed, wp_trim_words( $text ) );
</span><span class="cx">
</span><span class="cx"> $text = 'This text contains<style>#css { width:expression(alert("css")) }</style>. It should go.';
</span><del>- $this->assertEquals( $trimmed, wp_trim_words( $text ) );
</del><ins>+ $this->assertEquals( $trimmed, wp_trim_words( $text ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_doesnt_trim_short_text() {
</span><span class="lines">@@ -1525,7 +1525,7 @@
</span><span class="cx"> $this->assertEquals( 'AaAaEeEeOoOoUuYy', remove_accents( 'ẪẫẴẵẼẽỄễỖỗỠỡỮữỸỹ' ) );
</span><span class="cx"> // acute accent
</span><span class="cx"> $this->assertEquals( 'AaAaEeOoOoUu', remove_accents( 'ẤấẮắẾếỐốỚớỨứ' ) );
</span><del>- // dot below
</del><ins>+ // dot below
</ins><span class="cx"> $this->assertEquals( 'AaAaAaEeEeIiOoOoOoUuUuYy', remove_accents( 'ẠạẬậẶặẸẹỆệỊịỌọỘộỢợỤụỰựỴỵ' ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_includes_functionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_functions.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_functions.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_functions.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> foreach ( $actual as $header => $value )
</span><span class="cx"> $this->assertEquals( $expected[ $header ], $value, $header );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_get_file_data_cr_line_endings() {
</span><span class="cx"> $headers = array( 'SomeHeader' => 'Some Header', 'Description' => 'Description', 'Author' => 'Author' );
</span><span class="cx"> $actual = get_file_data( DIR_TESTDATA . '/formatting/cr-line-endings-file-header.php', $headers );
</span></span></pre></div>
<a id="trunkteststest_includes_ksesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_kses.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_kses.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_kses.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> 'style' => 'color: red;',
</span><span class="cx"> 'title' => 'title',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $attributes as $name => $value ) {
</span><span class="cx"> $string = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
</span><span class="cx"> $this->assertEquals( $string, wp_kses( $string, $allowedposttags ) );
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> 'name' => 'name',
</span><span class="cx"> 'target' => '_blank',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $attributes as $name => $value ) {
</span><span class="cx"> $string = "<a $name='$value'>I link this</a>";
</span><span class="cx"> $this->assertEquals( $string, wp_kses( $string, $allowedposttags ) );
</span></span></pre></div>
<a id="trunkteststest_includes_mediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_media.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_media.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_media.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_img_caption_shortcode_with_old_format() {
</span><del>- $result = img_caption_shortcode(
- array( 'width' => 20, 'caption' => $this->caption )
</del><ins>+ $result = img_caption_shortcode(
+ array( 'width' => 20, 'caption' => $this->caption )
</ins><span class="cx"> );
</span><span class="cx"> $this->assertEquals( 2, preg_match_all( '/wp-caption/', $result, $_r ) );
</span><span class="cx"> $this->assertEquals( 1, preg_match_all( '/alignnone/', $result, $_r ) );
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_img_caption_shortcode_with_old_format_id_and_align() {
</span><del>- $result = img_caption_shortcode(
- array(
</del><ins>+ $result = img_caption_shortcode(
+ array(
</ins><span class="cx"> 'width' => 20,
</span><span class="cx"> 'caption' => $this->caption,
</span><span class="cx"> 'id' => '"myId',
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_new_img_caption_shortcode_with_html_caption() {
</span><del>- $result = img_caption_shortcode(
- array( 'width' => 20, 'caption' => $this->html_content )
</del><ins>+ $result = img_caption_shortcode(
+ array( 'width' => 20, 'caption' => $this->html_content )
</ins><span class="cx"> );
</span><span class="cx"> $our_preg = preg_quote( $this->html_content );
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_new_img_caption_shortcode_new_format() {
</span><del>- $result = img_caption_shortcode(
</del><ins>+ $result = img_caption_shortcode(
</ins><span class="cx"> array( 'width' => 20 ),
</span><span class="cx"> $this->img_content . $this->html_content
</span><span class="cx"> );
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> function test_new_img_caption_shortcode_new_format_and_linked_image() {
</span><span class="cx"> $linked_image = "<a href='#'>{$this->img_content}</a>";
</span><del>- $result = img_caption_shortcode(
</del><ins>+ $result = img_caption_shortcode(
</ins><span class="cx"> array( 'width' => 20 ),
</span><span class="cx"> $linked_image . $this->html_content
</span><span class="cx"> );
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> function test_new_img_caption_shortcode_new_format_and_linked_image_with_newline() {
</span><span class="cx"> $linked_image = "<a href='#'>{$this->img_content}</a>";
</span><del>- $result = img_caption_shortcode(
</del><ins>+ $result = img_caption_shortcode(
</ins><span class="cx"> array( 'width' => 20 ),
</span><span class="cx"> $linked_image . "\n\n" . $this->html_content
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkteststest_includes_postphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_post.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_post.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_post.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -475,9 +475,9 @@
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> // Remove all uploads.
</span><del>- $uploads = wp_upload_dir();
</del><ins>+ $uploads = wp_upload_dir();
</ins><span class="cx"> foreach ( scandir( $uploads['basedir'] ) as $file )
</span><del>- _rmdir( $uploads['basedir'] . '/' . $file );
</del><ins>+ _rmdir( $uploads['basedir'] . '/' . $file );
</ins><span class="cx">
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststest_includes_wpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_wp-scripts.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_wp-scripts.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_wp-scripts.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> // No scripts left to print
</span><span class="cx"> $this->assertEquals("", get_echo('wp_print_scripts'));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test the different protocol references in wp_enqueue_script
</span><span class="cx"> * @global WP_Scripts $wp_scripts
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // Try with an HTTPS reference
</span><span class="cx"> wp_enqueue_script( 'jquery-https', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
</span><span class="cx"> $expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> // Try with an automatic protocol reference (//)
</span><span class="cx"> wp_enqueue_script( 'jquery-doubleslash', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
</span><span class="cx"> $expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> // Try with a bad protocol
</span><span class="cx"> wp_enqueue_script( 'jquery-ftp', 'ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
</span><span class="cx"> $expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver'></script>\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> // Go!
</span><span class="cx"> $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_includes_wpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_includes_wp-styles.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_includes_wp-styles.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_includes_wp-styles.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> $expected .= "<link rel='stylesheet' id='no-deps-version-css' href='http://example.com?ver=1.2' type='text/css' media='all' />\n";
</span><span class="cx"> $expected .= "<link rel='stylesheet' id='no-deps-null-version-css' href='http://example.com' type='text/css' media='all' />\n";
</span><span class="cx"> $expected .= "<link rel='stylesheet' id='no-deps-null-version-print-media-css' href='http://example.com' type='text/css' media='print' />\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->assertEquals($expected, get_echo('wp_print_styles'));
</span><span class="cx">
</span><span class="cx"> // No styles left to print
</span><span class="cx"> $this->assertEquals("", get_echo('wp_print_styles'));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test the different protocol references in wp_enqueue_style
</span><span class="cx"> * @global WP_Styles $wp_styles
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> // Try with an HTTPS reference
</span><span class="cx"> wp_enqueue_style( 'reset-css-https', 'http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
</span><span class="cx"> $expected .= "<link rel='stylesheet' id='reset-css-https-css' href='http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> // Try with an automatic protocol reference (//)
</span><span class="cx"> wp_enqueue_style( 'reset-css-doubleslash', '//yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
</span><span class="cx"> $expected .= "<link rel='stylesheet' id='reset-css-doubleslash-css' href='//yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";
</span></span></pre></div>
<a id="trunkteststest_metaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_meta.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_meta.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_meta.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> $expected .= "asdf\n";
</span><span class="cx"> $expected .= "foo bar\n";
</span><span class="cx"> $expected .= "foo";
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->assertEquals($expected, strip_ws($in));
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststest_msphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_ms.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_ms.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_ms.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // update the blog count cache to use get_blog_count()
</span><del>- wp_update_network_counts();
</del><ins>+ wp_update_network_counts();
</ins><span class="cx"> $this->assertEquals( 4 + 1, (int) get_blog_count() );
</span><span class="cx">
</span><span class="cx"> $drop_tables = false;
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // update the blog count cache to use get_blog_count()
</span><del>- wp_update_network_counts();
</del><ins>+ wp_update_network_counts();
</ins><span class="cx"> $this->assertEquals( 1, get_blog_count() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> // activate the plugin sitewide
</span><span class="cx"> activate_plugin($path, '', $network_wide = true);
</span><span class="cx"> $active_plugins = wp_get_active_network_plugins();
</span><del>- $this->assertEquals( Array(WP_PLUGIN_DIR . '/hello.php'), $active_plugins );
</del><ins>+ $this->assertEquals( Array(WP_PLUGIN_DIR . '/hello.php'), $active_plugins );
</ins><span class="cx">
</span><span class="cx"> //deactivate the plugin
</span><span class="cx"> deactivate_plugins($path);
</span><span class="lines">@@ -188,12 +188,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_wp_schedule_update_network_counts() {
</span><del>- $this->assertFalse(wp_next_scheduled('update_network_counts'));
</del><ins>+ $this->assertFalse(wp_next_scheduled('update_network_counts'));
</ins><span class="cx">
</span><span class="cx"> // We can't use wp_schedule_update_network_counts() because WP_INSTALLING is set
</span><span class="cx"> wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
</span><span class="cx">
</span><del>- $this->assertInternalType('int', wp_next_scheduled('update_network_counts'));
</del><ins>+ $this->assertInternalType('int', wp_next_scheduled('update_network_counts'));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_users_can_register_signup_filter() {
</span><span class="lines">@@ -202,13 +202,13 @@
</span><span class="cx"> $this->assertFalse( users_can_register_signup_filter() );
</span><span class="cx">
</span><span class="cx"> update_site_option('registration', 'all');
</span><del>- $this->assertTrue( users_can_register_signup_filter() );
</del><ins>+ $this->assertTrue( users_can_register_signup_filter() );
</ins><span class="cx">
</span><span class="cx"> update_site_option('registration', 'user');
</span><span class="cx"> $this->assertTrue( users_can_register_signup_filter() );
</span><span class="cx">
</span><span class="cx"> update_site_option('registration', 'none');
</span><del>- $this->assertFalse( users_can_register_signup_filter() );
</del><ins>+ $this->assertFalse( users_can_register_signup_filter() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_get_dashboard_blog() {
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> $this->assertEquals( 'example.com', $blog->domain );
</span><span class="cx"> $this->assertEquals( 'my_path/', $blog->path );
</span><del>- $this->assertEquals( '0', $blog->spam );
</del><ins>+ $this->assertEquals( '0', $blog->spam );
</ins><span class="cx">
</span><span class="cx"> $result = update_blog_details( $blog_id, array('domain' => 'example2.com','spam' => 1) );
</span><span class="cx"> $this->assertTrue( $result );
</span></span></pre></div>
<a id="trunkteststest_optionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_option.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_option.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_option.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function __return_foo() {
</span><del>- return 'foo';
</del><ins>+ return 'foo';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_the_basics() {
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> */
</span><span class="cx"> class TestSiteOption extends WP_UnitTestCase {
</span><span class="cx"> function __return_foo() {
</span><del>- return 'foo';
</del><ins>+ return 'foo';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_the_basics() {
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> $default = 'a default';
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( get_site_option( $option, $default ), $default );
</span><del>- $this->assertFalse( get_site_option( $option ) );
</del><ins>+ $this->assertFalse( get_site_option( $option ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_queryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_query.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_query.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_query.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> global $wp_query;
</span><span class="cx"> $this->assertEquals( $page_id, $wp_query->get_queried_object()->ID );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // FIXME: what is this for?
</span><span class="cx"> // '(about)(/[0-9]+)?/?$' => 'index.php?pagename=$matches[1]&page=$matches[2]'
</span><span class="cx"> function test_pagination_of_posts_page() {
</span></span></pre></div>
<a id="trunkteststest_query_resultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_query_results.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_query_results.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_query_results.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> $this->factory->post->create( array( 'post_title' => 'cats-a-and-b', 'post_date' => '2009-01-01 00:00:00', 'post_category' => array( $cat_a, $cat_b ) ) );
</span><span class="cx"> $this->factory->post->create( array( 'post_title' => 'cats-b-and-c', 'post_date' => '2009-02-01 00:00:00', 'post_category' => array( $cat_b, $cat_c ) ) );
</span><span class="cx"> $this->factory->post->create( array( 'post_title' => 'cats-a-and-c', 'post_date' => '2009-03-01 00:00:00', 'post_category' => array( $cat_a, $cat_c ) ) );
</span><del>- $this->factory->post->create( array( 'post_title' => 'cat-a', 'post_date' => '2009-04-01 00:00:00', 'post_category' => array( $cat_a ) ) );
</del><ins>+ $this->factory->post->create( array( 'post_title' => 'cat-a', 'post_date' => '2009-04-01 00:00:00', 'post_category' => array( $cat_a ) ) );
</ins><span class="cx"> $this->factory->post->create( array( 'post_title' => 'cat-b', 'post_date' => '2009-05-01 00:00:00', 'post_category' => array( $cat_b ) ) );
</span><span class="cx"> $this->factory->post->create( array( 'post_title' => 'cat-c', 'post_date' => '2009-06-01 00:00:00', 'post_category' => array( $cat_c ) ) );
</span><span class="cx"> $this->factory->post->create( array( 'post_title' => 'lorem-ipsum', 'post_date' => '2009-07-01 00:00:00' ) );
</span></span></pre></div>
<a id="trunkteststest_shortcodephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_shortcode.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_shortcode.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_shortcode.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 'foo' => 'no foo',
</span><span class="cx"> 'baz' => 'default baz',
</span><span class="cx"> ), $atts));
</span><del>-
</del><ins>+
</ins><span class="cx"> return "foo = {$foo}";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_uploadsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_uploads.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_uploads.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_uploads.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> parent::tearDown();
</span><span class="cx">
</span><span class="cx"> // Remove year/month folders created by wp_upload_dir().
</span><del>- $uploads = wp_upload_dir();
</del><ins>+ $uploads = wp_upload_dir();
</ins><span class="cx"> foreach ( scandir( $uploads['basedir'] ) as $file )
</span><del>- _rmdir( $uploads['basedir'] . '/' . $file );
</del><ins>+ _rmdir( $uploads['basedir'] . '/' . $file );
</ins><span class="cx"> _rmdir( ABSPATH . 'foo/' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststest_userphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/test_user.php (902 => 903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/test_user.php 2012-07-13 18:27:52 UTC (rev 902)
+++ trunk/tests/test_user.php 2012-07-16 17:24:25 UTC (rev 903)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> $this->assertEquals( $value, $user->$key );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Test the magic __unset method
</span><span class="cx"> *
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> // Test 'ID'
</span><span class="cx"> $this->assertNotEmpty( $user->ID );
</span><span class="cx"> unset( $user->ID );
</span><del>- $this->assertEmpty( $user->ID );
</del><ins>+ $this->assertEmpty( $user->ID );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Test meta property magic functions for property get/set/isset.
</span></span></pre>
</div>
</div>
</body>
</html>