Merge "Introduce ExternalStoreFactory"

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

diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php
index 75c5b50..f97dd73 100644 (file)
--- a/tests/phpunit/includes/actions/ActionTest.php
+++ b/tests/phpunit/includes/actions/ActionTest.php
@@ -3,10 +3,11 @@
 /**
  * @covers Action
  *
- * @author Thiemo Mättig
- *
  * @group Action
  * @group Database
+ *
+ * @licence GNU GPL v2+
+ * @author Thiemo Kreuz
  */
 class ActionTest extends MediaWikiTestCase {
 
@@ -56,6 +57,8 @@ class ActionTest extends MediaWikiTestCase {
                        // Null and non-existing values
                        [ 'null', null ],
                        [ 'undeclared', null ],
+                       [ '', null ],
+                       [ false, null ],
                ];
        }
 
@@ -135,39 +138,22 @@ class ActionTest extends MediaWikiTestCase {
                $this->assertType( $expected ?: 'null', $action );
        }
 
-       public function emptyActionProvider() {
-               return [
-                       [ null ],
-                       [ false ],
-                       [ '' ],
-               ];
-       }
-
-       /**
-        * @dataProvider emptyActionProvider
-        */
-       public function testEmptyAction_doesNotExist( $requestedAction ) {
-               $exists = Action::exists( $requestedAction );
+       public function testNull_doesNotExist() {
+               $exists = Action::exists( null );
 
                $this->assertFalse( $exists );
        }
 
-       /**
-        * @dataProvider emptyActionProvider
-        */
-       public function testEmptyAction_defaultsToView( $requestedAction ) {
-               $context = $this->getContext( $requestedAction );
+       public function testNull_defaultsToView() {
+               $context = $this->getContext( null );
                $actionName = Action::getActionName( $context );
 
                $this->assertEquals( 'view', $actionName );
        }
 
-       /**
-        * @dataProvider emptyActionProvider
-        */
-       public function testEmptyAction_canNotBeInstantiated( $requestedAction ) {
+       public function testNull_canNotBeInstantiated() {
                $page = $this->getPage();
-               $action = Action::factory( $requestedAction, $page );
+               $action = Action::factory( null, $page );
 
                $this->assertNull( $action );
        }