X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FFormOptionsInitializationTest.php;h=2c78618aa1dc84ad2eced8e8b078cf5e8f7e2678;hb=b7499cecc6ff5bfbd4c06677c0dc2a64ed31627a;hp=1531b5695b1324ad1a37d1fef6472f102649f027;hpb=12ddd4d9a2341d217789fc2137422a69f2a948f8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/FormOptionsInitializationTest.php b/tests/phpunit/includes/FormOptionsInitializationTest.php
index 1531b5695b..2c78618aa1 100644
--- a/tests/phpunit/includes/FormOptionsInitializationTest.php
+++ b/tests/phpunit/includes/FormOptionsInitializationTest.php
@@ -1,30 +1,11 @@
 <?php
-/**
- * This file host two test case classes for the MediaWiki FormOptions class:
- *  - FormOptionsInitializationTest : tests initialization of the class.
- *  - FormOptionsTest : tests methods an on instance
- *
- * The split let us take advantage of setting up a fixture for the methods
- * tests.
- */
 
-/**
- * Dummy class to makes FormOptions::$options public.
- * Used by FormOptionsInitializationTest which need to verify the $options
- * array is correctly set through the FormOptions::add() function.
- */
-class FormOptionsExposed extends FormOptions {
-	public function getOptions() {
-		return $this->options;
-	}
-}
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * Test class for FormOptions initialization
  * Ensure the FormOptions::add() does what we want it to do.
  *
- * Generated by PHPUnit on 2011-02-28 at 20:46:27.
- *
  * Copyright © 2011, Antoine Musso
  *
  * @author Antoine Musso
@@ -41,49 +22,49 @@ class FormOptionsInitializationTest extends MediaWikiTestCase {
 	 */
 	protected function setUp() {
 		parent::setUp();
-		$this->object = new FormOptionsExposed();
+		$this->object = TestingAccessWrapper::newFromObject( new FormOptions() );
 	}
 
 	/**
-	 * @covers FormOptionsExposed::add
+	 * @covers FormOptions::add
 	 */
 	public function testAddStringOption() {
 		$this->object->add( 'foo', 'string value' );
 		$this->assertEquals(
-			array(
-				'foo' => array(
+			[
+				'foo' => [
 					'default' => 'string value',
 					'consumed' => false,
 					'type' => FormOptions::STRING,
 					'value' => null,
-				)
-			),
-			$this->object->getOptions()
+				]
+			],
+			$this->object->options
 		);
 	}
 
 	/**
-	 * @covers FormOptionsExposed::add
+	 * @covers FormOptions::add
 	 */
 	public function testAddIntegers() {
 		$this->object->add( 'one', 1 );
 		$this->object->add( 'negone', -1 );
 		$this->assertEquals(
-			array(
-				'negone' => array(
+			[
+				'negone' => [
 					'default' => -1,
 					'value' => null,
 					'consumed' => false,
 					'type' => FormOptions::INT,
-				),
-				'one' => array(
+				],
+				'one' => [
 					'default' => 1,
 					'value' => null,
 					'consumed' => false,
 					'type' => FormOptions::INT,
-				)
-			),
-			$this->object->getOptions()
+				]
+			],
+			$this->object->options
 		);
 	}
 }