From: Yuri Astrakhan <yurik@wikimedia.org>
Date: Tue, 17 Mar 2015 01:07:24 +0000 (+0300)
Subject: API unittests, pass optional params to doApiRequest()
X-Git-Tag: 1.31.0-rc.0~12070^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=51e4f30eb7713d002d60e9ff41555272b8c4e769;p=lhc%2Fweb%2Fwiklou.git

API unittests, pass optional params to doApiRequest()

ApiQueryTestBase::check() should pass all optional params
like session and user to the doApiRequest()

Change-Id: If1cb52b03faba06c97d330a91a23893fe08acf22
---

diff --git a/tests/phpunit/includes/api/query/ApiQueryTestBase.php b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
index e664173dc6..dabf72e0e7 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
@@ -88,9 +88,13 @@ STR;
 	/**
 	 * Checks that the request's result matches the expected results.
 	 * @param array $values Array is a two element array( request, expected_results )
-	 * @throws Exception
+	 * @param array $session
+	 * @param bool $appendModule
+	 * @param User $user
 	 */
-	protected function check( $values ) {
+	protected function check( $values, array $session = null,
+		$appendModule = false, User $user = null
+	) {
 		list( $req, $exp ) = $this->validateRequestExpectedPair( $values );
 		if ( !array_key_exists( 'action', $req ) ) {
 			$req['action'] = 'query';
@@ -103,7 +107,7 @@ STR;
 				$val = implode( '|', array_unique( $val ) );
 			}
 		}
-		$result = $this->doApiRequest( $req );
+		$result = $this->doApiRequest( $req, $session, $appendModule, $user );
 		$this->assertResult( array( 'query' => $exp ), $result[0], $req );
 	}