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

trunk/tests/phpunit/tests/image/editor.php

@@ -75 +75 @@
 
         // Check default value.
-        $this->assertEquals( 82, $editor->get_quality() );
+        $this->assertSame( 82, $editor->get_quality() );
 
         // Ensure the quality filters do not have precedence if created after editor instantiation.
         $func_100_percent = array( $this, 'return_integer_100' );
         add_filter( 'wp_editor_set_quality', $func_100_percent );
-        $this->assertEquals( 82, $editor->get_quality() );
+        $this->assertSame( 82, $editor->get_quality() );
 
         $func_95_percent = array( $this, 'return_integer_95' );
         add_filter( 'jpeg_quality', $func_95_percent );
-        $this->assertEquals( 82, $editor->get_quality() );
+        $this->assertSame( 82, $editor->get_quality() );
 
         // Ensure set_quality() works and overrides the filters.
         $this->assertTrue( $editor->set_quality( 75 ) );
-        $this->assertEquals( 75, $editor->get_quality() );
+        $this->assertSame( 75, $editor->get_quality() );
 
         // Get a new editor to clear default quality state.
@@ -96 +96 @@
 
         // Ensure jpeg_quality filter applies if it exists before editor instantiation.
-        $this->assertEquals( 95, $editor->get_quality() );
+        $this->assertSame( 95, $editor->get_quality() );
 
         // Get a new editor to clear jpeg_quality state.
@@ -104 +104 @@
 
         // Ensure wp_editor_set_quality filter applies if it exists before editor instantiation.
-        $this->assertEquals( 100, $editor->get_quality() );
+        $this->assertSame( 100, $editor->get_quality() );
 
         // Clean up.
@@ -131 +131 @@
 
         // Test with no parameters.
-        $this->assertEquals( 'canola-100x50.jpg', wp_basename( $editor->generate_filename() ) );
+        $this->assertSame( 'canola-100x50.jpg', wp_basename( $editor->generate_filename() ) );
 
         // Test with a suffix only.
-        $this->assertEquals( 'canola-new.jpg', wp_basename( $editor->generate_filename( 'new' ) ) );
+        $this->assertSame( 'canola-new.jpg', wp_basename( $editor->generate_filename( 'new' ) ) );
 
         // Test with a destination dir only.
-        $this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ), trailingslashit( realpath( dirname( $editor->generate_filename( null, get_temp_dir() ) ) ) ) );
+        $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ), trailingslashit( realpath( dirname( $editor->generate_filename( null, get_temp_dir() ) ) ) ) );
 
         // Test with a suffix only.
-        $this->assertEquals( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
+        $this->assertSame( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
 
         // Combo!
-        $this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
+        $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
     }
 
@@ -167 +167 @@
         $property->setValue( $editor, $size );
 
-        $this->assertEquals( $size, $editor->get_size() );
+        $this->assertSame( $size, $editor->get_size() );
     }
 
@@ -190 +190 @@
         $property->setValue( $editor, $size );
 
-        $this->assertEquals( '100x50', $editor->get_suffix() );
+        $this->assertSame( '100x50', $editor->get_suffix() );
     }
 }