<!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>[36722] trunk/tests/phpunit/tests/url.php: Refactor some janky URL tests into data providers for clarity and better error reporting.</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/36722">36722</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/36722","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>2016-02-26 02:10:32 +0000 (Fri, 26 Feb 2016)</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'>Refactor some janky URL tests into data providers for clarity and better error reporting.
See <a href="https://core.trac.wordpress.org/ticket/35954">#35954</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsurlphp">trunk/tests/phpunit/tests/url.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsurlphp"></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/url.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/url.php 2016-02-26 02:08:47 UTC (rev 36721)
+++ trunk/tests/phpunit/tests/url.php 2016-02-26 02:10:32 UTC (rev 36722)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,132 +5,196 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group url
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_URL extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $_old_server;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->_old_server = $_SERVER;
</del><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['pagenow'] = '';
</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 tearDown() {
- $_SERVER = $this->_old_server;
- parent::tearDown();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @dataProvider data_is_ssl
+ */
+ function test_is_ssl( $value, $expected ) {
+ $_SERVER['HTTPS'] = $value;
+
+ $is_ssl = is_ssl();
+ $this->assertSame( $expected, $is_ssl );
</ins><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_is_ssl_positive() {
- $_SERVER['HTTPS'] = 'on';
- $this->assertTrue( is_ssl() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function data_is_ssl() {
+ return array(
+ array(
+ 'on',
+ true,
+ ),
+ array(
+ 'ON',
+ true,
+ ),
+ array(
+ '1',
+ true,
+ ),
+ array(
+ 'off',
+ false,
+ ),
+ array(
+ 'OFF',
+ false,
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTPS'] = 'ON';
- $this->assertTrue( is_ssl() );
-
- $_SERVER['HTTPS'] = '1';
- $this->assertTrue( is_ssl() );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_is_ssl_by_port() {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $_SERVER['HTTPS'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_PORT'] = '443';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( is_ssl() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $is_ssl = is_ssl();
+ $this->assertTrue( $is_ssl );
</ins><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_is_ssl_negative() {
- $_SERVER['HTTPS'] = 'off';
- $this->assertFalse( is_ssl() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_is_ssl_with_no_value() {
+ unset( $_SERVER['HTTPS'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTPS'] = 'OFF';
- $this->assertFalse( is_ssl() );
-
- unset($_SERVER['HTTPS']);
- $this->assertFalse( is_ssl() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_ssl = is_ssl();
+ $this->assertFalse( $is_ssl );
</ins><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_admin_url_valid() {
- $paths = array(
- '' => "/wp-admin/",
- 'foo' => "/wp-admin/foo",
- '/foo' => "/wp-admin/foo",
- '/foo/' => "/wp-admin/foo/",
- 'foo.php' => "/wp-admin/foo.php",
- '/foo.php' => "/wp-admin/foo.php",
- '/foo.php?bar=1' => "/wp-admin/foo.php?bar=1",
- );
- $https = array('on', 'off');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @dataProvider data_admin_urls
+ *
+ * @param string $url Test URL.
+ * @param string $expected Expected result.
+ */
+ function test_admin_url( $url, $expected ) {
+ $siteurl_http = get_option( 'siteurl' );
+ $admin_url_http = admin_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($https as $val) {
- $_SERVER['HTTPS'] = $val;
- $siteurl = get_option('siteurl');
- if ( $val == 'on' )
- $siteurl = str_replace('http://', 'https://', $siteurl);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTPS'] = 'on';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($paths as $in => $out) {
- $this->assertEquals( $siteurl.$out, admin_url($in), "admin_url('{$in}') should equal '{$siteurl}{$out}'");
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $siteurl_https = set_url_scheme( $siteurl_http, 'https' );
+ $admin_url_https = admin_url( $url );
+
+ $this->assertEquals( $siteurl_http . $expected, $admin_url_http );
+ $this->assertEquals( $siteurl_https . $expected, $admin_url_https );
</ins><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_admin_url_invalid() {
- $paths = array(
- null => "/wp-admin/",
- 0 => "/wp-admin/",
- -1 => "/wp-admin/",
- '///' => "/wp-admin/",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function data_admin_urls() {
+ return array(
+ array(
+ null,
+ '/wp-admin/'
+ ),
+ array(
+ 0,
+ '/wp-admin/'
+ ),
+ array(
+ -1,
+ '/wp-admin/'
+ ),
+ array(
+ '///',
+ '/wp-admin/'
+ ),
+ array(
+ '',
+ '/wp-admin/',
+ ),
+ array(
+ 'foo',
+ '/wp-admin/foo',
+ ),
+ array(
+ '/foo',
+ '/wp-admin/foo',
+ ),
+ array(
+ '/foo/',
+ '/wp-admin/foo/',
+ ),
+ array(
+ 'foo.php',
+ '/wp-admin/foo.php',
+ ),
+ array(
+ '/foo.php',
+ '/wp-admin/foo.php',
+ ),
+ array(
+ '/foo.php?bar=1',
+ '/wp-admin/foo.php?bar=1',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $https = array('on', 'off');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($https as $val) {
- $_SERVER['HTTPS'] = $val;
- $siteurl = get_option('siteurl');
- if ( $val == 'on' )
- $siteurl = str_replace('http://', 'https://', $siteurl);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @dataProvider data_home_urls
+ *
+ * @param string $url Test URL.
+ * @param string $expected Expected result.
+ */
+ function test_home_url( $url, $expected ) {
+ $homeurl_http = get_option( 'home' );
+ $home_url_http = home_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($paths as $in => $out) {
- $this->assertEquals( $siteurl.$out, admin_url($in), "admin_url('{$in}') should equal '{$siteurl}{$out}'");
- }
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTPS'] = 'on';
</ins><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_home_url_valid() {
- $paths = array(
- '' => "",
- 'foo' => "/foo",
- '/foo' => "/foo",
- '/foo/' => "/foo/",
- 'foo.php' => "/foo.php",
- '/foo.php' => "/foo.php",
- '/foo.php?bar=1' => "/foo.php?bar=1",
- );
- $https = array('on', 'off');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $homeurl_https = set_url_scheme( $homeurl_http, 'https' );
+ $home_url_https = home_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($https as $val) {
- $_SERVER['HTTPS'] = $val;
- $home = get_option('home');
- if ( $val == 'on' )
- $home = str_replace('http://', 'https://', $home);
-
- foreach ($paths as $in => $out) {
- $this->assertEquals( $home.$out, home_url($in), "home_url('{$in}') should equal '{$home}{$out}'");
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $homeurl_http . $expected, $home_url_http );
+ $this->assertEquals( $homeurl_https . $expected, $home_url_https );
</ins><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_home_url_invalid() {
- $paths = array(
- null => "",
- 0 => "",
- -1 => "",
- '///' => "/",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function data_home_urls() {
+ return array(
+ array(
+ null,
+ "",
+ ),
+ array(
+ 0,
+ "",
+ ),
+ array(
+ -1,
+ "",
+ ),
+ array(
+ '///',
+ "/",
+ ),
+ array(
+ '',
+ "",
+ ),
+ array(
+ 'foo',
+ "/foo",
+ ),
+ array(
+ '/foo',
+ "/foo",
+ ),
+ array(
+ '/foo/',
+ "/foo/",
+ ),
+ array(
+ 'foo.php',
+ "/foo.php",
+ ),
+ array(
+ '/foo.php',
+ "/foo.php",
+ ),
+ array(
+ '/foo.php?bar=1',
+ "/foo.php?bar=1",
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $https = array('on', 'off');
-
- foreach ($https as $val) {
- $_SERVER['HTTPS'] = $val;
- $home = get_option('home');
- if ( $val == 'on' )
- $home = str_replace('http://', 'https://', $home);
-
- foreach ($paths as $in => $out) {
- $this->assertEquals( $home.$out, home_url($in), "home_url('{$in}') should equal '{$home}{$out}'");
- }
- }
</del><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"> function test_home_url_from_admin() {
</span></span></pre>
</div>
</div>
</body>
</html>