jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367637 )
Change subject: rdbms: Add more @covers to DatabaseSQLTest
......................................................................
rdbms: Add more @covers to DatabaseSQLTest
Many of the main methods here have, over the years, been split up
into several protected/private methods.
Change-Id: I1b8489b1c61c0294288442a0a0cd28c9fa77f82e
---
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 57666bd..7e9494c 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -22,13 +22,18 @@
);
}
- protected function assertLastSqlDb( $sqlText, $db ) {
+ protected function assertLastSqlDb( $sqlText, DatabaseTestHelper $db ) {
$this->assertEquals( $sqlText, $db->getLastSqls() );
}
/**
* @dataProvider provideSelect
* @covers Wikimedia\Rdbms\Database::select
+ * @covers Wikimedia\Rdbms\Database::selectSQLText
+ * @covers Wikimedia\Rdbms\Database::tableNamesWithIndexClauseOrJOIN
+ * @covers Wikimedia\Rdbms\Database::makeSelectOptions
+ * @covers Wikimedia\Rdbms\Database::makeOrderBy
+ * @covers Wikimedia\Rdbms\Database::makeGroupByWithHaving
*/
public function testSelect( $sql, $sqlText ) {
$this->database->select(
@@ -135,6 +140,8 @@
/**
* @dataProvider provideUpdate
* @covers Wikimedia\Rdbms\Database::update
+ * @covers Wikimedia\Rdbms\Database::makeUpdateOptions
+ * @covers Wikimedia\Rdbms\Database::makeUpdateOptionsArray
*/
public function testUpdate( $sql, $sqlText ) {
$this->database->update(
@@ -303,6 +310,7 @@
/**
* @dataProvider provideInsert
* @covers Wikimedia\Rdbms\Database::insert
+ * @covers Wikimedia\Rdbms\Database::makeInsertOptions
*/
public function testInsert( $sql, $sqlText ) {
$this->database->insert(
@@ -356,6 +364,7 @@
/**
* @dataProvider provideInsertSelect
* @covers Wikimedia\Rdbms\Database::insertSelect
+ * @covers Wikimedia\Rdbms\Database::nativeInsertSelect
*/
public function testInsertSelect( $sql, $sqlTextNative, $sqlSelect,
$sqlInsert ) {
$this->database->insertSelect(
@@ -673,6 +682,7 @@
/**
* @dataProvider provideBuildLike
* @covers Wikimedia\Rdbms\Database::buildLike
+ * @covers Wikimedia\Rdbms\Database::escapeLikeInternal
*/
public function testBuildLike( $array, $sqlText ) {
$this->assertEquals( trim( $this->database->buildLike(
@@ -921,6 +931,7 @@
/**
* @covers Wikimedia\Rdbms\Database::commit
+ * @covers Wikimedia\Rdbms\Database::doCommit
*/
public function testTransactionCommit() {
$this->database->begin( __METHOD__ );
@@ -930,6 +941,7 @@
/**
* @covers Wikimedia\Rdbms\Database::rollback
+ * @covers Wikimedia\Rdbms\Database::doRollback
*/
public function testTransactionRollback() {
$this->database->begin( __METHOD__ );
@@ -1035,6 +1047,9 @@
];
}
+ /**
+ * @covers Wikimedia\Rdbms\Database::registerTempTableOperation
+ */
public function testSessionTempTables() {
$temp1 = $this->database->tableName( 'tmp_table_1' );
$temp2 = $this->database->tableName( 'tmp_table_2' );
--
To view, visit https://gerrit.wikimedia.org/r/367637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b8489b1c61c0294288442a0a0cd28c9fa77f82e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
