Work on tests

Author: koehnlein

.travis.yml

@@ -54,7 +54,7 @@ jobs:
                         echo "Running unit tests";
                         echo;
                         echo;
-                        .Build/bin/phpunit --bootstrap .Build/vendor/nimut/testing-framework/res/Configuration/UnitTestsBootstrap.php --testsuite unit;
+                        .Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php --testsuite unit;
                     fi
 
                 - >
@@ -63,7 +63,7 @@ jobs:
                         echo "Running functional tests";
                         echo;
                         echo;
-                        find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --bootstrap .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTestsBootstrap.php {}';
+                        find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php {}';
                     fi
 
                 - >
@@ -179,7 +179,7 @@ jobs:
                               echo "Running unit tests";
                               echo;
                               echo;
-                              .Build/bin/phpunit --bootstrap .Build/vendor/nimut/testing-framework/res/Configuration/UnitTestsBootstrap.php --log-junit .Log/junit/unit_$VERSION.xml --coverage-php .Log/coverage/unit_$VERSION.cov  --testsuite unit;
+                              .Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php --log-junit .Log/junit/unit_$VERSION.xml --coverage-php .Log/coverage/unit_$VERSION.cov  --testsuite unit;
                             fi
 
                             if [ -d "Tests/Functional" ]; then

Tests/Functional/Controller/AbstractExportControllerTestCase.php

@@ -18,7 +18,6 @@
  */
 
 use IchHabRecht\MaskExport\Controller\ExportController;
-use Nimut\TestingFramework\TestCase\FunctionalTestCase;
 use PHPUnit\Framework\MockObject\MockBuilder;
 use Prophecy\Argument;
 use TYPO3\CMS\Core\Cache\CacheManager;
@@ -35,6 +34,7 @@
 use TYPO3\CMS\Extbase\Mvc\Response;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Fluid\View\TemplateView;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 abstract class AbstractExportControllerTestCase extends FunctionalTestCase
 {
@@ -43,10 +43,7 @@ abstract class AbstractExportControllerTestCase extends FunctionalTestCase
      */
     protected $runTestInSeparateProcess = true;
 
-    /**
-     * @var array
-     */
-    protected $configurationToUseInTestInstance = [
+    protected array $configurationToUseInTestInstance = [
         'EXTENSIONS' => [
             'mask' => [
                 'json' => 'typo3conf/ext/mask_export/Tests/Functional/Fixtures/Configuration/mask-default.json',
@@ -58,22 +55,13 @@ abstract class AbstractExportControllerTestCase extends FunctionalTestCase
         ],
     ];
 
-    /**
-     * @var array
-     */
-    protected $coreExtensionsToLoad = [
+    protected array $coreExtensionsToLoad = [
         'fluid_styled_content',
     ];
 
-    /**
-     * @var array
-     */
-    protected $files = [];
+    protected array $files = [];
 
-    /**
-     * @var array
-     */
-    protected $testExtensionsToLoad = [
+    protected array $testExtensionsToLoad = [
         'typo3conf/ext/mask',
         'typo3conf/ext/mask_export',
     ];
@@ -85,8 +73,6 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-
         $request = new Request('IchHabRecht\\MaskExport\\Controller\\ExportController');
         $request->setControllerObjectName('IchHabRecht\\MaskExport\\Controller\\ExportController');
         $request->setControllerActionName('list');
@@ -100,7 +86,7 @@ protected function setUp(): void
             $response = new Response();
         }
 
-        $view = $objectManager->get(TemplateView::class);
+        $view = GeneralUtility::makeInstance(TemplateView::class);
         $view->setLayoutRootPaths(['EXT:mask_export/Resources/Private/Layouts']);
         $view->setTemplateRootPaths(['EXT:mask_export/Tests/Functional/Fixtures/Templates']);
         if (method_exists(GeneralUtility::class, 'getContainer')) {
@@ -110,7 +96,7 @@ protected function setUp(): void
             GeneralUtility::addInstance(TemplateView::class, $view);
         }
 
-        $subject = $objectManager->get(ExportController::class);
+        $subject = GeneralUtility::makeInstance(ExportController::class);
         $response = $subject->processRequest($request, $response) ?: $response;
 
         $closure = \Closure::bind(function () use ($view) {

Tests/Unit/FileCollection/PhpFileCollectionTest.php

@@ -20,11 +20,14 @@
 use IchHabRecht\MaskExport\Aggregate\PhpAwareInterface;
 use IchHabRecht\MaskExport\FileCollection\PhpFileCollection;
 use IchHabRecht\MaskExport\FlagResolver\PhpFileFlagResolver;
-use Nimut\TestingFramework\TestCase\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\CMS\Core\Service\DependencyOrderingService;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class PhpFileCollectionTest extends UnitTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */
@@ -60,7 +63,7 @@ public function getFilesCombinesPhpFileFlags()
         $files = $phpFileCollection->getFiles();
 
         $this->assertArrayHasKey('ext_tables.php', $files);
-        $this->assertStringContainsString('defined(\'TYPO3_MODE\') || die();', $files['ext_tables.php']);
+        $this->assertStringContainsString('defined(\'TYPO3\') || die();', $files['ext_tables.php']);
         $this->assertStringContainsString('call_user_func(static function () {', $files['ext_tables.php']);
     }
 }

composer.json

@@ -28,8 +28,9 @@
     },
     "require-dev": {
         "typo3/cms-fluid-styled-content": "^12.4",
-        "nimut/testing-framework": "6.x-dev",
-        "phpunit/phpunit": "^8.5"
+        "typo3/testing-framework": "^7.0",
+        "phpunit/phpunit": "^9.6",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "replace": {
         "typo3-ter/mask-export": "self.version"