<!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>[40457] branches/4.0/tests/phpunit/tests: Build/Test tools: Ruthlessly remove failing tests from the 4.0 branch.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40457">40457</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40457","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-15 22:22:29 +0000 (Sat, 15 Apr 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test tools: Ruthlessly remove failing tests from the 4.0 branch.
The corresponding issues that these failing tests relate to were fixed during 4.1 development. The tests will never pass on the 4.0 brach.
See <a href="https://core.trac.wordpress.org/ticket/40463">#40463</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40testsphpunittestsmsphp">branches/4.0/tests/phpunit/tests/ms.php</a></li>
<li><a href="#branches40testsphpunittestsoptionblogOptionphp">branches/4.0/tests/phpunit/tests/option/blogOption.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches40testsphpunittestslinkgetAdjacentPostLinkphp">branches/4.0/tests/phpunit/tests/link/getAdjacentPostLink.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches40testsphpunittestslinkgetAdjacentPostLinkphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.0/tests/phpunit/tests/link/getAdjacentPostLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/link/getAdjacentPostLink.php 2017-04-15 22:01:29 UTC (rev 40456)
+++ branches/4.0/tests/phpunit/tests/link/getAdjacentPostLink.php 2017-04-15 22:22:29 UTC (rev 40457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,61 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group link
- */
-class Tests_Link_GetAdjacentPostLink extends WP_UnitTestCase {
-
- protected $post_ids;
- protected $cat_id;
-
- public function setUp(){
- parent::setUp();
- $this->cat_id = $this->factory->category->create( array( 'name' => 'other' ) );
- $this->post_ids = array();
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 05:32:29', 'category_id' => 1 ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 04:32:29', 'category_id' => $this->cat_id ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 03:32:29', 'category_id' => 1 ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 02:32:29', 'category_id' => $this->cat_id ) );
- $this->post_ids[] = $this->factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 01:32:29', 'category_id' => 1 ) );
-
- //set current post (has 2 on each end)
- global $GLOBALS;
- $GLOBALS['post'] = get_post( $this->post_ids[2] );
- }
-
- public function test_get_next_post_link_default() {
- $actual = get_next_post_link();
- $expected = '<a href="http://example.org/?p=' . $this->post_ids[1] . '" rel="next">Post title 2</a> »';
- $this->assertSame( $expected, $actual );
- }
-
- public function test_get_previous_post_link_default() {
- $actual = get_previous_post_link();
- $expected = '« <a href="http://example.org/?p=' . $this->post_ids[3] . '" rel="prev">Post title 4</a>';
- $this->assertSame( $expected, $actual );
- }
-
- public function test_get_next_post_link_same_category() {
- $actual = get_next_post_link( '%link »', '%title', true );
- $expected = '<a href="http://example.org/?p=' . $this->post_ids[1] . '" rel="next">Post title 2</a> »';
- $this->assertSame( $expected, $actual );
- }
-
- public function test_get_previous_post_link_same_category() {
- $actual = get_previous_post_link( '« %link', '%title', true );
- $expected = '« <a href="http://example.org/?p=' . $this->post_ids[3] . '" rel="prev">Post title 4</a>';
- $this->assertSame( $expected, $actual );
- }
-
- public function test_get_next_post_link_exclude_category() {
- $actual = get_next_post_link( '%link »', '%title', false, $this->cat_id );
- $expected = '<a href="http://example.org/?p=' . $this->post_ids[1] . '" rel="next">Post title 2</a> »';
- $this->assertSame( $expected, $actual );
- }
-
- public function test_get_previous_post_link_exclude_category() {
- $actual = get_previous_post_link( '« %link', '%title', false, $this->cat_id );
- $expected = '« <a href="http://example.org/?p=' . $this->post_ids[3] . '" rel="prev">Post title 4</a>';
- $this->assertSame( $expected, $actual );
- }
-}
</del></span></pre></div>
<a id="branches40testsphpunittestsmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/ms.php 2017-04-15 22:01:29 UTC (rev 40456)
+++ branches/4.0/tests/phpunit/tests/ms.php 2017-04-15 22:22:29 UTC (rev 40457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1412,95 +1412,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 27884
- *
- * @expectedDeprecated define()
- */
- function test_multisite_bootstrap() {
- global $current_site, $current_blog;
-
- $network_ids = array(
- 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/' ),
- 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/' ),
- );
-
- foreach ( $network_ids as &$id ) {
- $id = $this->factory->network->create( $id );
- }
- unset( $id );
-
- $ids = array(
- 'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'site_id' => $network_ids['wordpress.org/'] ),
- 'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'site_id' => $network_ids['wordpress.org/'] ),
- 'wordpress.org/foo/bar/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/bar/', 'site_id' => $network_ids['wordpress.org/'] ),
- 'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/', 'site_id' => $network_ids['make.wordpress.org/'] ),
- 'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/', 'site_id' => $network_ids['make.wordpress.org/'] ),
- );
-
- foreach ( $ids as &$id ) {
- $id = $this->factory->blog->create( $id );
- }
- unset( $id );
-
- $this->_setup_host_request( 'wordpress.org', '/' );
- $this->assertEquals( $ids['wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/2014/04/23/hello-world/' );
- $this->assertEquals( $ids['wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/sample-page/' );
- $this->assertEquals( $ids['wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/?p=1' );
- $this->assertEquals( $ids['wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/wp-admin/' );
- $this->assertEquals( $ids['wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/foo/' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/FOO/' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/foo/2014/04/23/hello-world/' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/foo/sample-page/' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/foo/?p=1' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'wordpress.org', '/foo/wp-admin/' );
- $this->assertEquals( $ids['wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- // @todo not currently passing.
- //$this->_setup_host_request( 'wordpress.org', '/foo/bar/' );
- //$this->assertEquals( $ids['wordpress.org/foo/bar/'], $current_blog->blog_id );
- //$this->assertEquals( $network_ids['wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'make.wordpress.org', '/' );
- $this->assertEquals( $ids['make.wordpress.org/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['make.wordpress.org/'], $current_blog->site_id );
-
- $this->_setup_host_request( 'make.wordpress.org', '/foo/' );
- $this->assertEquals( $ids['make.wordpress.org/foo/'], $current_blog->blog_id );
- $this->assertEquals( $network_ids['make.wordpress.org/'], $current_blog->site_id );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Reset various globals required for a 'clean' multisite boot.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The $wpdb and $table_prefix globals are required for ms-settings.php to
</span></span></pre></div>
<a id="branches40testsphpunittestsoptionblogOptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/option/blogOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/option/blogOption.php 2017-04-15 22:01:29 UTC (rev 40456)
+++ branches/4.0/tests/phpunit/tests/option/blogOption.php 2017-04-15 22:22:29 UTC (rev 40457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,79 +21,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $this->suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_from_same_site() {
- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
-
- $this->assertFalse( get_blog_option( 1, 'doesnotexist' ) );
- $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
-
- $this->assertTrue( add_blog_option( 1, $key, $value ) );
- // Assert all values of $blog_id that means the current or main blog (the same here).
- $this->assertEquals( $value, get_blog_option( 1, $key ) );
- $this->assertEquals( $value, get_blog_option( null, $key ) );
- $this->assertEquals( $value, get_blog_option( '1', $key ) );
- $this->assertEquals( $value, get_option( $key ) ); // check get_option()
-
- $this->assertFalse( add_blog_option( 1, $key, $value ) ); // Already exists
- $this->assertFalse( update_blog_option( 1, $key, $value ) ); // Value is the same
- $this->assertTrue( update_blog_option( 1, $key, $value2 ) );
- $this->assertEquals( $value2, get_blog_option( 1, $key ) );
- $this->assertEquals( $value2, get_option( $key ) ); // check get_option()
- $this->assertFalse( add_blog_option( 1, $key, $value ) );
- $this->assertEquals( $value2, get_blog_option( 1, $key ) );
- $this->assertEquals( $value2, get_option( $key ) ); // check get_option()
-
- $this->assertTrue( delete_blog_option( 1, $key ) );
- $this->assertFalse( get_blog_option( 1, $key ) );
- $this->assertFalse( get_option( $key ) ); // check get_option()
- $this->assertFalse( delete_blog_option( 1, $key ) );
- $this->assertTrue( update_blog_option( 1, $key2, $value2 ) );
- $this->assertEquals( $value2, get_blog_option( 1, $key2 ) );
- $this->assertEquals( $value2, get_option( $key2 ) ); // check get_option()
- $this->assertTrue( delete_blog_option( 1, $key2 ) );
- $this->assertFalse( get_blog_option( 1, $key2 ) );
- $this->assertFalse( get_option( $key2 ) ); // check get_option()
- }
-
- function test_from_same_site_with_null_blog_id() {
- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
-
- $this->assertFalse( get_blog_option( null, 'doesnotexist' ) );
- $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
-
- $this->assertTrue( add_blog_option( null, $key, $value ) );
- // Assert all values of $blog_id that means the current or main blog (the same here).
- $this->assertEquals( $value, get_blog_option( null, $key ) );
- $this->assertEquals( $value, get_blog_option( null, $key ) );
- $this->assertEquals( $value, get_option( $key ) ); // check get_option()
-
- $this->assertFalse( add_blog_option( null, $key, $value ) ); // Already exists
- $this->assertFalse( update_blog_option( null, $key, $value ) ); // Value is the same
- $this->assertTrue( update_blog_option( null, $key, $value2 ) );
- $this->assertEquals( $value2, get_blog_option( null, $key ) );
- $this->assertEquals( $value2, get_option( $key ) ); // check get_option()
- $this->assertFalse( add_blog_option( null, $key, $value ) );
- $this->assertEquals( $value2, get_blog_option( null, $key ) );
- $this->assertEquals( $value2, get_option( $key ) ); // check get_option()
-
- $this->assertTrue( delete_blog_option( null, $key ) );
- $this->assertFalse( get_blog_option( null, $key ) );
- $this->assertFalse( get_option( $key ) ); // check get_option()
- $this->assertFalse( delete_blog_option( null, $key ) );
- $this->assertTrue( update_blog_option( null, $key2, $value2 ) );
- $this->assertEquals( $value2, get_blog_option( null, $key2 ) );
- $this->assertEquals( $value2, get_option( $key2 ) ); // check get_option()
- $this->assertTrue( delete_blog_option( null, $key2 ) );
- $this->assertFalse( get_blog_option( null, $key2 ) );
- $this->assertFalse( get_option( $key2 ) ); // check get_option()
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_with_another_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_site, $base;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>