<!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>[364] wp-testcase/test_includes_canonical.php: 2nd wave of Canonical test cases.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd>364</dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-06-03 04:28:49 +0000 (Fri, 03 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>2nd wave of Canonical test cases. Expand test harness to handle more compact $expected values for simple redirect tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_canonicalphp">wp-testcase/test_includes_canonical.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_includes_canonicalphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_canonical.php (363 => 364)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_canonical.php 2011-06-03 04:24:20 UTC (rev 363)
+++ wp-testcase/test_includes_canonical.php 2011-06-03 04:28:49 UTC (rev 364)
</span><span class="lines">@@ -49,6 +49,16 @@
</span><span class="cx"> if ( $ticket )
</span><span class="cx"> $this->knownWPBug($ticket);
</span><span class="cx">
</span><ins>+ $ticket_ref = ($ticket > 0) ? 'Ticket #' . $ticket : null;
+
+ if ( is_string($expected) )
+ $expected = array('url' => $expected);
+ elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) )
+ $expected = array( 'qv' => $expected );
+
+ if ( !isset($expected['url']) && !isset($expected['qv']) )
+ $this->markTestSkipped('No valid expected output was provided');
+
</ins><span class="cx"> $this->http( get_option('home') . $test_url );
</span><span class="cx">
</span><span class="cx"> // Does the redirect match what's expected?
</span><span class="lines">@@ -56,30 +66,40 @@
</span><span class="cx"> $parsed_can_url = parse_url($can_url);
</span><span class="cx">
</span><span class="cx"> // Just test the Path and Query if present
</span><del>- $this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : '') );
</del><ins>+ if ( isset($expected['url']) )
+ $this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
</ins><span class="cx">
</span><span class="cx"> // request url is correct, Next, "make" that the request and check the query is correct
</span><span class="cx"> $this->http( $can_url );
</span><del>-
- // Are all query vars accounted for, And correct?
- global $wp;
</del><ins>+
+ if ( isset($expected['qv']) ) {
+ // Are all query vars accounted for, And correct?
+ global $wp;
+
+ $query_vars = array_diff($wp->query_vars, $wp->extra_query_vars);
+ if ( !empty($parsed_can_url['query']) ) {
+ parse_str($parsed_can_url['query'], $_qv);
+
+ // $_qv should not contain any elements which are set in $query_vars already (ie. $_GET vars should not be present in the Rewrite)
+ $this->assertEquals( array(), array_intersect( $query_vars, $_qv ), 'Query vars are duplicated from the Rewrite into $_GET; ' . $ticket_ref );
+
+ $query_vars = array_merge($query_vars, $_qv);
+ }
+
+ $this->assertEquals( $expected['qv'], $query_vars );
+ } //isset $expected['qv']
</ins><span class="cx">
</span><del>- $query_vars = array_diff($wp->query_vars, $wp->extra_query_vars);
- if ( !empty($parsed_can_url['query']) ) {
- parse_str($parsed_can_url['query'], $_qv);
-
- // $_qv should not contain any elements which are set in $query_vars already (ie. $_GET vars should not be present in the Rewrite)
- $this->assertEquals( array(), array_intersect( $query_vars, $_qv ), 'Query vars are duplicated from the Rewrite into $_GET' );
-
- $query_vars = array_merge($query_vars, $_qv);
- }
-
- $this->assertEquals( $expected['qv'], $query_vars );
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function data() {
</span><del>- return array( /* Format: [0]: $test_url, [1]: expected results: array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite OR $_GET ); */
</del><ins>+ return array( /*
+ Format: [0]: $test_url,
+ [1]: expected results: Any of the following can be used
+ array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite OR $_GET );
+ array( expected query vars to be hit )
+ (string) 'expected redirect url'
+ [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
+ */
</ins><span class="cx"> // Categories
</span><span class="cx"> array( '/category/uncategorized/', array( 'url' => '/category/uncategorized/', 'qv' => array( 'category_name' => 'uncategorized' ) ) ),
</span><span class="cx"> array( '/category/uncategorized/page/2/', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
</span><span class="lines">@@ -94,11 +114,53 @@
</span><span class="cx"> array( '/category/uncategorized/?paged=2&year=2008', array( 'url' => '/category/uncategorized/page/2/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2, 'year' => 2008) ), 17661 ),
</span><span class="cx"> array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
</span><span class="cx"> array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ), 17661 ),
</span><ins>+ array( '/category/uncategorized/?year=2008', array( 'url' => '/2008/?category_name=uncategorized', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
</ins><span class="cx">
</span><span class="cx"> // Pages
</span><del>- array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page' ) ), 17653 ),
- array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page' ) ), 14773 ),
</del><ins>+ array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 17653 ), // Page rules always set 'page'
+ array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
+ array( '/child-page-1/', '/parent-page/child-page-1/'),
+ array( '/?page_id=144', '/parent-page/child-page-1/'),
+ array( '/abo', '/about/' ),
</ins><span class="cx">
</span><ins>+
+ // Posts
+ array( '?p=587', '/2008/06/02/post-format-test-audio/'),
+ array( '/?name=images-test', '/2008/09/03/images-test/'),
+ array( '/?pagename=images-test', '/2008/09/03/images-test/'),
+
+ array( '/2008/06/02/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2008/06/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2008/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/'), // A Year the post is not in
+ array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+
+ array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '/3' ) ) ), // page = /3 ?!
+ array( '/2008/09/03/images-test/8/', '/2008/09/03/images-test/4/' ), // post with 4 pages
+
+ // Attachments
+ array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
+ array( '/2008/09/03/images-test/canola2/', '/2008/06/10/post-format-test-gallery/canola2/' ), // Image accessed via incorrect parent
+ array( '/2008/06/10/post-format-test-gallery/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
+
+ // Dates
+ array( '/?m=2008', '/2008/' ),
+ array( '/?m=200809', '/2008/09/'),
+ array( '/?m=20080905', '/2008/09/05/'),
+ array( '/?m=2008095', '/2008/09/'), // Invalid date, /09/ or /09/05/ perhaps?
+
+ array( '/2008/?day=05', '/2008/?day=05'), // no redirect
+ array( '/2008/09/?day=05', '/2008/09/05/'),
+ array( '/2008/?monthnum=9', '/2008/09/'),
+
+ array( '/?year=2008', '/2008/'),
+
+ // Authors
+ array( '/?author=3', '/author/chip-bennett/' ),
+ array( '/?author=3&year=2008', '/2008/?author=3'),
+ array( '/author/chip-bennett/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.
+
+
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>