Changeset 48939 for trunk/tests/phpunit/tests/general/wpError.php

Timestamp:

09/04/2020 07:01:00 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Introduce assertSameSets() and assertSameSetsWithIndex(), and use them where appropriate.

This ensures that not only the array values being compared are equal, but also that their type is the same.

These new methods replace most of the existing instances of assertEqualSets() and assertEqualSetsWithIndex().

Going forward, stricter type checking by using assertSameSets() or assertSameSetsWithIndex() should generally be preferred, to make the tests more reliable.

Follow-up to [48937].

See #38266.

File:

• trunk/tests/phpunit/tests/general/wpError.php (modified) (19 diffs)

trunk/tests/phpunit/tests/general/wpError.php

@@ -113 +113 @@
         $this->wp_error->add( 'code', 'message' );
 
-        $this->assertEqualSets( array( 'code' ), $this->wp_error->get_error_codes() );
+        $this->assertSameSets( array( 'code' ), $this->wp_error->get_error_codes() );
     }
 
@@ -125 +125 @@
         $expected = array( 'code', 'code2' );
 
-        $this->assertEqualSets( $expected, $this->wp_error->get_error_codes() );
+        $this->assertSameSets( $expected, $this->wp_error->get_error_codes() );
     }
 
@@ -167 +167 @@
         $this->wp_error->add( 'code', 'message' );
 
-        $this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages() );
+        $this->assertSameSets( array( 'message' ), $this->wp_error->get_error_messages() );
     }
 
@@ -177 +177 @@
         $this->wp_error->add( 'code2', 'message2' );
 
-        $this->assertEqualSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages() );
+        $this->assertSameSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages() );
     }
 
@@ -193 +193 @@
         $this->wp_error->add( 'code', 'message' );
 
-        $this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages( 'code' ) );
+        $this->assertSameSets( array( 'message' ), $this->wp_error->get_error_messages( 'code' ) );
     }
 
@@ -302 +302 @@
         $this->wp_error->add( 'code', 'message', $expected );
 
-        $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
+        $this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data() );
     }
 
@@ -313 +313 @@
         $this->wp_error->add( 'code2', 'message2', 'data2' );
 
-        $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
+        $this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data() );
     }
 
@@ -350 +350 @@
         $this->wp_error->add( 'code', 'message', $expected );
 
-        $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
+        $this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
     }
 
@@ -362 +362 @@
         $this->wp_error->add( 'code', 'message3', $expected );
 
-        $this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
+        $this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
     }
 
@@ -406 +406 @@
         $this->wp_error->add( '', '', 'data' );
 
-        $this->assertEqualSetsWithIndex( array( '' => array( '' ) ), $this->wp_error->errors );
+        $this->assertSameSetsWithIndex( array( '' => array( '' ) ), $this->wp_error->errors );
     }
 
@@ -424 +424 @@
         $this->wp_error->add( '', '', 'data' );
 
-        $this->assertEqualSetsWithIndex( array( '' => 'data' ), $this->wp_error->error_data );
+        $this->assertSameSetsWithIndex( array( '' => 'data' ), $this->wp_error->error_data );
     }
 
@@ -526 +526 @@
         $expected = array( 'message', 'message2' );
 
-        $this->assertEqualSets( $expected, $this->wp_error->get_error_messages( 'code' ) );
+        $this->assertSameSets( $expected, $this->wp_error->get_error_messages( 'code' ) );
     }
 
@@ -554 +554 @@
         $this->wp_error->add_data( '' );
 
-        $this->assertEqualSets( array( '' => '' ), $this->wp_error->error_data );
+        $this->assertSameSets( array( '' => '' ), $this->wp_error->error_data );
     }
 
@@ -607 +607 @@
         $this->wp_error->add_data( 'data', 'code' );
 
-        $this->assertEqualSets( array( 'code' => 'data' ), $this->wp_error->error_data );
+        $this->assertSameSets( array( 'code' => 'data' ), $this->wp_error->error_data );
     }
 
@@ -618 +618 @@
         $this->wp_error->add_data( 'data', 'code2' );
 
-        $this->assertEqualSetsWithIndex( array( 'code' => array( 'message' ) ), $this->wp_error->errors );
+        $this->assertSameSetsWithIndex( array( 'code' => array( 'message' ) ), $this->wp_error->errors );
     }
 
@@ -629 +629 @@
         $this->wp_error->add_data( 'data', 'code2' );
 
-        $this->assertEqualSetsWithIndex( array( 'code2' => 'data' ), $this->wp_error->error_data );
+        $this->assertSameSetsWithIndex( array( 'code2' => 'data' ), $this->wp_error->error_data );
     }
 
@@ -653 +653 @@
         $after = $this->wp_error->errors;
 
-        $this->assertEqualSetsWithIndex( $before, $after );
+        $this->assertSameSetsWithIndex( $before, $after );
     }
 
@@ -666 +666 @@
         $after = $this->wp_error->errors;
 
-        $this->assertEqualSetsWithIndex( $before, $after );
+        $this->assertSameSetsWithIndex( $before, $after );
     }
 
@@ -681 +681 @@
         $after = $this->wp_error->errors;
 
-        $this->assertEqualSetsWithIndex( $before, $after );
+        $this->assertSameSetsWithIndex( $before, $after );
     }