Changeset 48939 for trunk/tests/phpunit/tests/comment/query.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/comment/query.php (modified) (76 diffs)

trunk/tests/phpunit/tests/comment/query.php

@@ -61 +61 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
     }
 
@@ -80 +80 @@
         );
 
-        $this->assertEqualSets( array( $c1 ), $found );
+        $this->assertSameSets( array( $c1 ), $found );
     }
 
@@ -130 +130 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
     }
 
@@ -180 +180 @@
         );
 
-        $this->assertEqualSets( array( $c1 ), $found );
+        $this->assertSameSets( array( $c1 ), $found );
     }
 
@@ -220 +220 @@
         );
 
-        $this->assertEqualSets( array( $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c2, $c3 ), $found );
 
     }
@@ -261 +261 @@
         );
 
-        $this->assertEqualSets( array( $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c2, $c3 ), $found );
 
     }
@@ -312 +312 @@
         );
 
-        $this->assertEqualSets( array( $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c2, $c3 ), $found );
     }
 
@@ -371 +371 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c4, $c6 ), $found );
+        $this->assertSameSets( array( $c1, $c4, $c6 ), $found );
     }
 
@@ -428 +428 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c6 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c4, $c6 ), $found );
     }
 
@@ -486 +486 @@
         );
 
-        $this->assertEqualSets( array( $c1 ), $found );
+        $this->assertSameSets( array( $c1 ), $found );
     }
 
@@ -544 +544 @@
         );
 
-        $this->assertEqualSets( array( $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c2, $c3 ), $found );
     }
 
@@ -601 +601 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c6 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c4, $c6 ), $found );
     }
 
@@ -651 +651 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3 ), $found );
     }
 
@@ -687 +687 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3 ), $found );
     }
 
@@ -795 +795 @@
         );
 
-        $this->assertEqualSets( array( $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c2, $c3 ), $found );
     }
 
@@ -839 +839 @@
         );
 
-        $this->assertEqualSets( array( $c3, $c2 ), $found );
+        $this->assertSameSets( array( $c3, $c2 ), $found );
     }
 
@@ -955 +955 @@
         );
 
-        $this->assertEqualSets( array( $c3, $c2 ), $found );
+        $this->assertSameSets( array( $c3, $c2 ), $found );
     }
 
@@ -989 +989 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $found );
+        $this->assertSameSets( array( $c1, $c2 ), $found );
     }
 
@@ -1107 +1107 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c3 ), $found );
     }
 
@@ -1137 +1137 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c3 ), $found );
     }
 
@@ -1171 +1171 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3 ), $found );
     }
 
@@ -1205 +1205 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $found );
+        $this->assertSameSets( array( $c1, $c2 ), $found );
     }
 
@@ -1239 +1239 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $found );
+        $this->assertSameSets( array( $c1, $c2 ), $found );
     }
 
@@ -1688 +1688 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $comments );
+        $this->assertSameSets( array( $c1, $c2 ), $comments );
     }
 
@@ -1724 +1724 @@
         $comment_ids = get_comments( array( 'fields' => 'ids' ) );
         $this->assertCount( 3, $comment_ids );
-        $this->assertEqualSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
+        $this->assertSameSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
     }
 
@@ -1760 +1760 @@
         );
 
-        $this->assertEqualSets( array( $comment_1, $comment_3 ), $comment_ids );
+        $this->assertSameSets( array( $comment_1, $comment_3 ), $comment_ids );
     }
 
@@ -1796 +1796 @@
         );
 
-        $this->assertEqualSets( array( $comment_1 ), $comment_ids );
+        $this->assertSameSets( array( $comment_1 ), $comment_ids );
     }
 
@@ -1836 +1836 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $comment_ids );
+        $this->assertSameSets( array( $c1, $c2 ), $comment_ids );
     }
 
@@ -1876 +1876 @@
         );
 
-        $this->assertEqualSets( array( $c3 ), $comment_ids );
+        $this->assertSameSets( array( $c3 ), $comment_ids );
     }
 
@@ -1919 +1919 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $comment_ids );
+        $this->assertSameSets( array( $c1, $c2 ), $comment_ids );
     }
 
@@ -1962 +1962 @@
         );
 
-        $this->assertEqualSets( array( $c3 ), $comment_ids );
+        $this->assertSameSets( array( $c3 ), $comment_ids );
     }
 
@@ -2010 +2010 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c3 ), $comment_ids );
+        $this->assertSameSets( array( $c1, $c3 ), $comment_ids );
     }
 
@@ -2058 +2058 @@
         );
 
-        $this->assertEqualSets( array( $c3, $c4 ), $comment_ids );
+        $this->assertSameSets( array( $c3, $c4 ), $comment_ids );
     }
 
@@ -2089 +2089 @@
 
         $comment_ids = get_comments( array( 'fields' => 'ids' ) );
-        $this->assertEqualSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
+        $this->assertSameSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
     }
 
@@ -2133 +2133 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3 ), $found );
     }
 
@@ -2184 +2184 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c5 ), $found );
     }
 
@@ -2235 +2235 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c5 ), $found );
     }
 
@@ -2285 +2285 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3 ), $found );
     }
 
@@ -2344 +2344 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c5 ), $found );
     }
 
@@ -2403 +2403 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c5 ), $found );
     }
 
@@ -2476 +2476 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
+        $this->assertSameSets( array( $c1, $c2, $c3, $c4, $c5 ), $found );
     }
 
@@ -3056 +3056 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
 
         _unregister_post_type( 'post-type-1' );
@@ -3083 +3083 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
 
         _unregister_post_type( 'post-type-1' );
@@ -3113 +3113 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c3 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c3 ), $found );
     }
 
@@ -3131 +3131 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
     }
 
@@ -3152 +3152 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
     }
 
@@ -3175 +3175 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c3 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c3 ), $found );
     }
 
@@ -3193 +3193 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
     }
 
@@ -3214 +3214 @@
         );
 
-        $this->assertEqualSets( $c2, $found );
+        $this->assertSameSets( $c2, $found );
     }
 
@@ -3237 +3237 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c3 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c3 ), $found );
     }
 
@@ -3260 +3260 @@
             )
         );
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $found );
     }
 
@@ -3283 +3283 @@
             )
         );
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $found );
     }
 
@@ -3303 +3303 @@
             )
         );
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $found );
     }
 
@@ -3323 +3323 @@
             )
         );
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $found );
     }
 
@@ -3447 +3447 @@
         remove_action( 'pre_get_comments', array( $this, 'modify_meta_query' ) );
 
-        $this->assertEqualSets( array( $comments[1] ), $q->comments );
+        $this->assertSameSets( array( $comments[1] ), $q->comments );
     }
 
@@ -3485 +3485 @@
         remove_action( 'pre_get_comments', array( $this, 'modify_meta_params' ) );
 
-        $this->assertEqualSets( array( $comments[1] ), $q->comments );
+        $this->assertSameSets( array( $comments[1] ), $q->comments );
     }
 
@@ -3519 +3519 @@
         );
 
-        $this->assertEqualSets( array( $c2 ), $ids->comments );
+        $this->assertSameSets( array( $c2 ), $ids->comments );
     }
 
@@ -3561 +3561 @@
         );
 
-        $this->assertEqualSets( array( $c3, $c4 ), $ids->comments );
+        $this->assertSameSets( array( $c3, $c4 ), $ids->comments );
     }
 
@@ -3591 +3591 @@
         );
 
-        $this->assertEqualSets( array( $c1 ), $ids->comments );
+        $this->assertSameSets( array( $c1 ), $ids->comments );
     }
 
@@ -3634 +3634 @@
         );
 
-        $this->assertEqualSets( array( $c1, $c2 ), $ids->comments );
+        $this->assertSameSets( array( $c1, $c2 ), $ids->comments );
     }
 
@@ -4162 +4162 @@
         $q2_ids      = wp_list_pluck( $q2->comments, 'comment_ID' );
 
-        $this->assertEqualSets( $q1_ids, $q2_ids );
+        $this->assertSameSets( $q1_ids, $q2_ids );
         $this->assertSame( $num_queries, $wpdb->num_queries );
     }
@@ -4224 +4224 @@
         );
         $q2_ids = wp_list_pluck( $q2->comments, 'comment_ID' );
-        $this->assertEqualSets( $q1_ids, $q2_ids );
+        $this->assertSameSets( $q1_ids, $q2_ids );
     }
 
@@ -4288 +4288 @@
         $found_1    = $found[ $c1 ];
         $children_1 = $found_1->get_children();
-        $this->assertEqualSets( array( $c2 ), array_keys( $children_1 ) );
+        $this->assertSameSets( array( $c2 ), array_keys( $children_1 ) );
 
         $found_3    = $found[ $c3 ];
         $children_3 = $found_3->get_children();
-        $this->assertEqualSets( array( $c4, $c5 ), array_keys( $children_3 ) );
+        $this->assertSameSets( array( $c4, $c5 ), array_keys( $children_3 ) );
     }
 
@@ -4442 +4442 @@
 
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array( $c ), $q->comments );
+        $this->assertSameSets( array( $c ), $q->comments );
     }
 
@@ -4482 +4482 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array( $c ), $q->comments );
+        $this->assertSameSets( array( $c ), $q->comments );
     }
 
@@ -4515 +4515 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array(), $q->comments );
+        $this->assertSameSets( array(), $q->comments );
     }
 
@@ -4548 +4548 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array(), $q->comments );
+        $this->assertSameSets( array(), $q->comments );
     }
 
@@ -4583 +4583 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array( $c ), $q->comments );
+        $this->assertSameSets( array( $c ), $q->comments );
     }
 
@@ -4616 +4616 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array(), $q->comments );
+        $this->assertSameSets( array(), $q->comments );
     }
 
@@ -4651 +4651 @@
         $num_queries++;
         $this->assertSame( $num_queries, $wpdb->num_queries );
-        $this->assertEqualSets( array( $c ), $q->comments );
+        $this->assertSameSets( array( $c ), $q->comments );
     }
 
@@ -4767 +4767 @@
         );
 
-        $this->assertEqualSets( $c1, $cached );
+        $this->assertSameSets( $c1, $cached );
 
         foreach ( $c2 as $cid ) {
@@ -4786 +4786 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $found );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $found );
     }
 
@@ -4816 +4816 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $cached );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $cached );
 
         foreach ( $c2 as $cid ) {
@@ -4835 +4835 @@
         );
 
-        $this->assertEqualSets( $c1, $found );
+        $this->assertSameSets( $c1, $found );
     }
 
@@ -4865 +4865 @@
         );
 
-        $this->assertEqualSets( array_merge( $c1, $c2 ), $cached );
+        $this->assertSameSets( array_merge( $c1, $c2 ), $cached );
 
         foreach ( $c2 as $cid ) {
@@ -4884 +4884 @@
         );
 
-        $this->assertEqualSets( $c1, $found );
+        $this->assertSameSets( $c1, $found );
     }