[TASK] Remove old EXT:phpunit fragments 87/44987/3
authorNicole Cordes <typo3@cordes.co>
Fri, 27 Nov 2015 15:56:07 +0000 (16:56 +0100)
committerMorton Jonuschat <m.jonuschat@mojocode.de>
Sat, 28 Nov 2015 14:06:08 +0000 (15:06 +0100)
Clean up test code and remove EXT:phpunit dependencies from core.

Resolves: #71892
Releases: master
Change-Id: I432a5ca7167226638310ff5695e6609b323eaf15
Reviewed-on: https://review.typo3.org/44987
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php [deleted file]
typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php

index b625762..2732a50 100644 (file)
@@ -20,7 +20,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
 class FlashMessageQueueTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject
+     * @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
      */
     protected $flashMessageQueue;
 
index 4862aeb..cee4723 100644 (file)
@@ -20,7 +20,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
 class FlashMessageServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject
+     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
      */
     protected $flashMessageService;
 
diff --git a/typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php b/typo3/sysext/extbase/Tests/SeleniumBaseTestCase.php
deleted file mode 100644 (file)
index 409dc3b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace TYPO3\CMS\Extbase\Tests;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Base Selenium testcase for the Extbase extension.
- */
-abstract class SeleniumBaseTestCase extends \tx_phpunit_selenium_testcase
-{
-}
index 49a89af..f18c3ba 100644 (file)
@@ -55,14 +55,14 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             )
         );
 
-        /** @var $configurationManagerMock \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject */
+        /** @var $configurationManagerMock \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $configurationManagerMock = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class, array('getConfiguration'));
         $configurationManagerMock->expects($this->any())->method('getConfiguration')->with('Framework')->will($this->returnValue($frameworkSettings));
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject  $objectManager */
         $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
 
-        /** @var $bootstrapMock \TYPO3\CMS\Extbase\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject */
+        /** @var $bootstrapMock \TYPO3\CMS\Extbase\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $bootstrapMock = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Core\Bootstrap::class, array('inject'));
         $bootstrapMock->_set('objectManager', $objectManager);
         $bootstrapMock->_set('configurationManager', $configurationManagerMock);
index e88da16..6650622 100644 (file)
@@ -20,7 +20,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc;
 class ResponseTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject
+     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
      */
     protected $mockResponse;
 
index dacfd6a..6f05521 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures\SlotMethodDoesNotExistFixtu
 class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\Tx_Phpunit_Interface_AccessibleObject
+     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
      */
     protected $signalSlotDispatcher;