<!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>[54760] trunk/tests/phpunit/tests/multisite: Tests: Combine duplicate `update_posts_count()` 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/54760">54760</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/54760","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-11-07 17:45:29 +0000 (Mon, 07 Nov 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: Combine duplicate `update_posts_count()` tests.

This combines the newer test for `update_posts_count()` located in its own file with the pre-existing one from `tests/multisite/site.php`, which was essentially testing the same thing in a similar way.

Includes:
* Renaming the test class per the [https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization naming conventions].
* Adjusting comments per the documentation standards.
* Updating `@covers` tags for accuracy.
* Removing unnecessary blog switching.
* Using `assertSame()` to check the value type.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/28835">[28835]</a>, <a href="https://core.trac.wordpress.org/changeset/29667">[29667]</a>, <a href="https://core.trac.wordpress.org/changeset/52207">[52207]</a>.

See <a href="https://core.trac.wordpress.org/ticket/57023">#57023</a>, <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteupdatePostsCountphp">trunk/tests/phpunit/tests/multisite/updatePostsCount.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisitesitephp"></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/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php      2022-11-07 13:33:11 UTC (rev 54759)
+++ trunk/tests/phpunit/tests/multisite/site.php        2022-11-07 17:45:29 UTC (rev 54760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,18 +441,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 27952
-                */
-               public function test_posts_count() {
-                       self::factory()->post->create();
-                       $post2 = self::factory()->post->create();
-                       $this->assertSame( 2, get_site()->post_count );
-
-                       wp_delete_post( $post2 );
-                       $this->assertSame( 1, get_site()->post_count );
-               }
-
-               /**
</del><span class="cx" style="display: block; padding: 0 10px">                  * @ticket 26410
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="cx" style="display: block; padding: 0 10px">                public function test_blog_details_cache_invalidation() {
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteupdatePostsCountphp"></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/multisite/updatePostsCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/updatePostsCount.php  2022-11-07 13:33:11 UTC (rev 54759)
+++ trunk/tests/phpunit/tests/multisite/updatePostsCount.php    2022-11-07 17:45:29 UTC (rev 54760)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,54 +2,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) :
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Test update_posts_count() get called via filters of WP_Site in multisite.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Test that update_posts_count() gets called via default filters on multisite.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @group ms-site
</span><span class="cx" style="display: block; padding: 0 10px">         * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @covers ::_update_posts_count_on_delete
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @covers ::update_posts_count
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        class Tests_update_posts_count_on_delete extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ class Tests_Multisite_UpdatePostsCount extends WP_UnitTestCase {
</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">-                 * Test that the posts count is updated correctly when a posts are added and deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * Tests that posts count is updated correctly when posts are added or deleted.
+                *
+                * @ticket 27952
</ins><span class="cx" style="display: block; padding: 0 10px">                  * @ticket 53443
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *
+                * @covers ::_update_posts_count_on_transition_post_status
+                * @covers ::_update_posts_count_on_delete
</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_posts_count_on_delete() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         public function test_update_posts_count() {
+                       $original_post_count = (int) get_site()->post_count;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $blog_id = self::factory()->blog->create();
-                       switch_to_blog( $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $post_id = self::factory()->post->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $current_post_count = (int) get_option( 'post_count' );
-
-                       $post_id = self::factory()->post->create(
-                               array(
-                                       'post_type'   => 'post',
-                                       'post_author' => '1',
-                                       'post_date'   => '2012-10-23 19:34:42',
-                                       'post_status' => 'publish',
-                               )
-                       );
-
-                       /**
-                        * Check that add_action( 'deleted_post', '_update_posts_count_on_delete' ) is called when a post is created.
-                        * Check that _update_posts_count_on_transition_post_status() is called on that filter which then calls
-                        * update_posts_count to update the count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*
+                        * Check that posts count is updated when a post is created:
+                        * add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 );
+                        *
+                        * Check that _update_posts_count_on_transition_post_status() is called on that filter,
+                        * which then calls update_posts_count() to update the count.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $current_post_count + 1, (int) get_option( 'post_count' ), 'post added' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $original_post_count + 1, get_site()->post_count, 'Post count should be incremented by 1.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        wp_delete_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /**
-                        * Check that add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 )
-                        * is called when a post is deleted.
-                        * Check that _update_posts_count_on_delete() is called on that filter which then calls update_posts_count
-                        * to update the count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*
+                        * Check that posts count is updated when a post is deleted:
+                        * add_action( 'deleted_post', '_update_posts_count_on_delete' );
+                        *
+                        * Check that _update_posts_count_on_delete() is called on that filter,
+                        * which then calls update_posts_count() to update the count.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->assertEquals( $current_post_count, (int) get_option( 'post_count' ), 'post deleted' );
-
-                       restore_current_blog();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->assertSame( $original_post_count, get_site()->post_count, 'Post count should match the original count.' );
</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></span></pre>
</div>
</div>

</body>
</html>