Changeset 48939 for trunk/tests/phpunit/tests/multisite/siteQuery.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/multisite/siteQuery.php (modified) (31 diffs)

trunk/tests/phpunit/tests/multisite/siteQuery.php

@@ -124 +124 @@
             );
 
-            $this->assertEqualSets( array( self::$site_ids['www.w.org/'] ), $found );
+            $this->assertSameSets( array( self::$site_ids['www.w.org/'] ), $found );
         }
 
@@ -150 +150 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -164 +164 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -200 +200 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -218 +218 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -266 +266 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -297 +297 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -316 +316 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -335 +335 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -352 +352 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -372 +372 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -393 +393 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -411 +411 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -428 +428 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -456 +456 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -470 +470 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -484 +484 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -498 +498 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -524 +524 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -538 +538 @@
             );
 
-            $this->assertEqualSets( array_diff( array_values( self::$site_ids ), array( self::$site_ids['www.w.org/make/'] ) ), $found );
+            $this->assertSameSets( array_diff( array_values( self::$site_ids ), array( self::$site_ids['www.w.org/make/'] ) ), $found );
         }
 
@@ -554 +554 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -582 +582 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -596 +596 @@
             );
 
-            $this->assertEqualSets( array_values( self::$site_ids ), $found );
+            $this->assertSameSets( array_values( self::$site_ids ), $found );
         }
 
@@ -612 +612 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -641 +641 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -661 +661 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -679 +679 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -752 +752 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -770 +770 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -787 +787 @@
             );
 
-            $this->assertEqualSets( $expected, $found );
+            $this->assertSameSets( $expected, $found );
         }
 
@@ -906 +906 @@
                 $this->assertSame( $expected, $found );
             } else {
-                $this->assertEqualSets( $expected, $found );
+                $this->assertSameSets( $expected, $found );
             }
         }