mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools
synced 2024-11-27 17:51:09 +00:00
Merge "ThreadItemStoreTest: Use a consistent ordering for the output"
This commit is contained in:
commit
11d10e9e64
|
@ -57,19 +57,21 @@ class ThreadItemStoreTest extends IntegrationTestCase {
|
|||
$expected = [];
|
||||
$actual = [];
|
||||
$tables = [
|
||||
'discussiontools_items',
|
||||
'discussiontools_item_pages',
|
||||
'discussiontools_item_revisions',
|
||||
'discussiontools_item_ids',
|
||||
'discussiontools_items' => [ 'it_id' ],
|
||||
'discussiontools_item_pages' => [ 'itp_id' ],
|
||||
// We reuse rows causing the primary key to be all out of order.
|
||||
// Use a consistent ordering for the output here.
|
||||
'discussiontools_item_revisions' => [ 'itr_revision_id', 'itr_items_id', 'itr_itemid_id' ],
|
||||
'discussiontools_item_ids' => [ 'itid_id' ],
|
||||
];
|
||||
foreach ( $tables as $table ) {
|
||||
foreach ( $tables as $table => $order ) {
|
||||
$expected[$table] = static::getJson( "../$dir/$table.json", true );
|
||||
|
||||
$res = wfGetDb( DB_REPLICA )->newSelectQueryBuilder()
|
||||
->from( $table )
|
||||
->field( '*' )
|
||||
->caller( __METHOD__ )
|
||||
->orderBy( 1 )
|
||||
->orderBy( $order )
|
||||
->fetchResultSet();
|
||||
foreach ( $res as $i => $row ) {
|
||||
foreach ( $row as $key => $val ) {
|
||||
|
@ -80,7 +82,7 @@ class ThreadItemStoreTest extends IntegrationTestCase {
|
|||
|
||||
// Optionally write updated content to the JSON files
|
||||
if ( getenv( 'DISCUSSIONTOOLS_OVERWRITE_TESTS' ) ) {
|
||||
foreach ( $tables as $table ) {
|
||||
foreach ( $tables as $table => $order ) {
|
||||
static::overwriteJsonFile( "../$dir/$table.json", $actual[$table] );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue