<!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>[53509] trunk/tests/phpunit/tests: Tests: Some improvements for REST API cache priming tests:</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/53509">53509</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/53509","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-15 14:07:24 +0000 (Wed, 15 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: Some improvements for REST API cache priming tests:
* Give the test methods more specific names and move them closer together.
* Correct the `@covers` tags.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53499">[53499]</a>, <a href="https://core.trac.wordpress.org/changeset/53504">[53504]</a>, <a href="https://core.trac.wordpress.org/changeset/53506">[53506]</a>, <a href="https://core.trac.wordpress.org/changeset/53507">[53507]</a>, <a href="https://core.trac.wordpress.org/changeset/53508">[53508]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55593">#55593</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestspostnavmenuphp"></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/post/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2022-06-15 13:35:28 UTC (rev 53508)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2022-06-15 14:07:24 UTC (rev 53509)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,9 +204,9 @@
</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"> * @ticket 55620
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @covers update_menu_item_cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers ::update_menu_item_cache
</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_update_menu_item_cache_primed_posts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_menu_item_cache_primes_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->menu_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,9 +235,9 @@
</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"> * @ticket 55620
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @covers update_menu_item_cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers ::update_menu_item_cache
</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_update_menu_item_cache_primed_terms() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_menu_item_cache_primes_terms() {
</ins><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_nav_menu_item(
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></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/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2022-06-15 13:35:28 UTC (rev 53508)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2022-06-15 14:07:24 UTC (rev 53509)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1517,8 +1517,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55592
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_REST_Posts_Controller::get_items
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers ::update_post_thumbnail_cache
</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_get_items_with_featured_media() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_items_primes_thumbnail_cache_for_featured_media() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/canola.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1534,7 +1535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_thumbnail( $post_ids[ $i ], $attachment_ids[ $i ] );
</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">- // Attachment creation warms thumbnail ids. Needs clean up for test.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Attachment creation warms thumbnail IDs. Needs clean up for test.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete_multiple( $attachment_ids, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = new MockAction();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1550,6 +1551,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $attachment_ids, $last[1] );
</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">+ /**
+ * @ticket 55593
+ * @covers WP_REST_Posts_Controller::get_items
+ * @covers ::update_post_parent_caches
+ */
+ public function test_get_items_primes_parent_post_caches() {
+ $parent_id1 = self::$post_ids[0];
+ $parent_id2 = self::$post_ids[1];
+ $parent_ids = array( $parent_id2, $parent_id1 );
+
+ $this->factory->attachment->create_object(
+ DIR_TESTDATA . '/images/canola.jpg',
+ $parent_id1,
+ array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_excerpt' => 'A sample caption 1',
+ )
+ );
+
+ $this->factory->attachment->create_object(
+ DIR_TESTDATA . '/images/canola.jpg',
+ $parent_id2,
+ array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_excerpt' => 'A sample caption 2',
+ )
+ );
+
+ // Attachment creation warms parent IDs. Needs clean up for test.
+ wp_cache_delete_multiple( $parent_ids, 'posts' );
+
+ $filter = new MockAction();
+ add_filter( 'update_post_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
+ rest_get_server()->dispatch( $request );
+
+ $args = $filter->get_args();
+ $last = end( $args );
+ $this->assertIsArray( $last, 'The last value is not an array' );
+ $this->assertEqualSets( $parent_ids, $last[1] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_pagination_headers() {
</span><span class="cx" style="display: block; padding: 0 10px"> $total_posts = self::$total_posts;
</span><span class="cx" style="display: block; padding: 0 10px"> $total_pages = (int) ceil( $total_posts / 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1787,49 +1831,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $formats, $data['schema']['properties']['format']['enum'] );
</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 55593
- * @covers WP_REST_Posts_Controller::get_items
- * @covers update_post_parent_caches
- */
- public function test_get_items_parent_ids_primed() {
- $parent_id1 = self::$post_ids[0];
- $parent_id2 = self::$post_ids[1];
- $parent_ids = array( $parent_id2, $parent_id1 );
-
- $this->factory->attachment->create_object(
- DIR_TESTDATA . '/images/canola.jpg',
- $parent_id1,
- array(
- 'post_mime_type' => 'image/jpeg',
- 'post_excerpt' => 'A sample caption 1',
- )
- );
-
- $this->factory->attachment->create_object(
- DIR_TESTDATA . '/images/canola.jpg',
- $parent_id2,
- array(
- 'post_mime_type' => 'image/jpeg',
- 'post_excerpt' => 'A sample caption 2',
- )
- );
-
- // Attachment creation warms parent ids. Needs clean up for test.
- wp_cache_delete_multiple( $parent_ids, 'posts' );
-
- $filter = new MockAction();
- add_filter( 'update_post_metadata_cache', array( $filter, 'filter' ), 10, 2 );
-
- $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
- rest_get_server()->dispatch( $request );
-
- $args = $filter->get_args();
- $last = end( $args );
- $this->assertIsArray( $last, 'The last value is not an array' );
- $this->assertEqualSets( $parent_ids, $last[1] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_get_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span></span></pre>
</div>
</div>
</body>
</html>