Changeset 48937 for trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

Timestamp:

09/02/2020 12:35:36 AM (5 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/ms-files-rewriting.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -41 +41 @@
             $blog_id2 = self::factory()->blog->create( array( 'user_id' => $user_id ) );
             $info     = wp_upload_dir();
-            $this->assertEquals( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );
-            $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );
-            $this->assertEquals( gmstrftime( '/%Y/%m' ), $info['subdir'] );
-            $this->assertEquals( '', $info['error'] );
+            $this->assertSame( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['url'] );
+            $this->assertSame( ABSPATH . 'wp-content/uploads/' . gmstrftime( '%Y/%m' ), $info['path'] );
+            $this->assertSame( gmstrftime( '/%Y/%m' ), $info['subdir'] );
+            $this->assertFalse( $info['error'] );
 
             switch_to_blog( $blog_id2 );
             $info2 = wp_upload_dir();
             $this->assertNotEquals( $info, $info2 );
-            $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['url'] );
-            $this->assertEquals( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['path'] );
-            $this->assertEquals( gmstrftime( '/%Y/%m' ), $info2['subdir'] );
-            $this->assertEquals( '', $info2['error'] );
+            $this->assertSame( get_option( 'siteurl' ) . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['url'] );
+            $this->assertSame( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime( '%Y/%m' ), $info2['path'] );
+            $this->assertSame( gmstrftime( '/%Y/%m' ), $info2['subdir'] );
+            $this->assertFalse( $info2['error'] );
             restore_current_blog();
         }