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.

git-svn-id: https://develop.svn.wordpress.org/trunk@55264 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2023-02-07 14:58:08 +00:00
parent 7422891210
commit 73d8988e4d

View File

@ -91,7 +91,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
$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->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
}
/**
@ -108,7 +108,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1 ), $q->posts );
$this->assertSameSets( array( self::$pid1 ), $q->posts );
}
/**
@ -125,7 +125,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
}
/**
@ -141,7 +141,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -158,7 +158,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
}
/**
@ -175,7 +175,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -192,7 +192,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -209,7 +209,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -229,7 +229,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
$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->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
}
/**
@ -246,7 +246,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1 ), $q->posts );
$this->assertSameSets( array( self::$pid1 ), $q->posts );
}
/**
@ -263,7 +263,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -281,7 +281,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid3 ), $q->posts );
}
/**
@ -299,7 +299,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
}
/**
@ -316,7 +316,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid2 ), $q->posts );
$this->assertSameSets( array( self::$pid2 ), $q->posts );
}
/**
@ -333,7 +333,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
)
);
$this->assertSame( array( self::$pid1 ), $q->posts );
$this->assertSameSets( array( self::$pid1 ), $q->posts );
}
/**
@ -364,7 +364,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
);
$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->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
}
/**
@ -395,7 +395,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
);
$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->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
}
/**