<!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>[46159] trunk/tests/phpunit/tests/functions/WpValidateBoolean.php: Build/Test Tools: Improve test coverage for `wp_validate_boolean()`.</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/46159">46159</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/46159","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-17 18:48:27 +0000 (Tue, 17 Sep 2019)</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: Improve test coverage for `wp_validate_boolean()`.
This change also reworks the test class to use a data provider.
Props pbearne, desrosj
Fixes <a href="https://core.trac.wordpress.org/ticket/39868">#39868</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsWpValidateBooleanphp">trunk/tests/phpunit/tests/functions/WpValidateBoolean.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsWpValidateBooleanphp"></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/functions/WpValidateBoolean.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/WpValidateBoolean.php 2019-09-17 17:26:38 UTC (rev 46158)
+++ trunk/tests/phpunit/tests/functions/WpValidateBoolean.php 2019-09-17 18:48:27 UTC (rev 46159)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,75 +1,59 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests the wp_validate_boolean function.
+ *
+ * @covers ::wp_validate_boolean
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group functions.php
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Functions_WpValidateBoolean extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_bool_true() {
- $this->assertTrue( wp_validate_boolean( true ) );
- }
-
- public function test_int_1() {
- $this->assertTrue( wp_validate_boolean( 1 ) );
- }
-
- public function test_string_true_lowercase() {
- $this->assertTrue( wp_validate_boolean( 'true' ) );
- }
-
- public function test_string_true_uppercase() {
- $this->assertTrue( wp_validate_boolean( 'TRUE' ) );
- }
-
- public function test_arbitrary_string_should_return_true() {
- $this->assertTrue( wp_validate_boolean( 'foobar' ) );
- }
-
- public function test_bool_false() {
- $this->assertFalse( wp_validate_boolean( false ) );
- }
-
- public function test_int_0() {
- $this->assertFalse( wp_validate_boolean( 0 ) );
- }
-
- public function test_float_0() {
- $this->assertFalse( wp_validate_boolean( 0.0 ) );
- }
-
- public function test_empty_string() {
- $this->assertFalse( wp_validate_boolean( '' ) );
- }
-
- public function test_string_0() {
- $this->assertFalse( wp_validate_boolean( '0' ) );
- }
-
- public function test_empty_array() {
- $this->assertFalse( wp_validate_boolean( array() ) );
- }
-
- public function test_null() {
- $this->assertFalse( wp_validate_boolean( null ) );
- }
-
- public function test_string_false_lowercase() {
- // Differs from (bool) conversion.
- $this->assertFalse( wp_validate_boolean( 'false' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 30238
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Provides test scenarios for all possible scenarios in wp_validate_boolean().
+ *
+ * @return array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_string_false_uppercase() {
- // Differs from (bool) conversion.
- $this->assertFalse( wp_validate_boolean( 'FALSE' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function data_provider() {
+ $std = new \stdClass();
+
+ return array(
+ array( null, false ),
+ array( true, true ),
+ array( false, false ),
+ array( 'true', true ),
+ array( 'false', false ),
+ array( 'FalSE', false ), // @ticket 30238
+ array( 'FALSE', false ), // @ticket 30238
+ array( 'TRUE', true ),
+ array( ' FALSE ', true ),
+ array( 'yes', true ),
+ array( 'no', true ),
+ array( 'string', true ),
+ array( '', false ),
+ array( array(), false ),
+ array( 1, true ),
+ array( 0, false ),
+ array( -1, true ),
+ array( 99, true ),
+ array( 0.1, true ),
+ array( 0.0, false ),
+ array( '1', true ),
+ array( '0', false ),
+ array( $std, true ),
+ );
</ins><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test wp_validate_boolean().
+ *
+ * @dataProvider data_provider
+ *
+ * @param mixed $test_value.
+ * @param bool $expected.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30238
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 39868
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_string_false_mixedcase() {
- // Differs from (bool) conversion.
- $this->assertFalse( wp_validate_boolean( 'FaLsE' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_validate_boolean( $test_value, $expected ) {
+ $this->assertEquals( wp_validate_boolean( $test_value ), $expected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>