<!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>[53861] trunk/tests/phpunit/tests: Tests: Improve the test for not throwing a warning on malformed date queries.</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/53861">53861</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/53861","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-08-08 14:38:08 +0000 (Mon, 08 Aug 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: Improve the test for not throwing a warning on malformed date queries.
* Make it specifically about `wp_resolve_numeric_slug_conflicts()`, the function that was throwing an `Undefined array key "year"` PHP warning for malformed date requests.
* Move the test under the `rewrite` component and make its name a bit more descriptive.
* Check the return result of the function instead of performing a dummy assertion.
* Use named array keys in the data provider for clarity.
* Add missing `@covers` tag.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/32648">[32648]</a>, <a href="https://core.trac.wordpress.org/changeset/53857">[53857]</a>.
Props costdev, peterwilsoncc, 1naveengiri, mukesh27, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/52252">#52252</a>, <a href="https://core.trac.wordpress.org/ticket/45513">#45513</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsrewritewpResolveNumericSlugConflictsphp">trunk/tests/phpunit/tests/rewrite/wpResolveNumericSlugConflicts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query.php 2022-08-08 12:39:51 UTC (rev 53860)
+++ trunk/tests/phpunit/tests/query.php 2022-08-08 14:38:08 UTC (rev 53861)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,13 +2,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fixed date post ID.
- *
- * @var int
- */
- public static $post_with_date;
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,15 +9,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</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">- public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
- self::$post_with_date = $factory->post->create(
- array(
- 'post_date' => '2020-01-05 12:00:00',
- 'post_name' => 'post-with-date',
- )
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24785
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,57 +698,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 52252
- * @dataProvider data_malformed_date_queries
- *
- * @param string $permalink_structure Permalink structure.
- * @param array $query_vars Querystring parameteres.
- */
- public function test_malformed_date_queries( $permalink_structure, $query_vars ) {
- $this->set_permalink_structure( $permalink_structure );
- $this->go_to( add_query_arg( $query_vars, home_url() ) );
-
- /*
- * Ticket 52252 was to prevent notices from being thrown
- * if the date query is malformed.
- *
- * The test will automatically fail if the function triggers a notice,
- * so this dummy assertion is just for accurate stats.
- */
- $this->assertTrue( true );
- }
-
- /**
- * Data provider for test_malformed_date_queries.
- *
- * @return array Test data.
- */
- public function data_malformed_date_queries() {
- return array(
- '/%postname%/ with missing year' => array(
- '/%postname%/',
- array(
- 'monthnum' => 1,
- 'day' => 15,
- ),
- ),
- '/%postname%/ with month only' => array(
- '/%postname%/',
- array(
- 'monthnum' => 1,
- ),
- ),
- '/%year%/%postname%/ with missing month' => array(
- '/%year%/%postname%/',
- array(
- 'year' => 2020,
- 'day' => 15,
- ),
- ),
- );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55100
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_queried_object_should_work_for_author_name_before_get_posts() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritewpResolveNumericSlugConflictsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/rewrite/wpResolveNumericSlugConflicts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/wpResolveNumericSlugConflicts.php (rev 0)
+++ trunk/tests/phpunit/tests/rewrite/wpResolveNumericSlugConflicts.php 2022-08-08 14:38:08 UTC (rev 53861)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,71 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group rewrite
+ * @covers ::wp_resolve_numeric_slug_conflicts
+ */
+class Tests_Rewrite_wpResolveNumericSlugConflicts extends WP_UnitTestCase {
+
+ /**
+ * Fixed date post ID.
+ *
+ * @var int
+ */
+ public static $post_with_date;
+
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ self::$post_with_date = $factory->post->create(
+ array(
+ 'post_date' => '2020-01-05 12:00:00',
+ 'post_name' => 'post-with-date',
+ )
+ );
+ }
+
+ /**
+ * @ticket 52252
+ * @dataProvider data_should_not_throw_warning_for_malformed_date_queries
+ *
+ * @param string $permalink_structure Permalink structure.
+ * @param array $query_vars Query string parameters.
+ */
+ public function test_should_not_throw_warning_for_malformed_date_queries( $permalink_structure, $query_vars ) {
+ $this->set_permalink_structure( $permalink_structure );
+
+ /*
+ * For malformed date queries, the function is unable to identify the requested post,
+ * and just returns the initial query vars.
+ */
+ $this->assertSame( $query_vars, wp_resolve_numeric_slug_conflicts( $query_vars ) );
+ }
+
+ /**
+ * Data provider for test_should_not_throw_warning_for_malformed_date_queries().
+ *
+ * @return array Test data.
+ */
+ public function data_should_not_throw_warning_for_malformed_date_queries() {
+ return array(
+ '/%postname%/ with missing year' => array(
+ 'permalink_structure' => '/%postname%/',
+ 'query' => array(
+ 'monthnum' => 1,
+ 'day' => 15,
+ ),
+ ),
+ '/%postname%/ with month only' => array(
+ 'permalink_structure' => '/%postname%/',
+ 'query' => array(
+ 'monthnum' => 1,
+ ),
+ ),
+ '/%year%/%postname%/ with missing month' => array(
+ 'permalink_structure' => '/%year%/%postname%/',
+ 'query' => array(
+ 'year' => 2020,
+ 'day' => 15,
+ ),
+ ),
+ );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/rewrite/wpResolveNumericSlugConflicts.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>