[BUGFIX] Fix comment typo in Check.php
[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Tests / Unit / Mvc / Controller / AbstractControllerTest.php
index 88b45f1..f9eb282 100644 (file)
@@ -14,88 +14,63 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Controller;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
 /**
  * Test case
  */
-class AbstractControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
+class AbstractControllerTest extends UnitTestCase
 {
     /**
-     * @test
-     */
-    public function constructResolvesExtensionnameFromOldStyle()
-    {
-        $className = $this->getUniqueId('Tx_Extbase_Tests_Fixtures_Controller');
-        eval('class ' . $className . ' extends \\' . \TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class . ' { function getExtensionName() { return $this->extensionName; } }');
-        $mockController = new $className();
-        $expectedResult = 'Extbase';
-        $actualResult = $mockController->getExtensionName();
-        $this->assertEquals($expectedResult, $actualResult);
-    }
-
-    /**
-     * @test
-     */
-    public function constructResolvesExtensionnameFromNamespaced()
-    {
-        $className = $this->getUniqueId('DummyController');
-        eval('namespace ' . __NAMESPACE__ . '; class ' . $className . ' extends \\' . \TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class . ' { function getExtensionName() { return $this->extensionName; } }');
-        $classNameNamespaced = __NAMESPACE__ . '\\' . $className;
-        $mockController = new $classNameNamespaced();
-        $expectedResult = 'Extbase';
-        $actualResult = $mockController->getExtensionName();
-        $this->assertEquals($expectedResult, $actualResult);
-    }
-
-    /**
      * @return array
      */
     public function addFlashMessageDataProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Simple Message'),
                 'Simple Message',
                 '',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
                 false
-            ),
-            array(
+            ],
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Some OK', 'Message Title', \TYPO3\CMS\Core\Messaging\FlashMessage::OK, true),
                 'Some OK',
                 'Message Title',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
                 true
-            ),
-            array(
+            ],
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Some Info', 'Message Title', \TYPO3\CMS\Core\Messaging\FlashMessage::INFO, true),
                 'Some Info',
                 'Message Title',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
                 true
-            ),
-            array(
+            ],
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Some Notice', 'Message Title', \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE, true),
                 'Some Notice',
                 'Message Title',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
                 true
-            ),
+            ],
 
-            array(
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Some Warning', 'Message Title', \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING, true),
                 'Some Warning',
                 'Message Title',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
                 true
-            ),
-            array(
+            ],
+            [
                 new \TYPO3\CMS\Core\Messaging\FlashMessage('Some Error', 'Message Title', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR, true),
                 'Some Error',
                 'Message Title',
                 \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                 true
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -104,26 +79,26 @@ class AbstractControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addFlashMessageAddsFlashMessageObjectToFlashMessageQueue($expectedMessage, $messageBody, $messageTitle = '', $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK, $storeInSession = true)
     {
-        $flashMessageQueue = $this->getMock(
-            \TYPO3\CMS\Core\Messaging\FlashMessageQueue::class,
-            array('enqueue'),
-            array($this->getUniqueId('identifier_'))
-        );
+        $flashMessageQueue = $this->getMockBuilder(\TYPO3\CMS\Core\Messaging\FlashMessageQueue::class)
+            ->setMethods(['enqueue'])
+            ->setConstructorArgs([$this->getUniqueId('identifier_')])
+            ->getMock();
+
         $flashMessageQueue->expects($this->once())->method('enqueue')->with($this->equalTo($expectedMessage));
 
-        $controllerContext = $this->getMock(
-            \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class,
-            array('getFlashMessageQueue')
-        );
+        $controllerContext = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class)
+            ->setMethods(['getFlashMessageQueue'])
+            ->getMock();
         $controllerContext->expects($this->once())->method('getFlashMessageQueue')->will($this->returnValue($flashMessageQueue));
 
-        $controller = $this->getMockForAbstractClass(\TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class,
-            array(),
+        $controller = $this->getMockForAbstractClass(
+            \TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class,
+            [],
             '',
             false,
             true,
             true,
-            array('dummy')
+            ['dummy']
         );
         $this->inject($controller, 'controllerContext', $controllerContext);
 
@@ -132,17 +107,19 @@ class AbstractControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @expectedException \InvalidArgumentException
      */
     public function addFlashMessageThrowsExceptionOnInvalidMessageBody()
     {
-        $controller = $this->getMockForAbstractClass(\TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class,
-            array(),
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionCode(1243258395);
+        $controller = $this->getMockForAbstractClass(
+            \TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class,
+            [],
             '',
             false,
             true,
             true,
-            array('dummy')
+            ['dummy']
         );
 
         $controller->addFlashMessage(new \stdClass());