Changeset 48937 for trunk/tests/phpunit/tests/upload.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/upload.php (modified) (6 diffs)

trunk/tests/phpunit/tests/upload.php

@@ -25 +25 @@
         $subdir = gmstrftime( '/%Y/%m' );
 
-        $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
-        $this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
-        $this->assertEquals( $subdir, $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
+        $this->assertSame( $subdir, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }
 
@@ -37 +37 @@
         $subdir = gmstrftime( '/%Y/%m' );
 
-        $this->assertEquals( get_option( 'siteurl' ) . '/foo/bar' . $subdir, $info['url'] );
-        $this->assertEquals( ABSPATH . 'foo/bar' . $subdir, $info['path'] );
-        $this->assertEquals( $subdir, $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( get_option( 'siteurl' ) . '/foo/bar' . $subdir, $info['url'] );
+        $this->assertSame( ABSPATH . 'foo/bar' . $subdir, $info['path'] );
+        $this->assertSame( $subdir, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }
 
@@ -60 +60 @@
         $subdir = gmstrftime( '/%Y/%m' );
 
-        $this->assertEquals( '/baz' . $subdir, $info['url'] );
-        $this->assertEquals( $path . $subdir, $info['path'] );
-        $this->assertEquals( $subdir, $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( '/baz' . $subdir, $info['url'] );
+        $this->assertSame( $path . $subdir, $info['path'] );
+        $this->assertSame( $subdir, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }
 
@@ -72 +72 @@
         $info = _wp_upload_dir();
 
-        $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads', $info['url'] );
-        $this->assertEquals( ABSPATH . 'wp-content/uploads', $info['path'] );
-        $this->assertEquals( '', $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( get_option( 'siteurl' ) . '/wp-content/uploads', $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads', $info['path'] );
+        $this->assertSame( '', $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }
 
@@ -86 +86 @@
         $subdir = gmstrftime( '/%Y/%m' );
 
-        $this->assertEquals( 'http://' . WP_TESTS_DOMAIN . '/asdf' . $subdir, $info['url'] );
-        $this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
-        $this->assertEquals( $subdir, $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/asdf' . $subdir, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
+        $this->assertSame( $subdir, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }
 
@@ -101 +101 @@
         $subdir = gmstrftime( '/%Y/%m' );
 
-        $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
-        $this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
-        $this->assertEquals( $subdir, $info['subdir'] );
-        $this->assertEquals( false, $info['error'] );
+        $this->assertSame( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
+        $this->assertSame( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
+        $this->assertSame( $subdir, $info['subdir'] );
+        $this->assertFalse( $info['error'] );
     }