Changeset 55264

Timestamp:

02/07/2023 02:58:08 PM (18 months ago)

Author:

SergeyBiryukov

Message:

Tests: Use assertSameSets() in WP_Query tests for search_columns argument.

This aims to resolve intermittent test failures due to indeterminate sort order.

Follow-up to [55248].

Props petitphp, costdev, audrasjb, johnbillion.
Fixes #43867.

File:

• trunk/tests/phpunit/tests/query/searchColumns.php (modified) (17 diffs)

trunk/tests/phpunit/tests/query/searchColumns.php

@@ -92 +92 @@
         $this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
         $this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
     }
 
@@ -109 +109 @@
         );
 
-        $this->assertSame( array( self::$pid1 ), $q->posts );
+        $this->assertSame( array( self::$pid1 ), $q->posts );
     }
 
@@ -126 +126 @@
         );
 
-        $this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
     }
 
@@ -142 +142 @@
             )
         );
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -159 +159 @@
         );
 
-        $this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
     }
 
@@ -176 +176 @@
         );
 
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -193 +193 @@
         );
 
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -210 +210 @@
         );
 
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -230 +230 @@
         $this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
         $this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
     }
 
@@ -247 +247 @@
         );
 
-        $this->assertSame( array( self::$pid1 ), $q->posts );
+        $this->assertSame( array( self::$pid1 ), $q->posts );
     }
 
@@ -264 +264 @@
         );
 
-        $this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -282 +282 @@
         );
 
-        $this->assertSame( array( self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid3 ), $q->posts );
     }
 
@@ -300 +300 @@
         );
 
-        $this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
+        $this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
     }
 
@@ -317 +317 @@
         );
 
-        $this->assertSame( array( self::$pid2 ), $q->posts );
+        $this->assertSame( array( self::$pid2 ), $q->posts );
     }
 
@@ -334 +334 @@
         );
 
-        $this->assertSame( array( self::$pid1 ), $q->posts );
+        $this->assertSame( array( self::$pid1 ), $q->posts );
     }
 
@@ -365 +365 @@
 
         $this->assertStringNotContainsString( 'post_name', $q->request, "SQL request shouldn't contain post_name string." );
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
     }
 
@@ -396 +396 @@
 
         $this->assertStringNotContainsString( 'post_non_existing_column', $q->request, "SQL request shouldn't contain post_non_existing_column string." );
-        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+        $this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
     }