<!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>[53478] trunk/tests/phpunit/tests: Tests: Move the tests for individual pluggable functions into their own directory.</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/53478">53478</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/53478","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-06-07 14:44:00 +0000 (Tue, 07 Jun 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: Move the tests for individual pluggable functions into their own directory.
This aims to make the tests more discoverable and easier to expand.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/50790">[50790]</a>, <a href="https://core.trac.wordpress.org/changeset/53473">[53473]</a>, <a href="https://core.trac.wordpress.org/changeset/53477">[53477]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/tests/pluggable/</li>
<li><a href="#trunktestsphpunittestspluggablegetUserByphp">trunk/tests/phpunit/tests/pluggable/getUserBy.php</a></li>
<li><a href="#trunktestsphpunittestspluggablewpRandphp">trunk/tests/phpunit/tests/pluggable/wpRand.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestspluggablegetUserByphpfromrev53477trunktestsphpunittestspluggablephp"></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/pluggable/getUserBy.php (from rev 53477, trunk/tests/phpunit/tests/pluggable.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable/getUserBy.php (rev 0)
+++ trunk/tests/phpunit/tests/pluggable/getUserBy.php 2022-06-07 14:44:00 UTC (rev 53478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,24 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group pluggable
+ * @covers ::get_user_by
+ */
+class Tests_Pluggable_GetUserBy extends WP_UnitTestCase {
+
+ /**
+ * @ticket 28020
+ */
+ public function test_get_user_by_should_return_same_instance_as_wp_get_current_user() {
+ // Create a test user.
+ $new_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+
+ // Set the test user as the current user.
+ $current_user = wp_set_current_user( $new_user );
+
+ // Get the test user using get_user_by().
+ $from_get_user_by = get_user_by( 'id', $new_user );
+
+ $this->assertSame( $current_user, $from_get_user_by );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestspluggablewpRandphpfromrev53477trunktestsphpunittestspluggablephp"></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/pluggable/wpRand.php (from rev 53477, trunk/tests/phpunit/tests/pluggable.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable/wpRand.php (rev 0)
+++ trunk/tests/phpunit/tests/pluggable/wpRand.php 2022-06-07 14:44:00 UTC (rev 53478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,100 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group pluggable
+ * @covers ::wp_rand
+ */
+class Tests_Pluggable_wpRand extends WP_UnitTestCase {
+
+ /**
+ * Tests that wp_rand() returns a positive integer for both positive and negative input.
+ *
+ * @ticket 55194
+ * @dataProvider data_wp_rand_should_return_a_positive_integer
+ *
+ * @param int $min Lower limit for the generated number.
+ * @param int $max Upper limit for the generated number.
+ */
+ public function test_wp_rand_should_return_a_positive_integer( $min, $max ) {
+ $this->assertGreaterThan(
+ 0,
+ wp_rand( $min, $max ),
+ 'The value was not greater than 0'
+ );
+
+ $this->assertLessThan(
+ 100,
+ wp_rand( $min, $max ),
+ 'The value was not less than 100'
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_wp_rand_should_return_a_positive_integer() {
+ return array(
+ '1 and 99' => array(
+ 'min' => 1,
+ 'max' => 99,
+ ),
+ '-1 and 99' => array(
+ 'min' => -1,
+ 'max' => 99,
+ ),
+ '1 and -99' => array(
+ 'min' => 1,
+ 'max' => -99,
+ ),
+ '-1 and -99' => array(
+ 'min' => -1,
+ 'max' => -99,
+ ),
+ '1.0 and 99.0' => array(
+ 'min' => 1.0,
+ 'max' => 99.0,
+ ),
+ '-1.0 and -99.0' => array(
+ 'min' => -1.0,
+ 'max' => -99.0,
+ ),
+ );
+ }
+
+ /**
+ * Tests that wp_rand() returns zero when `$min` and `$max` are zero.
+ *
+ * @ticket 55194
+ * @dataProvider data_wp_rand_should_return_zero_when_min_and_max_are_zero
+ *
+ * @param mixed $min Lower limit for the generated number.
+ * @param mixed $max Upper limit for the generated number.
+ */
+ public function test_wp_rand_should_return_zero_when_min_and_max_are_zero( $min, $max ) {
+ $this->assertSame( 0, wp_rand( $min, $max ) );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_wp_rand_should_return_zero_when_min_and_max_are_zero() {
+ return array(
+ 'min and max as 0' => array(
+ 'min' => 0,
+ 'max' => 0,
+ ),
+ 'min and max as 0.0' => array(
+ 'min' => 0.0,
+ 'max' => 0.0,
+ ),
+ 'min as null, max as 0' => array(
+ 'min' => null,
+ 'max' => 0,
+ ),
+ );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestspluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable.php 2022-06-07 12:01:09 UTC (rev 53477)
+++ trunk/tests/phpunit/tests/pluggable.php 2022-06-07 14:44:00 UTC (rev 53478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,114 +338,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $signatures;
</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 28020
- */
- public function test_get_user_by_should_return_same_instance_as_wp_get_current_user() {
- // Create a test user.
- $new_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
-
- // Set the test user as the current user.
- $current_user = wp_set_current_user( $new_user );
-
- // Get the test user using get_user_by().
- $from_get_user_by = get_user_by( 'id', $new_user );
-
- $this->assertSame( $current_user, $from_get_user_by );
- }
-
- /**
- * Tests that wp_rand() returns zero when `$min` and `$max` are zero.
- *
- * @ticket 55194
- * @dataProvider data_wp_rand_should_return_zero_when_min_and_max_are_zero
- * @covers ::wp_rand
- *
- * @param mixed $min Lower limit for the generated number.
- * @param mixed $max Upper limit for the generated number.
- */
- public function test_wp_rand_should_return_zero_when_min_and_max_are_zero( $min, $max ) {
- $this->assertSame( 0, wp_rand( $min, $max ) );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_wp_rand_should_return_zero_when_min_and_max_are_zero() {
- return array(
- 'min and max as 0' => array(
- 'min' => 0,
- 'max' => 0,
- ),
- 'min and max as 0.0' => array(
- 'min' => 0.0,
- 'max' => 0.0,
- ),
- 'min as null, max as 0' => array(
- 'min' => null,
- 'max' => 0,
- ),
- );
- }
-
- /**
- * Tests that wp_rand() returns a positive integer for both positive and negative input.
- *
- * @ticket 55194
- * @dataProvider data_wp_rand_should_return_a_positive_integer
- * @covers ::wp_rand
- *
- * @param int $min Lower limit for the generated number.
- * @param int $max Upper limit for the generated number.
- */
- public function test_wp_rand_should_return_a_positive_integer( $min, $max ) {
- $this->assertGreaterThan(
- 0,
- wp_rand( $min, $max ),
- 'The value was not greater than 0'
- );
-
- $this->assertLessThan(
- 100,
- wp_rand( $min, $max ),
- 'The value was not less than 100'
- );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_wp_rand_should_return_a_positive_integer() {
- return array(
- '1 and 99' => array(
- 'min' => 1,
- 'max' => 99,
- ),
- '-1 and 99' => array(
- 'min' => -1,
- 'max' => 99,
- ),
- '1 and -99' => array(
- 'min' => 1,
- 'max' => -99,
- ),
- '-1 and -99' => array(
- 'min' => -1,
- 'max' => -99,
- ),
- '1.0 and 99.0' => array(
- 'min' => 1.0,
- 'max' => 99.0,
- ),
- '-1.0 and -99.0' => array(
- 'min' => -1.0,
- 'max' => -99.0,
- ),
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>