<!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>[42381] trunk/tests/phpunit: Build/Test tools: Remove unnecessary PHP functionality tests from the test suite.</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/42381">42381</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/42381","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-12-09 23:08:24 +0000 (Sat, 09 Dec 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: Remove unnecessary PHP functionality tests from the test suite.
Props Frank Klein
Fixes <a href="https://core.trac.wordpress.org/ticket/42277">#42277</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesclassbasicobjectphp">trunk/tests/phpunit/includes/class-basic-object.php</a></li>
<li><a href="#trunktestsphpunitincludesclassbasicsubclassphp">trunk/tests/phpunit/includes/class-basic-subclass.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesclassbasicobjectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/class-basic-object.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/class-basic-object.php 2017-12-09 22:50:13 UTC (rev 42380)
+++ trunk/tests/phpunit/includes/class-basic-object.php 2017-12-09 23:08:24 UTC (rev 42381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+trigger_error( __FILE__ . ' is deprecated since version 5.0.0 with no alternative available.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class used to test accessing methods and properties
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunitincludesclassbasicsubclassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/class-basic-subclass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/class-basic-subclass.php 2017-12-09 22:50:13 UTC (rev 42380)
+++ trunk/tests/phpunit/includes/class-basic-subclass.php 2017-12-09 23:08:24 UTC (rev 42381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+trigger_error( __FILE__ . ' is deprecated since version 5.0.0 with no alternative available.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class used to test accessing methods and properties.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php 2017-12-09 22:50:13 UTC (rev 42380)
+++ trunk/tests/phpunit/includes/functions.php 2017-12-09 23:08:24 UTC (rev 42381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once dirname( __FILE__ ) . '/class-basic-object.php';
-require_once dirname( __FILE__ ) . '/class-basic-subclass.php';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Resets various `$_SERVER` variables that can get altered during tests.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunktestsphpunittestsbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/basic.php 2017-12-09 22:50:13 UTC (rev 42380)
+++ trunk/tests/phpunit/tests/basic.php 2017-12-09 23:08:24 UTC (rev 42381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,32 +39,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertRegExp( '~^=?\d+\.\d+\.\d+$~', $node, "package.json's node version cannot be a range." );
</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">- // two tests for a lame bug in PHPUnit that broke the $GLOBALS reference
- function test_globals() {
- global $test_foo;
- $test_foo = array( 'foo', 'bar', 'baz' );
-
- function test_globals_foo() {
- unset( $GLOBALS['test_foo'][1] );
- }
-
- test_globals_foo();
-
- $this->assertEquals(
- $test_foo, array(
- 0 => 'foo',
- 2 => 'baz',
- )
- );
- $this->assertEquals( $test_foo, $GLOBALS['test_foo'] );
- }
-
- function test_globals_bar() {
- global $test_bar;
- $test_bar = array( 'a', 'b', 'c' );
- $this->assertEquals( $test_bar, $GLOBALS['test_bar'] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // test some helper utility functions
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_strip_ws() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,74 +84,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, mask_input_value( $in ) );
</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 17884
- */
- function test_setting_nonexistent_arrays() {
- $page = 1;
- $field = 'settings';
-
- $empty_array[ $page ][ $field ] = 'foo';
-
- // Assertion not strictly needed; we mainly want to show that a notice is not thrown.
- unset( $empty_array[ $page ]['bar']['baz'] );
- $this->assertFalse( isset( $empty_array[ $page ]['bar']['baz'] ) );
- }
-
- function test_magic_getter() {
- $basic = new Basic_Object();
-
- $this->assertEquals( 'bar', $basic->foo );
- }
-
- function test_subclass_magic_getter() {
- $basic = new Basic_Subclass();
-
- $this->assertEquals( 'bar', $basic->foo );
- }
-
- function test_call_method() {
- $basic = new Basic_Object();
-
- $this->assertEquals( 'maybe', $basic->callMe() );
- }
-
- function test_subclass_call_method() {
- $basic = new Basic_Subclass();
-
- $this->assertEquals( 'maybe', $basic->callMe() );
- }
-
- function test_subclass_isset() {
- $basic = new Basic_Subclass();
-
- $this->assertTrue( isset( $basic->foo ) );
- }
-
- function test_subclass_unset() {
- $basic = new Basic_Subclass();
-
- unset( $basic->foo );
-
- $this->assertFalse( isset( $basic->foo ) );
- }
-
- function test_switch_order() {
- $return = $this->_switch_order_helper( 1 );
- $this->assertEquals( 'match', $return );
- }
-
- function _switch_order_helper( $var ) {
- $return = 'no match';
- switch ( $var ) {
- default:
- break;
- case 1:
- $return = 'match';
- break;
- }
-
- return $return;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>