Changeset 48937 for trunk/tests/phpunit/tests/multisite/network.php

Timestamp:

09/02/2020 12:35:36 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: First pass at using assertSame() instead of assertEquals() in most of the unit tests.

This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using assertSame() should generally be preferred to assertEquals() where appropriate, to make the tests more reliable.

Props johnbillion, jrf, SergeyBiryukov.
See #38266.

File:

• trunk/tests/phpunit/tests/multisite/network.php (modified) (17 diffs)

trunk/tests/phpunit/tests/multisite/network.php

@@ -77 +77 @@
          */
         function test_get_main_network_id_default() {
-            $this->assertEquals( 1, get_main_network_id() );
+            $this->assertSame( 1, get_main_network_id() );
         }
 
@@ -87 +87 @@
             self::factory()->network->create();
 
-            $this->assertEquals( 1, get_main_network_id() );
+            $this->assertSame( 1, get_main_network_id() );
         }
 
@@ -101 +101 @@
             $current_site->id = (int) $id;
 
-            $this->assertEquals( 1, get_main_network_id() );
+            $this->assertSame( 1, get_main_network_id() );
         }
 
@@ -121 +121 @@
             $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->site} SET id=1 WHERE id=%d", $temp_id ) );
 
-            $this->assertEquals( self::$different_network_id, $main_network_id );
+            $this->assertSame( self::$different_network_id, $main_network_id );
         }
 
         function test_get_main_network_id_filtered() {
             add_filter( 'get_main_network_id', array( $this, '_get_main_network_id' ) );
-            $this->assertEquals( 3, get_main_network_id() );
+            $this->assertSame( 3, get_main_network_id() );
             remove_filter( 'get_main_network_id', array( $this, '_get_main_network_id' ) );
         }
@@ -160 +160 @@
             wp_update_network_counts();
 
-            $this->assertEquals( $site_count_start + 1, $actual );
+            $this->assertSame( $site_count_start + 1, $actual );
         }
 
@@ -247 +247 @@
             $count = get_user_count();
 
-            $this->assertEquals( $start_count, $count );
+            $this->assertSame( $start_count, $count );
 
             wp_update_network_counts();
@@ -269 +269 @@
             activate_plugin( $path ); // Enable the plugin for the current site.
             $active_plugins = wp_get_active_network_plugins();
-            $this->assertEquals( array(), $active_plugins );
+            $this->assertSame( array(), $active_plugins );
 
             add_action( 'deactivated_plugin', array( $this, '_helper_deactivate_hook' ) );
@@ -276 +276 @@
             activate_plugin( $path, '', true ); // Enable the plugin for all sites in the network.
             $active_plugins = wp_get_active_network_plugins();
-            $this->assertEquals( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
+            $this->assertSame( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
 
             // Deactivate the plugin.
             deactivate_plugins( $path );
             $active_plugins = wp_get_active_network_plugins();
-            $this->assertEquals( array(), $active_plugins );
-
-            $this->assertEquals( 1, $this->plugin_hook_count ); // Testing actions and silent mode.
+            $this->assertSame( array(), $active_plugins );
+
+            $this->assertSame( 1, $this->plugin_hook_count ); // Testing actions and silent mode.
 
             activate_plugin( $path, '', true ); // Enable the plugin for all sites in the network.
             deactivate_plugins( $path, true );  // Silent mode.
 
-            $this->assertEquals( 1, $this->plugin_hook_count ); // Testing actions and silent mode.
+            $this->assertSame( 1, $this->plugin_hook_count ); // Testing actions and silent mode.
         }
 
@@ -303 +303 @@
             $active_plugins = wp_get_active_network_plugins();
             $this->assertCount( 1, $active_plugins );
-            $this->assertEquals( 1, $mock->get_call_count() );
+            $this->assertSame( 1, $mock->get_call_count() );
 
             // Should do nothing on the second try.
@@ -309 +309 @@
             $active_plugins = wp_get_active_network_plugins();
             $this->assertCount( 1, $active_plugins );
-            $this->assertEquals( 1, $mock->get_call_count() );
+            $this->assertSame( 1, $mock->get_call_count() );
 
             remove_action( 'activate_' . $path, array( $mock, 'action' ) );
@@ -338 +338 @@
 
             $count = get_user_count(); // No change, cache not refreshed.
-            $this->assertEquals( $start_count, $count );
+            $this->assertSame( $start_count, $count );
 
             wp_update_network_counts(); // Magic happens here.
@@ -393 +393 @@
 
             $result = get_blog_count();
-            $this->assertEquals( $expected, $result );
+            $this->assertSame( $expected, $result );
         }
 
@@ -405 +405 @@
 
             $result = get_blog_count( self::$different_network_id );
-            $this->assertEquals( 3, $result );
+            $this->assertSame( 3, $result );
         }
 
@@ -421 +421 @@
 
             $result = get_user_count();
-            $this->assertEquals( $expected, $result );
+            $this->assertSame( $expected, $result );
         }
 
@@ -437 +437 @@
 
             $result = get_user_count( self::$different_network_id );
-            $this->assertEquals( $expected, $result );
+            $this->assertSame( $expected, $result );
         }
 
@@ -597 +597 @@
             wpmu_delete_blog( $site_id, true );
 
-            $this->assertEquals( $original_count + 1, $result );
+            $this->assertSame( $original_count + 1, $result );
         }
 
@@ -633 +633 @@
 
             // Double-check we got the ID of the new network correct.
-            $this->assertEquals( $new_network_id, $new_network->id );
+            $this->assertSame( $new_network_id, $new_network->id );
 
             // Verify that if we fetch the network now, it's no longer false.
             $fetched_network = get_network( $new_network_id );
             $this->assertInstanceOf( 'WP_Network', $fetched_network );
-            $this->assertEquals( $new_network_id, $fetched_network->id );
+            $this->assertSame( $new_network_id, $fetched_network->id );
         }