Changeset 54756 for trunk/tests/phpunit/tests/multisite/updateBlogDetails.php

Timestamp:

11/06/2022 03:54:34 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove a custom callback for checking action call count in multisite tests.

Use MockAction::get_call_count() instead, for consistency with the rest of the test suite.

Follow-up to [24/tests], [99/tests], [1078/tests], [1089/tests], [29916], [30784], [30785], [33253].

See #56793.

File:

• trunk/tests/phpunit/tests/multisite/updateBlogDetails.php (modified) (5 diffs)

trunk/tests/phpunit/tests/multisite/updateBlogDetails.php

@@ -57 +57 @@
          */
         public function test_update_blog_details_flag_action( $flag, $flag_value, $hook ) {
-            global $test_action_counter;
-            $test_action_counter = 0;
+            $test_action_counter = new MockAction();
 
             $blog_id = self::factory()->blog->create();
@@ -67 +66 @@
             }
 
-            add_action( $hook, array( $this, 'action_counter_cb' ), 10 );
+            add_action( $hook, array( $test_action_counter, 'action' ) );
 
             update_blog_details( $blog_id, array( $flag => $flag_value ) );
@@ -75 +74 @@
 
             // The hook attached to this flag should have fired once during update_blog_details().
-            $this->assertSame( 1, $test_action_counter );
+            $this->assertSame( 1, $test_action_counter->get_call_count() );
 
             // Update the site to the exact same flag value for this flag.
@@ -81 +80 @@
 
             // The hook attached to this flag should not have fired again.
-            $this->assertSame( 1, $test_action_counter );
-
-            remove_action( $hook, array( $this, 'action_counter_cb' ), 10 );
+            $this->assertSame( 1, $test_action_counter->get_call_count() );
         }
 
@@ -97 +94 @@
                 array( 'mature', '0', 'unmature_blog' ),
             );
-        }
-
-        /**
-         * Provide a counter to determine that hooks are firing when intended.
-         */
-        public function action_counter_cb() {
-            global $test_action_counter;
-            $test_action_counter++;
         }