Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "tests: Migrate Database::delete calls to DeleteQueryBuilder"

Browse source
This commit is contained in:
jenkins-bot 2023-07-14 13:23:46 +00:00 committed by Gerrit Code Review
commit 5551326fa0
6 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/phpunit/includes/api/ApiEditPageTest.php
View file

@ -888,7 +888,10 @@ class ApiEditPageTest extends ApiTestCase {
// Make the middle revision disappear
$dbw = wfGetDB( DB_PRIMARY );
$dbw->delete( 'revision', [ 'rev_id' => $revId2 ], __METHOD__ );
$dbw->newDeleteQueryBuilder()
->delete( 'revision' )
->where( [ 'rev_id' => $revId2 ] )
->caller( __METHOD__ )->execute();
$dbw->update( 'revision', [ 'rev_parent_id' => $revId1 ],
[ 'rev_id' => $revId3 ], __METHOD__ );

11
tests/phpunit/includes/changetags/ChangeTagsTest.php
View file

@ -2,6 +2,7 @@
use MediaWiki\Language\RawMessage;
use MediaWiki\MainConfigNames;
use Wikimedia\Rdbms\Platform\ISQLPlatform;
/**
* @covers ChangeTags
@ -30,8 +31,14 @@ class ChangeTagsTest extends MediaWikiIntegrationTestCase {
private function emptyChangeTagsTables() {
$dbw = wfGetDB( DB_PRIMARY );
$dbw->delete( 'change_tag', '*' );
$dbw->delete( 'change_tag_def', '*' );
$dbw->newDeleteQueryBuilder()
->delete( 'change_tag' )
->where( ISQLPlatform::ALL_ROWS )
->execute();
$dbw->newDeleteQueryBuilder()
->delete( 'change_tag_def' )
->where( ISQLPlatform::ALL_ROWS )
->execute();
}
// TODO most methods are not tested

5
tests/phpunit/includes/filerepo/file/LocalFileTest.php
View file

@ -650,7 +650,10 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
$this->assertTrue( $user->equals( $file->getUploader() ) );
// Make sure we were actually hitting the WAN cache
$dbw->delete( 'image', [ 'img_name' => 'Random-11m.png' ], __METHOD__ );
$dbw->newDeleteQueryBuilder()
->delete( 'image' )
->where( [ 'img_name' => 'Random-11m.png' ] )
->caller( __METHOD__ )->execute();
$file->invalidateCache();
$file = LocalFile::newFromTitle( $title, $repo );
$this->assertSame( false, $file->exists() );

6
tests/phpunit/includes/interwiki/InterwikiTest.php
View file

@ -1,6 +1,7 @@
<?php
use MediaWiki\MainConfigNames;
use Wikimedia\Rdbms\Platform\ISQLPlatform;
/**
* @covers Interwiki
@ -43,7 +44,10 @@ class InterwikiTest extends MediaWikiIntegrationTestCase {
private function populateDB( $iwrows ) {
$dbw = wfGetDB( DB_PRIMARY );
$dbw->delete( 'interwiki', '*', __METHOD__ );
$dbw->newDeleteQueryBuilder()
->delete( 'interwiki' )
->where( ISQLPlatform::ALL_ROWS )
->caller( __METHOD__ )->execute();
$dbw->insert( 'interwiki', array_values( $iwrows ), __METHOD__ );
$this->tablesUsed[] = 'interwiki';
}

9
tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
View file

@ -81,11 +81,10 @@ class BotPasswordSessionProviderTest extends MediaWikiIntegrationTestCase {
->centralIdFromName( $sysop->getName() );
$dbw = wfGetDB( DB_PRIMARY );
$dbw->delete(
'bot_passwords',
[ 'bp_user' => $userId, 'bp_app_id' => 'BotPasswordSessionProvider' ],
__METHOD__
);
$dbw->newDeleteQueryBuilder()
->delete( 'bot_passwords' )
->where( [ 'bp_user' => $userId, 'bp_app_id' => 'BotPasswordSessionProvider' ] )
->caller( __METHOD__ )->execute();
$dbw->insert(
'bot_passwords',
[

9
tests/phpunit/includes/user/BotPasswordTest.php
View file

@ -63,11 +63,10 @@ class BotPasswordTest extends MediaWikiIntegrationTestCase {
$passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' );
$dbw = wfGetDB( DB_PRIMARY );
$dbw->delete(
'bot_passwords',
[ 'bp_user' => [ 42, 43 ], 'bp_app_id' => 'BotPassword' ],
__METHOD__
);
$dbw->newDeleteQueryBuilder()
->delete( 'bot_passwords' )
->where( [ 'bp_user' => [ 42,43 ], 'bp_app_id' => 'BotPassword' ] )
->caller( __METHOD__ )->execute();
$dbw->insert(
'bot_passwords',
[