From fb694b589f371410351093a87d5e88c8d530a9c0 Mon Sep 17 00:00:00 2001 From: Platonides Date: Mon, 1 Nov 2010 17:28:03 +0000 Subject: [PATCH] Add a new group destructive. Spacing. --- maintenance/tests/phpunit/includes/SampleTest.php | 4 ++-- maintenance/tests/phpunit/includes/api/ApiSetup.php | 4 ++-- maintenance/tests/phpunit/includes/api/ApiTest.php | 11 +++++++---- .../tests/phpunit/includes/api/ApiWatchTest.php | 3 +++ .../tests/phpunit/suites/ExtensionsTestSuite.php | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/maintenance/tests/phpunit/includes/SampleTest.php b/maintenance/tests/phpunit/includes/SampleTest.php index a9930ebee2..117ac1ca49 100644 --- a/maintenance/tests/phpunit/includes/SampleTest.php +++ b/maintenance/tests/phpunit/includes/SampleTest.php @@ -88,8 +88,8 @@ class TestSample extends PHPUnit_Framework_TestCase { * See http://www.phpunit.de/manual/3.4/en/appendixes.annotations.html#appendixes.annotations.expectedException */ function testTitleObjectFromObject() { - $title = Title::newFromText(new Title("test")); + $title = Title::newFromText( new Title( "test" ) ); $this->assertEquals( "Test", $title->isLocal() ); } - } +} diff --git a/maintenance/tests/phpunit/includes/api/ApiSetup.php b/maintenance/tests/phpunit/includes/api/ApiSetup.php index 7ffa807003..45790d4abe 100644 --- a/maintenance/tests/phpunit/includes/api/ApiSetup.php +++ b/maintenance/tests/phpunit/includes/api/ApiSetup.php @@ -51,9 +51,9 @@ class UserWrapper { public function __construct( $userName, $password, $group = '' ) { $this->userName = $userName; - $this->password = $password; + $this->password = $password; - $this->user = User::newFromName( $this->userName ); + $this->user = User::newFromName( $this->userName ); if ( !$this->user->getID() ) { $this->user = User::createNew( $this->userName, array( "email" => "test@example.com", diff --git a/maintenance/tests/phpunit/includes/api/ApiTest.php b/maintenance/tests/phpunit/includes/api/ApiTest.php index 1f87602cc5..5e83253c76 100644 --- a/maintenance/tests/phpunit/includes/api/ApiTest.php +++ b/maintenance/tests/phpunit/includes/api/ApiTest.php @@ -17,6 +17,9 @@ class MockApi extends ApiBase { } } +/** + * @group destructive + */ class ApiTest extends ApiTestSetup { function testRequireOnlyOneParameterDefault() { @@ -28,8 +31,8 @@ class ApiTest extends ApiTestSetup { } /** - * @expectedException UsageException - */ + * @expectedException UsageException + */ function testRequireOnlyOneParameterZero() { $mock = new MockApi(); @@ -39,8 +42,8 @@ class ApiTest extends ApiTestSetup { } /** - * @expectedException UsageException - */ + * @expectedException UsageException + */ function testRequireOnlyOneParameterTrue() { $mock = new MockApi(); diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php index bf7e709069..50bade6abb 100644 --- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php +++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php @@ -2,6 +2,9 @@ require_once dirname( __FILE__ ) . '/ApiSetup.php'; +/** + * @group destructive + */ class ApiWatchTest extends ApiTestSetup { function setUp() { diff --git a/maintenance/tests/phpunit/suites/ExtensionsTestSuite.php b/maintenance/tests/phpunit/suites/ExtensionsTestSuite.php index bf1e42bb31..4bf3542799 100644 --- a/maintenance/tests/phpunit/suites/ExtensionsTestSuite.php +++ b/maintenance/tests/phpunit/suites/ExtensionsTestSuite.php @@ -4,7 +4,7 @@ * See http://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList for details of how to register your tests. */ - class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite { +class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite { public function __construct() { parent::__construct(); $files = array(); -- 2.20.1