From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 25 Jul 2017 02:21:12 +0000 (-0700)
Subject: rdbms: Add more @covers to DatabaseSQLTest
X-Git-Tag: 1.31.0-rc.0~2609^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=b70a3bb821ec96dc840269cc5df0ef96395cdf86;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 57666bdc0c..7e9494c6c4 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -22,13 +22,18 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 		);
 	}
 
-	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 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @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 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @dataProvider provideInsert
 	 * @covers Wikimedia\Rdbms\Database::insert
+	 * @covers Wikimedia\Rdbms\Database::makeInsertOptions
 	 */
 	public function testInsert( $sql, $sqlText ) {
 		$this->database->insert(
@@ -356,6 +364,7 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @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 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @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 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers Wikimedia\Rdbms\Database::commit
+	 * @covers Wikimedia\Rdbms\Database::doCommit
 	 */
 	public function testTransactionCommit() {
 		$this->database->begin( __METHOD__ );
@@ -930,6 +941,7 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers Wikimedia\Rdbms\Database::rollback
+	 * @covers Wikimedia\Rdbms\Database::doRollback
 	 */
 	public function testTransactionRollback() {
 		$this->database->begin( __METHOD__ );
@@ -1035,6 +1047,9 @@ class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
 		];
 	}
 
+	/**
+	 * @covers Wikimedia\Rdbms\Database::registerTempTableOperation
+	 */
 	public function testSessionTempTables() {
 		$temp1 = $this->database->tableName( 'tmp_table_1' );
 		$temp2 = $this->database->tableName( 'tmp_table_2' );