Type hint against LinkTarget in WatchedItemStore

[lhc/web/wiklou.git] / tests / phpunit / includes / FormOptionsInitializationTest.php

diff --git a/tests/phpunit/includes/FormOptionsInitializationTest.php b/tests/phpunit/includes/FormOptionsInitializationTest.php
index dcaf1f7..2c78618 100644 (file)
--- 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,11 +22,11 @@ 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' );
@@ -58,12 +39,12 @@ class FormOptionsInitializationTest extends MediaWikiTestCase {
                                        'value' => null,
                                ]
                        ],
-                       $this->object->getOptions()
+                       $this->object->options
                );
        }
 
        /**
-        * @covers FormOptionsExposed::add
+        * @covers FormOptions::add
         */
        public function testAddIntegers() {
                $this->object->add( 'one', 1 );
@@ -83,7 +64,7 @@ class FormOptionsInitializationTest extends MediaWikiTestCase {
                                        'type' => FormOptions::INT,
                                ]
                        ],
-                       $this->object->getOptions()
+                       $this->object->options
                );
        }
 }