<!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>[53686] trunk/tests/phpunit/tests: Tests: Separate the tests in `basic.php` for clarity.</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 { white-space: pre-line; 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/53686">53686</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/53686","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-07 23:55:13 +0000 (Thu, 07 Jul 2022)</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'>Tests: Separate the tests in `basic.php` for clarity.
There were two kinds of tests in this file:
* Tests for content of some files in the root directory:
* `license.txt`
* `SECURITY.md`
* `package.json`
* Tests for some utility functions of the test framework itself:
* `strip_ws()`
* `test_mask_input_value()`
The latter are now moved to their own file, `utils.php`.
Follow-up to [22/tests], [81/tests], [103/tests], <a href="https://core.trac.wordpress.org/changeset/25240">[25240]</a>, <a href="https://core.trac.wordpress.org/changeset/26940">[26940]</a>, <a href="https://core.trac.wordpress.org/changeset/28064">[28064]</a>, <a href="https://core.trac.wordpress.org/changeset/28480">[28480]</a>, <a href="https://core.trac.wordpress.org/changeset/28493">[28493]</a>, <a href="https://core.trac.wordpress.org/changeset/28523">[28523]</a>, <a href="https://core.trac.wordpress.org/changeset/28631">[28631]</a>, <a href="https://core.trac.wordpress.org/changeset/42381">[42381]</a>, <a href="https://core.trac.wordpress.org/changeset/47403">[47403]</a>, <a href="https://core.trac.wordpress.org/changeset/53683">[53683]</a>.
See <a href="https://core.trac.wordpress.org/ticket/39265">#39265</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsutilsphp">trunk/tests/phpunit/tests/utils.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2022-07-07 23:30:21 UTC (rev 53685)
+++ trunk/tests/phpunit/tests/basic.php 2022-07-07 23:55:13 UTC (rev 53686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">- * just make sure the test framework is working
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test the content in some root directory files.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * No Covers as this checks for content in files
- *
- * @group testsuite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group basic
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Basic extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,56 +65,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'engines', $package_json );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'node', $package_json['engines'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Test some helper utility functions.
- *
- * @coversNothing
- */
- public function test_strip_ws() {
- $this->assertSame( '', strip_ws( '' ) );
- $this->assertSame( 'foo', strip_ws( 'foo' ) );
- $this->assertSame( '', strip_ws( "\r\n\t \n\r\t" ) );
-
- $in = "asdf\n";
- $in .= "asdf asdf\n";
- $in .= "asdf asdf\n";
- $in .= "\tasdf\n";
- $in .= "\tasdf\t\n";
- $in .= "\t\tasdf\n";
- $in .= "foo bar\n\r\n";
- $in .= "foo\n";
-
- $expected = "asdf\n";
- $expected .= "asdf asdf\n";
- $expected .= "asdf asdf\n";
- $expected .= "asdf\n";
- $expected .= "asdf\n";
- $expected .= "asdf\n";
- $expected .= "foo bar\n";
- $expected .= 'foo';
-
- $this->assertSame( $expected, strip_ws( $in ) );
-
- }
-
- /**
- * @coversNothing
- */
- public function test_mask_input_value() {
- $in = <<<EOF
-<h2>Assign Authors</h2>
-<p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>
-<p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>
- <ol id="authors"><form action="?import=wordpress&step=2&id=" method="post"><input type="hidden" name="_wpnonce" value="855ae98911" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">
-EOF;
- // _wpnonce value should be replaced with 'xxx'.
- $expected = <<<EOF
-<h2>Assign Authors</h2>
-<p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>
-<p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>
- <ol id="authors"><form action="?import=wordpress&step=2&id=" method="post"><input type="hidden" name="_wpnonce" value="***" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">
-EOF;
- $this->assertSame( $expected, mask_input_value( $in ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsutilsphpfromrev53684trunktestsphpunittestsbasicphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/utils.php (from rev 53684, 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/utils.php (rev 0)
+++ trunk/tests/phpunit/tests/utils.php 2022-07-07 23:55:13 UTC (rev 53686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,59 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Test some helper utility functions of the test framework.
+ *
+ * @group testsuite
+ */
+class Tests_Utils extends WP_UnitTestCase {
+
+ /**
+ * @covers ::test_strip_ws
+ */
+ public function test_strip_ws() {
+ $this->assertSame( '', strip_ws( '' ) );
+ $this->assertSame( 'foo', strip_ws( 'foo' ) );
+ $this->assertSame( '', strip_ws( "\r\n\t \n\r\t" ) );
+
+ $in = "asdf\n";
+ $in .= "asdf asdf\n";
+ $in .= "asdf asdf\n";
+ $in .= "\tasdf\n";
+ $in .= "\tasdf\t\n";
+ $in .= "\t\tasdf\n";
+ $in .= "foo bar\n\r\n";
+ $in .= "foo\n";
+
+ $expected = "asdf\n";
+ $expected .= "asdf asdf\n";
+ $expected .= "asdf asdf\n";
+ $expected .= "asdf\n";
+ $expected .= "asdf\n";
+ $expected .= "asdf\n";
+ $expected .= "foo bar\n";
+ $expected .= 'foo';
+
+ $this->assertSame( $expected, strip_ws( $in ) );
+
+ }
+
+ /**
+ * @covers ::mask_input_value
+ */
+ public function test_mask_input_value() {
+ $in = <<<EOF
+<h2>Assign Authors</h2>
+<p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>
+<p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>
+ <ol id="authors"><form action="?import=wordpress&step=2&id=" method="post"><input type="hidden" name="_wpnonce" value="855ae98911" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">
+EOF;
+ // _wpnonce value should be replaced with 'xxx'.
+ $expected = <<<EOF
+<h2>Assign Authors</h2>
+<p>To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.</p>
+<p>If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)</p>
+ <ol id="authors"><form action="?import=wordpress&step=2&id=" method="post"><input type="hidden" name="_wpnonce" value="***" /><input type="hidden" name="_wp_http_referer" value="wp-test.php" /><li>Current author: <strong>Alex Shiels</strong><br />Create user <input type="text" value="Alex Shiels" name="user[]" maxlength="30"> <br /> or map to existing<select name="userselect[0]">
+EOF;
+ $this->assertSame( $expected, mask_input_value( $in ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>