From 08aac7bd40c6d561898b7922aa769fc0f59abe9d Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 11 Oct 2011 10:02:50 +0000 Subject: [PATCH] Stylize.php changes --- tests/phpunit/includes/UserTest.php | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/tests/phpunit/includes/UserTest.php b/tests/phpunit/includes/UserTest.php index bc87ede285..eb2f0d1ede 100644 --- a/tests/phpunit/includes/UserTest.php +++ b/tests/phpunit/includes/UserTest.php @@ -9,19 +9,19 @@ define( 'NS_UNITTEST_TALK', 5601 ); class UserTest extends MediaWikiTestCase { protected $savedGroupPermissions, $savedRevokedPermissions; protected $user; - + public function setUp() { parent::setUp(); - + $this->savedGroupPermissions = $GLOBALS['wgGroupPermissions']; $this->savedRevokedPermissions = $GLOBALS['wgRevokePermissions']; - + $this->setUpPermissionGlobals(); $this->setUpUser(); } private function setUpPermissionGlobals() { global $wgGroupPermissions, $wgRevokePermissions; - + # Data for regular $wgGroupPermissions test $wgGroupPermissions['unittesters'] = array( 'test' => true, @@ -38,33 +38,33 @@ class UserTest extends MediaWikiTestCase { $wgRevokePermissions['formertesters'] = array( 'runtest' => true, ); - + # Data for namespace based $wgGroupPermissions test $wgGroupPermissions['unittesters']['writedocumentation'] = array( NS_MAIN => false, NS_UNITTEST => true, ); $wgGroupPermissions['testwriters']['writedocumentation'] = true; - + } private function setUpUser() { $this->user = new User; $this->user->addGroup( 'unittesters' ); } - + public function tearDown() { parent::tearDown(); - + $GLOBALS['wgGroupPermissions'] = $this->savedGroupPermissions; $GLOBALS['wgRevokePermissions'] = $this->savedRevokedPermissions; } - + public function testGroupPermissions() { $rights = User::getGroupPermissions( array( 'unittesters' ) ); $this->assertContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); $this->assertNotContains( 'modifytest', $rights ); $this->assertNotContains( 'nukeworld', $rights ); - + $rights = User::getGroupPermissions( array( 'unittesters', 'testwriters' ) ); $this->assertContains( 'runtest', $rights ); $this->assertContains( 'writetest', $rights ); @@ -76,49 +76,49 @@ class UserTest extends MediaWikiTestCase { $this->assertNotContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); $this->assertNotContains( 'modifytest', $rights ); - $this->assertNotContains( 'nukeworld', $rights ); + $this->assertNotContains( 'nukeworld', $rights ); } - + public function testNamespaceGroupPermissions() { $rights = User::getGroupPermissions( array( 'unittesters' ) ); $this->assertNotContains( 'writedocumentation', $rights ); - + $rights = User::getGroupPermissions( array( 'unittesters' ) , NS_MAIN ); $this->assertNotContains( 'writedocumentation', $rights ); $this->assertNotContains( 'modifytest', $rights ); - + $rights = User::getGroupPermissions( array( 'unittesters' ), NS_HELP ); $this->assertNotContains( 'writedocumentation', $rights ); $this->assertNotContains( 'modifytest', $rights ); - + $rights = User::getGroupPermissions( array( 'unittesters' ), NS_UNITTEST ); $this->assertContains( 'writedocumentation', $rights ); - - $rights = User::getGroupPermissions( + + $rights = User::getGroupPermissions( array( 'unittesters', 'testwriters' ), NS_MAIN ); $this->assertContains( 'writedocumentation', $rights ); } - + public function testUserPermissions() { $rights = $this->user->getRights(); $this->assertContains( 'runtest', $rights ); $this->assertNotContains( 'writetest', $rights ); $this->assertNotContains( 'modifytest', $rights ); $this->assertNotContains( 'nukeworld', $rights ); - $this->assertNotContains( 'writedocumentation', $rights ); - + $this->assertNotContains( 'writedocumentation', $rights ); + $rights = $this->user->getRights( NS_MAIN ); $this->assertNotContains( 'writedocumentation', $rights ); $this->assertNotContains( 'modifytest', $rights ); - + $rights = $this->user->getRights( NS_HELP ); $this->assertNotContains( 'writedocumentation', $rights ); $this->assertNotContains( 'modifytest', $rights ); - + $rights = $this->user->getRights( NS_UNITTEST ); $this->assertContains( 'writedocumentation', $rights ); } - + /** * @dataProvider provideGetGroupsWithPermission */ @@ -126,42 +126,42 @@ class UserTest extends MediaWikiTestCase { $result = User::getGroupsWithPermission( $right, $ns ); sort( $result ); sort( $expected ); - - $this->assertEquals( $expected, $result, "Groups with permission $right" . + + $this->assertEquals( $expected, $result, "Groups with permission $right" . ( is_null( $ns ) ? '' : "in namespace $ns" ) ); } public function provideGetGroupsWithPermission() { return array( - array( + array( array( 'unittesters', 'testwriters' ), 'test', null - ), - array( + ), + array( array( 'unittesters' ), 'runtest', null ), - array( + array( array( 'testwriters' ), 'writetest', null ), - array( + array( array( 'testwriters' ), 'modifytest', null ), - array( + array( array( 'testwriters' ), 'writedocumentation', NS_MAIN ), - array( + array( array( 'unittesters', 'testwriters' ), 'writedocumentation', NS_UNITTEST - ), + ), ); } -- 2.20.1