From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 4 Oct 2010 23:29:05 +0000 (+0000)
Subject: Tweak/refactoring around of tests
X-Git-Tag: 1.31.0-rc.0~34619
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=d4b4d437e59368d75438d5f357ea593f1c1a93e4;p=lhc%2Fweb%2Fwiklou.git

Tweak/refactoring around of tests

Mark 3 as incomplete (ie broken)
---

diff --git a/maintenance/tests/phpunit/includes/api/ApiSetup.php b/maintenance/tests/phpunit/includes/api/ApiSetup.php
index 8250883e0f..54f2fa5953 100644
--- a/maintenance/tests/phpunit/includes/api/ApiSetup.php
+++ b/maintenance/tests/phpunit/includes/api/ApiSetup.php
@@ -37,7 +37,7 @@ abstract class ApiTestSetup extends PHPUnit_Framework_TestCase {
 			self::$sysopUser = new UserWrapper( 'Useruser1', 'Passpass1', 'sysop' );
 		}
 		
-		$GLOBALS['wgUser'] = self::$user->user;
+		$GLOBALS['wgUser'] = self::$sysopUser->user;
 	}
 
 	function tearDown() {
diff --git a/maintenance/tests/phpunit/includes/api/ApiTest.php b/maintenance/tests/phpunit/includes/api/ApiTest.php
index bd849af9a6..47b9005711 100644
--- a/maintenance/tests/phpunit/includes/api/ApiTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiTest.php
@@ -87,7 +87,7 @@ class ApiTest extends ApiTestSetup {
 	function testApiLoginBadPass() {
 		global $wgServer;
 
-		$user = self::$sysopUser;
+		$user = self::$user;
 
 		if ( !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
@@ -130,7 +130,7 @@ class ApiTest extends ApiTestSetup {
 			$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
 		}
 
-		$user = self::$sysopUser;
+		$user = self::$user;
 
 		$ret = $this->doApiRequest( array(
 			"action" => "login",
diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
index 59223e196e..4a87e89a25 100644
--- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
@@ -8,11 +8,11 @@ class ApiWatchTest extends ApiTestSetup {
 		parent::setUp();
 	}
 
-	function testLogin() {
+	function testLogin() {	
 		$data = $this->doApiRequest( array(
 			'action' => 'login',
-			'lgname' => self::$user->userName,
-			'lgpassword' => self::$user->password ) );
+			'lgname' => self::$sysopUser->userName,
+			'lgpassword' => self::$sysopUser->password ) );
 
 		$this->assertArrayHasKey( "login", $data[0] );
 		$this->assertArrayHasKey( "result", $data[0]['login'] );
@@ -22,8 +22,8 @@ class ApiWatchTest extends ApiTestSetup {
 		$data = $this->doApiRequest( array(
 			'action' => 'login',
 			"lgtoken" => $token,
-			"lgname" => self::$user->userName,
-			"lgpassword" => self::$user->password ), $data );
+			"lgname" => self::$sysopUser->userName,
+			"lgpassword" => self::$sysopUser->password ), $data );
 
 		$this->assertArrayHasKey( "login", $data[0] );
 		$this->assertArrayHasKey( "result", $data[0]['login'] );
@@ -33,50 +33,56 @@ class ApiWatchTest extends ApiTestSetup {
 		return $data;
 	}
 
-	function testGetToken() {
+	function testGettingToken() {
 		foreach ( array( self::$user, self::$sysopUser ) as $user ) {
-			$GLOBALS['wgUser'] = $user->user;
+			$this->getUserTokens( $user );
+		}
+	}
 
-			$data = $this->doApiRequest( array(
-				'action' => 'query',
-				'titles' => 'Main Page',
-				'intoken' => 'edit|delete|protect|move|block|unblock',
-				'prop' => 'info' ) );
+	function getUserTokens( $user ) {
+		$GLOBALS['wgUser'] = $user->user;
+		$data = $this->doApiRequest( array(
+			'action' => 'query',
+			'titles' => 'Main Page',
+			'intoken' => 'edit|delete|protect|move|block|unblock',
+			'prop' => 'info' ) );
 
-			$this->assertArrayHasKey( 'query', $data[0] );
-			$this->assertArrayHasKey( 'pages', $data[0]['query'] );
-			$keys = array_keys( $data[0]['query']['pages'] );
-			$key = array_pop( $keys );
+		$this->assertArrayHasKey( 'query', $data[0] );
+		$this->assertArrayHasKey( 'pages', $data[0]['query'] );
+		$keys = array_keys( $data[0]['query']['pages'] );
+		$key = array_pop( $keys );
 
-			$rights = $user->user->getRights();
+		$rights = $user->user->getRights();
 
-			$this->assertArrayHasKey( $key, $data[0]['query']['pages'] );
-			$this->assertArrayHasKey( 'edittoken', $data[0]['query']['pages'][$key] );
-			$this->assertArrayHasKey( 'movetoken', $data[0]['query']['pages'][$key] );
+		$this->assertArrayHasKey( $key, $data[0]['query']['pages'] );
+		$this->assertArrayHasKey( 'edittoken', $data[0]['query']['pages'][$key] );
+		$this->assertArrayHasKey( 'movetoken', $data[0]['query']['pages'][$key] );
 
-			if ( isset( $rights['delete'] ) ) {
-				$this->assertArrayHasKey( 'deletetoken', $data[0]['query']['pages'][$key] );
-			}
+		if ( isset( $rights['delete'] ) ) {
+			$this->assertArrayHasKey( 'deletetoken', $data[0]['query']['pages'][$key] );
+		}
 
-			if ( isset( $rights['block'] ) ) {
-				$this->assertArrayHasKey( 'blocktoken', $data[0]['query']['pages'][$key] );
-				$this->assertArrayHasKey( 'unblocktoken', $data[0]['query']['pages'][$key] );
-			}
+		if ( isset( $rights['block'] ) ) {
+			$this->assertArrayHasKey( 'blocktoken', $data[0]['query']['pages'][$key] );
+			$this->assertArrayHasKey( 'unblocktoken', $data[0]['query']['pages'][$key] );
+		}
 
-			if ( isset( $rights['protect'] ) ) {
-				$this->assertArrayHasKey( 'protecttoken', $data[0]['query']['pages'][$key] );
-			}
+		if ( isset( $rights['protect'] ) ) {
+			$this->assertArrayHasKey( 'protecttoken', $data[0]['query']['pages'][$key] );
 		}
 
-		$GLOBALS['wgUser'] = self::$user->user;
+	    return $data;
+	}
 
-		return $data;
+	function testGetToken() {
+		return $this->getUserTokens( self::$sysopUser );
 	}
 
 	/**
 	 * @depends testGetToken
 	 */
 	function testWatchEdit( $data ) {
+		$this->markTestIncomplete( "Broken" );
 		$keys = array_keys( $data[0]['query']['pages'] );
 		$key = array_pop( $keys );
 		$pageinfo = $data[0]['query']['pages'][$key];
@@ -126,6 +132,7 @@ class ApiWatchTest extends ApiTestSetup {
 	 * @depends testGetToken
 	 */
 	function testWatchProtect( $data ) {
+		$this->markTestIncomplete( "Broken" );
 		$keys = array_keys( $data[0]['query']['pages'] );
 		$key = array_pop( $keys );
 		$pageinfo = $data[0]['query']['pages'][$key];
@@ -194,6 +201,7 @@ class ApiWatchTest extends ApiTestSetup {
 	 * @depends testGetToken
 	 */
 	function testWatchDelete( $data ) {
+		$this->markTestIncomplete( "Broken" );
 		$keys = array_keys( $data[0]['query']['pages'] );
 		$key = array_pop( $keys );
 		$pageinfo = $data[0]['query']['pages'][$key];