[BUGFIX] Have correct test class namespaces 32/57132/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 6 Jun 2018 18:36:00 +0000 (20:36 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 6 Jun 2018 18:58:43 +0000 (20:58 +0200)
phpunit tends to execute test case files even if the
file comes with a broken namespace and can't be autoloaded.

The patch hopefully fixes all test case files that are
positioned in a wrong folder, has an otherwise broken
namespace or is not yet registered as psr-4 require-dev.

Resolves: #85169
Releases: master
Change-Id: Id8da485b14ab65a883dd90e1a11cfd8e74d85780
Reviewed-on: https://review.typo3.org/57132
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
54 files changed:
composer.json
typo3/sysext/backend/Tests/Functional/Utility/BackendUtilityTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrideChildTcaTest.php [new file with mode: 0644]
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php [deleted file]
typo3/sysext/backend/Tests/Unit/Form/Utility/FormEngineUtilityTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php
typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php
typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/core/Tests/Unit/DataHandling/Localization/StateTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
typo3/sysext/core/Tests/Unit/Http/MiddlewareDispatcherTest.php
typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
typo3/sysext/core/Tests/Unit/TypoScript/TypoScriptServiceTest.php
typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php
typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php
typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php
typo3/sysext/indexed_search/Tests/Unit/Classes/Example/PluginHookTest.php [deleted file]
typo3/sysext/indexed_search/Tests/Unit/Example/PluginHookTest.php [new file with mode: 0644]
typo3/sysext/opendocs/Tests/Unit/Service/OpenDocumentServiceTest.php
typo3/sysext/opendocs/composer.json
typo3/sysext/redirects/composer.json
typo3/sysext/reports/Tests/Unit/Report/ServicesListReportTest.php
typo3/sysext/setup/Tests/Unit/Controller/SetupModuleControllerTest.php [new file with mode: 0644]
typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php [deleted file]
typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php

index 8300b47..9bed4f1 100644 (file)
                        "TYPO3\\CMS\\IndexedSearch\\Tests\\": "typo3/sysext/indexed_search/Tests/",
                        "TYPO3\\CMS\\Install\\Tests\\": "typo3/sysext/install/Tests/",
                        "TYPO3\\CMS\\Lowlevel\\Tests\\": "typo3/sysext/lowlevel/Tests/",
+                       "TYPO3\\CMS\\Opendocs\\Tests\\": "typo3/sysext/opendocs/Tests/",
+                       "TYPO3\\CMS\\Redirects\\Tests\\": "typo3/sysext/redirects/Tests/",
                        "TYPO3\\CMS\\Recordlist\\Tests\\": "typo3/sysext/recordlist/Tests/",
                        "TYPO3\\CMS\\Reports\\Tests\\": "typo3/sysext/reports/Tests/",
                        "TYPO3\\CMS\\Rsaauth\\Tests\\": "typo3/sysext/rsaauth/Tests/",
                        "TYPO3\\CMS\\Saltedpasswords\\Tests\\": "typo3/sysext/saltedpasswords/Tests/",
                        "TYPO3\\CMS\\Scheduler\\Tests\\": "typo3/sysext/scheduler/Tests/",
+                       "TYPO3\\CMS\\Setup\\Tests\\": "typo3/sysext/setup/Tests/",
                        "TYPO3\\CMS\\SysAction\\Tests\\": "typo3/sysext/sys_action/Tests/",
                        "TYPO3\\CMS\\SysNote\\Tests\\": "typo3/sysext/sys_note/Tests/",
                        "TYPO3\\CMS\\Workspaces\\Tests\\": "typo3/sysext/workspaces/Tests/",
index 121c532..f459293 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Functional\Controller\Page;
+namespace TYPO3\CMS\Backend\Tests\Functional\Utility;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,11 +17,12 @@ namespace TYPO3\CMS\Backend\Tests\Functional\Controller\Page;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\RootlineUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
  * Test case for TYPO3\CMS\Backend\Controller\Page\LocalizationController
  */
-class BackendUtilityTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class BackendUtilityTest extends FunctionalTestCase
 {
     /**
      * Sets up this test case.
index 0dc0e81..79e026f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Unit\Form;
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\Element;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 6be866f..a949395 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace typo3\sysext\backend\Tests\Unit\Form\Element;
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\Element;
 
 /*
  * This file is part of the TYPO3 CMS project.
index abce625..c61738a 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace typo3\sysext\backend\Tests\Unit\Form\Element;
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\Element;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -13,12 +13,14 @@ namespace typo3\sysext\backend\Tests\Unit\Form\Element;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Backend\Form\Element\InputHiddenElement;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Tests for InputHiddenElement Form
  */
-class InputHiddenElementTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class InputHiddenElementTest extends UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrideChildTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrideChildTcaTest.php
new file mode 100644 (file)
index 0000000..16fcd23
--- /dev/null
@@ -0,0 +1,224 @@
+<?php
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
+
+/*
+ * 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!
+ */
+
+use TYPO3\CMS\Backend\Form\FormDataProvider\InlineOverrideChildTca;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Test case
+ */
+class InlineOverrideChildTcaTest extends UnitTestCase
+{
+    /**
+     * @var InlineOverrideChildTca
+     */
+    protected $subject;
+
+    protected function setUp()
+    {
+        $this->subject = new InlineOverrideChildTca();
+    }
+
+    /**
+     * @test
+     */
+    public function addDataOverrulesShowitemByGivenOverrideChildTca()
+    {
+        $input = [
+            'inlineParentConfig' => [
+                'overrideChildTca' => [
+                    'types' => [
+                        'aType' => [
+                            'showitem' => 'keepMe',
+                        ],
+                    ],
+                ],
+            ],
+            'processedTca' => [
+                'types' => [
+                    'aType' => [
+                        'showitem' => 'keepMe, aField',
+                    ],
+                    'bType' => [
+                        'showitem' => 'keepMe, aField',
+                    ],
+                ],
+            ],
+        ];
+
+        $expected = $input;
+        $expected['processedTca']['types']['aType']['showitem'] = 'keepMe';
+
+        $this->assertSame($expected, $this->subject->addData($input));
+    }
+
+    /**
+     * @test
+     */
+    public function addDataAddsTypeShowitemByGivenOverrideChildTca()
+    {
+        $input = [
+            'inlineParentConfig' => [
+                'overrideChildTca' => [
+                    'types' => [
+                        'aType' => [
+                            'showitem' => 'keepMe',
+                        ],
+                        'cType' => [
+                            'showitem' => 'keepMe',
+                        ],
+                    ],
+                ],
+            ],
+            'processedTca' => [
+                'types' => [
+                    'aType' => [
+                        'showitem' => 'keepMe, aField',
+                    ],
+                    'bType' => [
+                        'showitem' => 'keepMe, aField',
+                    ],
+                ],
+            ],
+        ];
+
+        $expected = $input;
+        $expected['processedTca']['types']['aType']['showitem'] = 'keepMe';
+        $expected['processedTca']['types']['cType']['showitem'] = 'keepMe';
+
+        $this->assertSame($expected, $this->subject->addData($input));
+    }
+
+    /**
+     * @test
+     */
+    public function addDataMergesForeignSelectorFieldTcaOverride()
+    {
+        $input = [
+            'inlineParentConfig' => [
+                'foreign_selector' => 'uid_local',
+                'overrideChildTca' => [
+                    'columns' => [
+                        'uid_local' => [
+                            'label' => 'aDifferentLabel',
+                            'config' => [
+                                'aGivenSetting' => 'overrideValue',
+                                'aNewSetting' => 'anotherNewValue',
+                                'appearance' => [
+                                    'elementBrowserType' => 'file',
+                                    'elementBrowserAllowed' => 'jpg,png'
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'processedTca' => [
+                'columns' => [
+                    'uid_local' => [
+                        'label' => 'aLabel',
+                        'config' => [
+                            'aGivenSetting' => 'aValue',
+                            'doNotChangeMe' => 'doNotChangeMe',
+                            'appearance' => [
+                                'elementBrowserType' => 'db',
+                            ],
+                        ],
+                    ]
+                ],
+            ],
+        ];
+
+        $expected = $input;
+        $expected['processedTca']['columns']['uid_local'] = [
+            'label' => 'aDifferentLabel',
+            'config' => [
+                'aGivenSetting' => 'overrideValue',
+                'doNotChangeMe' => 'doNotChangeMe',
+                'appearance' => [
+                    'elementBrowserType' => 'file',
+                    'elementBrowserAllowed' => 'jpg,png',
+                ],
+                'aNewSetting' => 'anotherNewValue',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->subject->addData($input));
+    }
+
+    /**
+     * @test
+     */
+    public function addDataSetsDefaultValueForChildRecordColumn()
+    {
+        $input = [
+            'inlineParentConfig' => [
+                'overrideChildTca' => [
+                    'columns' => [
+                        'aType' => [
+                            'config' => [
+                                'default' => '42',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'processedTca' => [
+                'columns' => [
+                    'aType' => [
+                        'config' => [],
+                    ],
+                ],
+            ],
+        ];
+
+        $expected = $input;
+        $expected['processedTca']['columns']['aType']['config']['default'] = '42';
+
+        $this->assertSame($expected, $this->subject->addData($input));
+    }
+
+    /**
+     * @test
+     */
+    public function addDataThrowsExceptionForRestrictedField()
+    {
+        $input = [
+            'inlineParentConfig' => [
+                'overrideChildTca' => [
+                    'columns' => [
+                        'pid' => [
+                            'config' => [
+                                'default' => '42',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'processedTca' => [
+                'columns' => [
+                    'aType' => [
+                        'config' => [],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionCode(1490371322);
+        $this->subject->addData($input);
+    }
+}
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php
deleted file mode 100644 (file)
index 2a690e4..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-namespace typo3\sysext\backend\Tests\Unit\Form\FormDataProvider;
-
-/*
- * 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!
- */
-
-use TYPO3\CMS\Backend\Form\FormDataProvider\InlineOverrideChildTca;
-
-/**
- * InlineOverrideChildTca Test file
- */
-class InlineOverrrideChildTcaTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
-{
-    /**
-     * @var InlineOverrideChildTca
-     */
-    protected $subject;
-
-    protected function setUp()
-    {
-        $this->subject = new InlineOverrideChildTca();
-    }
-
-    /**
-     * @test
-     */
-    public function addDataOverrulesShowitemByGivenOverrideChildTca()
-    {
-        $input = [
-            'inlineParentConfig' => [
-                'overrideChildTca' => [
-                    'types' => [
-                        'aType' => [
-                            'showitem' => 'keepMe',
-                        ],
-                    ],
-                ],
-            ],
-            'processedTca' => [
-                'types' => [
-                    'aType' => [
-                        'showitem' => 'keepMe, aField',
-                    ],
-                    'bType' => [
-                        'showitem' => 'keepMe, aField',
-                    ],
-                ],
-            ],
-        ];
-
-        $expected = $input;
-        $expected['processedTca']['types']['aType']['showitem'] = 'keepMe';
-
-        $this->assertSame($expected, $this->subject->addData($input));
-    }
-
-    /**
-     * @test
-     */
-    public function addDataAddsTypeShowitemByGivenOverrideChildTca()
-    {
-        $input = [
-            'inlineParentConfig' => [
-                'overrideChildTca' => [
-                    'types' => [
-                        'aType' => [
-                            'showitem' => 'keepMe',
-                        ],
-                        'cType' => [
-                            'showitem' => 'keepMe',
-                        ],
-                    ],
-                ],
-            ],
-            'processedTca' => [
-                'types' => [
-                    'aType' => [
-                        'showitem' => 'keepMe, aField',
-                    ],
-                    'bType' => [
-                        'showitem' => 'keepMe, aField',
-                    ],
-                ],
-            ],
-        ];
-
-        $expected = $input;
-        $expected['processedTca']['types']['aType']['showitem'] = 'keepMe';
-        $expected['processedTca']['types']['cType']['showitem'] = 'keepMe';
-
-        $this->assertSame($expected, $this->subject->addData($input));
-    }
-
-    /**
-     * @test
-     */
-    public function addDataMergesForeignSelectorFieldTcaOverride()
-    {
-        $input = [
-            'inlineParentConfig' => [
-                'foreign_selector' => 'uid_local',
-                'overrideChildTca' => [
-                    'columns' => [
-                        'uid_local' => [
-                            'label' => 'aDifferentLabel',
-                            'config' => [
-                                'aGivenSetting' => 'overrideValue',
-                                'aNewSetting' => 'anotherNewValue',
-                                'appearance' => [
-                                    'elementBrowserType' => 'file',
-                                    'elementBrowserAllowed' => 'jpg,png'
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'processedTca' => [
-                'columns' => [
-                    'uid_local' => [
-                        'label' => 'aLabel',
-                        'config' => [
-                            'aGivenSetting' => 'aValue',
-                            'doNotChangeMe' => 'doNotChangeMe',
-                            'appearance' => [
-                                'elementBrowserType' => 'db',
-                            ],
-                        ],
-                    ]
-                ],
-            ],
-        ];
-
-        $expected = $input;
-        $expected['processedTca']['columns']['uid_local'] = [
-            'label' => 'aDifferentLabel',
-            'config' => [
-                'aGivenSetting' => 'overrideValue',
-                'doNotChangeMe' => 'doNotChangeMe',
-                'appearance' => [
-                    'elementBrowserType' => 'file',
-                    'elementBrowserAllowed' => 'jpg,png',
-                ],
-                'aNewSetting' => 'anotherNewValue',
-            ],
-        ];
-
-        $this->assertSame($expected, $this->subject->addData($input));
-    }
-
-    /**
-     * @test
-     */
-    public function addDataSetsDefaultValueForChildRecordColumn()
-    {
-        $input = [
-            'inlineParentConfig' => [
-                'overrideChildTca' => [
-                    'columns' => [
-                        'aType' => [
-                            'config' => [
-                                'default' => '42',
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'processedTca' => [
-                'columns' => [
-                    'aType' => [
-                        'config' => [],
-                    ],
-                ],
-            ],
-        ];
-
-        $expected = $input;
-        $expected['processedTca']['columns']['aType']['config']['default'] = '42';
-
-        $this->assertSame($expected, $this->subject->addData($input));
-    }
-
-    /**
-     * @test
-     */
-    public function addDataThrowsExceptionForRestrictedField()
-    {
-        $input = [
-            'inlineParentConfig' => [
-                'overrideChildTca' => [
-                    'columns' => [
-                        'pid' => [
-                            'config' => [
-                                'default' => '42',
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'processedTca' => [
-                'columns' => [
-                    'aType' => [
-                        'config' => [],
-                    ],
-                ],
-            ],
-        ];
-
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionCode(1490371322);
-        $this->subject->addData($input);
-    }
-}
index a324682..b339811 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\Utility;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -15,11 +15,12 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
  */
 
 use TYPO3\CMS\Backend\Form\Utility\FormEngineUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
  */
-class FormEngineUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class FormEngineUtilityTest extends UnitTestCase
 {
     /**
      * @test
index 68e0d2b..e4f15af 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components\Buttons;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components\Button;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 365fe4b..010ac15 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components\Buttons;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components\Button;
 
 /*
  * This file is part of the TYPO3 CMS project.
index ef7200c..4473639 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components\Buttons;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components\Button;
 
 /*
  * This file is part of the TYPO3 CMS project.
index c922a6c..e7119a9 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components\Buttons;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components\Button;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 358bb4d..4e9dda3 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components\Menu;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components\Menu;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 7da3c26..7321476 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Backend\Tests\Template\Components;
+namespace TYPO3\CMS\Backend\Tests\Unit\Template\Components;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -16,11 +16,12 @@ namespace TYPO3\CMS\Backend\Tests\Template\Components;
 
 use TYPO3\CMS\Backend\Template\Components\Menu\Menu;
 use TYPO3\CMS\Backend\Template\Components\MenuRegistry;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case for Menu
  */
-class MenuTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class MenuTest extends UnitTestCase
 {
     /**
      * Try setting an empty menu
index b03153a..077e31a 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class BackendGroupsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class BackendGroupsVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $backendGroupsFields = [
         'hidden',
index 3ef3704..cc6b7e8 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class BackendUsersVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class BackendUsersVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $backendUserFields = [
         'disable',
index 5272c9b..24574c1 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class CategoryVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class CategoryVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $categoryFields = [
         'title',
index d603fae..17b7c17 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class CollectionVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class CollectionVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $collectionFields = [
         'title',
index 8672aef..f615fd3 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class FileCollectionVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class FileCollectionVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $fileCollectionFields = [
         'title',
index f0d76d0..963484f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class FileMetadataVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $fileMetadataFields = [
         'title',
index 178449e..02136bb 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class FileStorageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class FileStorageVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $fileStorageFields = [
         'name',
index f67d222..66ea276 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class FilemountsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class FilemountsVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $filemountsFields = [
         'title',
index 3c2d8f7..a8f0212 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class LanguageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class LanguageVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $languageFields = [
         'title',
index d488550..7c7cdb6 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class NewsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class NewsVisibleFieldsTest extends FunctionalTestCase
 {
     protected static $newsFields = [
         'hidden',
index 3a3608c..c06263d 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Core\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -18,8 +18,9 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class PagesVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class PagesVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * These form fields a visisble in the default page types.
index ee0706e..4e38561 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TYPO3\CMS\Core\Tests\Unit\Core\Charset;
+namespace TYPO3\CMS\Core\Tests\Unit\Charset;
 
 /*
  * This file is part of the TYPO3 CMS project.
index d98f98e..4f789a2 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types = 1);
-namespace TYPO3\CMS\Core\Tests\Functional\Command;
+namespace TYPO3\CMS\Core\Tests\Unit\Command;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Mail\Mailer;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
- * Testcase for the TYPO3\CMS\Core\Command\SendEmailCommand class.
+ * Test case
  */
 class SendEmailCommandTest extends UnitTestCase
 {
index 3349da2..e0a76dd 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\DataHandler;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -24,11 +24,12 @@ use TYPO3\CMS\Core\Tests\Unit\DataHandling\Fixtures\AllowAccessHookFixture;
 use TYPO3\CMS\Core\Tests\Unit\DataHandling\Fixtures\InvalidHookFixture;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
  */
-class DataHandlerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class DataHandlerTest extends UnitTestCase
 {
     /**
      * Subject is not notice free, disable E_NOTICES
index 3092146..2f625fa 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-namespace TYPO3\CMS\Core\Tests\Unit\DataHandler\Localization;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\Localization;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 10ff586..b4ca39a 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types = 1);
-namespace TYPO3\CMS\Core\Tests\Unit\Database\Query;
+namespace TYPO3\CMS\Core\Tests\Unit\Database\Query\Expression;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -22,8 +22,12 @@ use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\Query\Expression\CompositeExpression;
 use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-class ExpressionBuilderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+/**
+ * Test case
+ */
+class ExpressionBuilderTest extends UnitTestCase
 {
     /**
      * @var Connection
index abc8376..c3648bf 100644 (file)
@@ -23,11 +23,12 @@ use TYPO3\CMS\Core\Http\MiddlewareDispatcher;
 use TYPO3\CMS\Core\Http\Response;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Tests\Unit\Http\Fixtures\MiddlewareFixture;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
  */
-class MiddlewareDispatcherTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class MiddlewareDispatcherTest extends UnitTestCase
 {
     /**
      * @test
index 2ea1121..6098e62 100644 (file)
@@ -18,11 +18,12 @@ use PHPUnit\Framework\SkippedTestError;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Locking\SimpleLockStrategy;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
- * Testcase for \TYPO3\CMS\Core\Locking\SimpleLockStrategy
+ * Test case
  */
-class SimpleLockStrategyTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class SimpleLockStrategyTest extends UnitTestCase
 {
     /**
      * @test
index e72b8d7..043dda8 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
+namespace TYPO3\CMS\Core\Tests\Unit\Messaging\Renderer;
 
 /*
  * This file is part of the TYPO3 CMS project.
index d1cedf1..564b616 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
+namespace TYPO3\CMS\Core\Tests\Unit\Messaging\Renderer;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 55c16b1..7c4c581 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
+namespace TYPO3\CMS\Core\Tests\Unit\Messaging\Renderer;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 955cbc8..7859282 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Service;
+namespace TYPO3\CMS\Core\Tests\Unit\TypoScript;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -15,11 +15,12 @@ namespace TYPO3\CMS\Core\Tests\Unit\Service;
  */
 
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
  */
-class TypoScriptServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class TypoScriptServiceTest extends UnitTestCase
 {
     /**
      * Subject is not notice free, disable E_NOTICES
index 6558525..f9cf8a1 100644 (file)
@@ -1,4 +1,5 @@
 <?php
+namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 
 /*
  * This file is part of the TYPO3 CMS project.
  */
 
 use TYPO3\CMS\Core\Utility\CsvUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test cases of CsvUtility
  */
-class CsvUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class CsvUtilityTest extends UnitTestCase
 {
     /**
      * @return array
index fb08187..176b9da 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Filemetadata\Tests\Unit\Tca;
+namespace TYPO3\CMS\Filemetadata\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -18,8 +18,9 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class FileMetadataVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * @var array
index 8e17139..50cf50f 100644 (file)
@@ -1,9 +1,23 @@
 <?php
-namespace TYPO3\Fluid\Tests\Functional;
+namespace TYPO3\CMS\Fluid\Tests\Functional;
+
+/*
+ * 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!
+ */
 
 use TYPO3\CMS\Fluid\View\StandaloneView;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class EscapeChildrenRenderingStandaloneTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class EscapeChildrenRenderingStandaloneTest extends FunctionalTestCase
 {
     protected $testExtensionsToLoad = ['typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test'];
 
index b002a56..28d27bf 100644 (file)
@@ -1,9 +1,23 @@
 <?php
-namespace TYPO3\Fluid\Tests\Functional;
+namespace TYPO3\CMS\Fluid\Tests\Functional;
+
+/*
+ * 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!
+ */
 
 use TYPO3\CMS\Fluid\View\TemplateView;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class EscapeChildrenRenderingTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class EscapeChildrenRenderingTest extends FunctionalTestCase
 {
     protected $testExtensionsToLoad = ['typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test'];
 
index f055cda..a828bf3 100644 (file)
@@ -1,5 +1,18 @@
 <?php
-namespace TYPO3\Fluid\Tests\Functional\View;
+namespace TYPO3\CMS\Fluid\Tests\Functional\View;
+
+/*
+ * 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!
+ */
 
 use PHPUnit\Util\PHP\AbstractPhpProcess;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
index 7c570fa..1710809 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Core\Tests\Unit\Tca;
+namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -18,8 +18,9 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class PagesLanguageOverlayVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class PagesLanguageOverlayVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * These form fields a visisble in the default page types.
index f6204e7..339d3de 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\IndexedSearch\Tests\Unit\Utility;
+namespace TYPO3\CMS\IndexedSearch\Tests\Functional\Utility;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -13,15 +13,17 @@ namespace TYPO3\CMS\IndexedSearch\Tests\Unit\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\IndexedSearch\Utility\LikeWildcard;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
  * This class contains unit tests for the LikeQueryUtility
  */
-class LikeWildcardTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class LikeWildcardTest extends FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/indexed_search/Tests/Unit/Classes/Example/PluginHookTest.php b/typo3/sysext/indexed_search/Tests/Unit/Classes/Example/PluginHookTest.php
deleted file mode 100644 (file)
index 8c5e215..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace TYPO3\CMS\IndexedSearch\Tests\Unit;
-
-/*
- * 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!
- */
-
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\IndexedSearch\Example\PluginHook;
-use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
-
-/**
- * This class contains unit tests for the indexer
- */
-class PluginHookTest extends UnitTestCase
-{
-    /**
-     * @var array A backup of registered singleton instances
-     */
-    protected $singletonInstances = [];
-
-    /**
-     * Indexer instance
-     *
-     * @var \TYPO3\CMS\IndexedSearch\Example\PluginHook
-     */
-    protected $subject;
-
-    /**
-     * Sets up the test
-     */
-    protected function setUp()
-    {
-        $this->singletonInstances = GeneralUtility::getSingletonInstances();
-        $this->subject = new PluginHook();
-    }
-
-    /**
-     * @test
-     */
-    public function getDisplayResults_postProcReturnsTheOriginalSearchResultBecauseOfMissingItems()
-    {
-        $searchResult = [
-            'count' => 0,
-            'rows' => []
-        ];
-
-        $result = $this->subject->getDisplayResults_postProc($searchResult);
-        self::assertSame($searchResult, $result);
-    }
-
-    /**
-     * @test
-     */
-    public function getDisplayResults_postProcModifiesTheDescriptionInARowOfSearchResult()
-    {
-        $searchResult = [
-            'count' => 2,
-            'rows' => [
-                ['description' => 'I am a description field with joe and foo.'],
-                ['description' => 'Description will be modified to two bar. foo, bar, joe. ']
-            ]
-        ];
-
-        $expected = [
-            'count' => 2,
-            'rows' => [
-                ['description' => 'I am a description field with joe and bar.'],
-                ['description' => 'Description will be modified to two bar. bar, bar, joe. ']
-            ]
-        ];
-
-        $result = $this->subject->getDisplayResults_postProc($searchResult);
-        self::assertSame($expected, $result);
-    }
-
-    /**
-     * Tear down the tests
-     */
-    protected function tearDown()
-    {
-        GeneralUtility::resetSingletonInstances($this->singletonInstances);
-        unset($this->subject);
-        parent::tearDown();
-    }
-}
diff --git a/typo3/sysext/indexed_search/Tests/Unit/Example/PluginHookTest.php b/typo3/sysext/indexed_search/Tests/Unit/Example/PluginHookTest.php
new file mode 100644 (file)
index 0000000..a8f70fb
--- /dev/null
@@ -0,0 +1,96 @@
+<?php
+
+namespace TYPO3\CMS\IndexedSearch\Tests\Unit\Example;
+
+/*
+ * 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!
+ */
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\IndexedSearch\Example\PluginHook;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * This class contains unit tests for the indexer
+ */
+class PluginHookTest extends UnitTestCase
+{
+    /**
+     * @var array A backup of registered singleton instances
+     */
+    protected $singletonInstances = [];
+
+    /**
+     * Indexer instance
+     *
+     * @var \TYPO3\CMS\IndexedSearch\Example\PluginHook
+     */
+    protected $subject;
+
+    /**
+     * Sets up the test
+     */
+    protected function setUp()
+    {
+        $this->singletonInstances = GeneralUtility::getSingletonInstances();
+        $this->subject = new PluginHook();
+    }
+
+    /**
+     * @test
+     */
+    public function getDisplayResults_postProcReturnsTheOriginalSearchResultBecauseOfMissingItems()
+    {
+        $searchResult = [
+            'count' => 0,
+            'rows' => []
+        ];
+
+        $result = $this->subject->getDisplayResults_postProc($searchResult);
+        self::assertSame($searchResult, $result);
+    }
+
+    /**
+     * @test
+     */
+    public function getDisplayResults_postProcModifiesTheDescriptionInARowOfSearchResult()
+    {
+        $searchResult = [
+            'count' => 2,
+            'rows' => [
+                ['description' => 'I am a description field with joe and foo.'],
+                ['description' => 'Description will be modified to two bar. foo, bar, joe. ']
+            ]
+        ];
+
+        $expected = [
+            'count' => 2,
+            'rows' => [
+                ['description' => 'I am a description field with joe and bar.'],
+                ['description' => 'Description will be modified to two bar. bar, bar, joe. ']
+            ]
+        ];
+
+        $result = $this->subject->getDisplayResults_postProc($searchResult);
+        self::assertSame($expected, $result);
+    }
+
+    /**
+     * Tear down the tests
+     */
+    protected function tearDown()
+    {
+        GeneralUtility::resetSingletonInstances($this->singletonInstances);
+        unset($this->subject);
+        parent::tearDown();
+    }
+}
index 13b5a65..9a5deae 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types = 1);
-namespace TYPO3\Opendocs\Tests\Unit\Service;
+namespace TYPO3\CMS\Opendocs\Tests\Unit\Service;
 
 /*
  * This file is part of the TYPO3 CMS project.
index 91164a2..8c71be3 100644 (file)
                "psr-4": {
                        "TYPO3\\CMS\\Opendocs\\": "Classes/"
                }
+       },
+       "autoload-dev": {
+               "psr-4": {
+                       "TYPO3\\CMS\\Opendocs\\Tests\\": "Tests/"
+               }
        }
 }
index e2dc856..d58f151 100644 (file)
                "psr-4": {
                        "TYPO3\\CMS\\Redirects\\": "Classes/"
                }
+       },
+       "autoload-dev": {
+               "psr-4": {
+                       "TYPO3\\CMS\\Redirects\\Tests\\": "Tests/"
+               }
        }
 }
index a242603..3b93a1a 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types = 1);
-namespace TYPO3\Reports\Tests\Unit\Report;
+namespace TYPO3\CMS\Reports\Tests\Unit\Report;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -23,11 +23,12 @@ use TYPO3\CMS\Extbase\Mvc\Request;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Reports\Controller\ReportController;
 use TYPO3\CMS\Reports\Report\ServicesListReport;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
- * Test case for class ServicesListReport
+ * Test case
  */
-class ServicesListReportTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class ServicesListReportTest extends UnitTestCase
 {
     /**
      * @var ServicesListReport
diff --git a/typo3/sysext/setup/Tests/Unit/Controller/SetupModuleControllerTest.php b/typo3/sysext/setup/Tests/Unit/Controller/SetupModuleControllerTest.php
new file mode 100644 (file)
index 0000000..82b38c5
--- /dev/null
@@ -0,0 +1,184 @@
+<?php
+namespace TYPO3\CMS\Setup\Tests\Unit\Controller;
+
+/*
+ * 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!
+ */
+
+use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Setup\Controller\SetupModuleController;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Test case
+ */
+class SetupModuleControllerTest extends UnitTestCase
+{
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessagesIfSetupIsUpdated()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+        $setupModuleControllerMock->_set('setupIsUpdated', true);
+
+        $setupModuleControllerMock
+            ->expects($this->atMost(2))
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['setupWasUpdated', 'UserSettings'],
+                ['activateChanges', '']
+            );
+
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessageIfSettingsAreResetToDefault()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+        $setupModuleControllerMock->_set('settingsAreResetToDefault', true);
+
+        $setupModuleControllerMock
+            ->expects($this->atMost(2))
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['settingsAreReset', 'resetConfiguration'],
+                ['activateChanges', '']
+            );
+
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessageIfPasswordWasSuccessfullyUpdated()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
+        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_UPDATED);
+
+        $setupModuleControllerMock
+            ->expects($this->once())
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['newPassword_ok', 'newPassword']
+            );
+
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessageIfOldPasswordWasWrong()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
+        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_OLD_WRONG);
+
+        $setupModuleControllerMock
+            ->expects($this->once())
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['oldPassword_failed', 'newPassword']
+            );
+
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessageIfPasswordsNotTheSame()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
+        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_NOT_THE_SAME);
+
+        $setupModuleControllerMock
+            ->expects($this->once())
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['newPassword_failed', 'newPassword']
+            );
+
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+
+    /**
+     * @test
+     */
+    public function addFlashMessagesAddsMessagesToQueue()
+    {
+        $setupModuleControllerMock = $this->getAccessibleMock(
+            SetupModuleController::class,
+            ['getFlashMessage', 'enqueueFlashMessages'],
+            [],
+            '',
+            false
+        );
+
+        $setupModuleControllerMock->_set('settingsAreResetToDefault', true);
+        $flashMessage1 = new FlashMessage('foo', 'bar');
+        $flashMessage2 = new FlashMessage('bar', 'foo');
+        $setupModuleControllerMock
+            ->expects($this->atMost(2))
+            ->method('getFlashMessage')
+            ->withConsecutive(
+                ['settingsAreReset', 'resetConfiguration'],
+                ['activateChanges', '']
+            )->willReturnOnConsecutiveCalls(
+                $flashMessage1,
+                $flashMessage2
+            );
+
+        $setupModuleControllerMock
+            ->expects($this->once())
+            ->method('enqueueFlashMessages')
+            ->with([$flashMessage1, $flashMessage2]);
+        $setupModuleControllerMock->_call('addFlashMessages');
+    }
+}
diff --git a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
deleted file mode 100644 (file)
index 65c8316..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-namespace TYPO3\CMS\Setup\Tests\Unit\Controller;
-
-/*
- * 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!
- */
-
-use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Setup\Controller\SetupModuleController;
-
-/**
- * Class SetupModuleControllerTest
- */
-class SetupModuleControllerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
-{
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessagesIfSetupIsUpdated()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-        $setupModuleControllerMock->_set('setupIsUpdated', true);
-
-        $setupModuleControllerMock
-            ->expects($this->atMost(2))
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['setupWasUpdated', 'UserSettings'],
-                ['activateChanges', '']
-            );
-
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessageIfSettingsAreResetToDefault()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-        $setupModuleControllerMock->_set('settingsAreResetToDefault', true);
-
-        $setupModuleControllerMock
-            ->expects($this->atMost(2))
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['settingsAreReset', 'resetConfiguration'],
-                ['activateChanges', '']
-            );
-
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessageIfPasswordWasSuccessfullyUpdated()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
-        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_UPDATED);
-
-        $setupModuleControllerMock
-            ->expects($this->once())
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['newPassword_ok', 'newPassword']
-            );
-
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessageIfOldPasswordWasWrong()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
-        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_OLD_WRONG);
-
-        $setupModuleControllerMock
-            ->expects($this->once())
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['oldPassword_failed', 'newPassword']
-            );
-
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessageIfPasswordsNotTheSame()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-        $setupModuleControllerMock->_set('passwordIsSubmitted', true);
-        $setupModuleControllerMock->_set('passwordIsUpdated', SetupModuleController::PASSWORD_NOT_THE_SAME);
-
-        $setupModuleControllerMock
-            ->expects($this->once())
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['newPassword_failed', 'newPassword']
-            );
-
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-
-    /**
-     * @test
-     */
-    public function addFlashMessagesAddsMessagesToQueue()
-    {
-        $setupModuleControllerMock = $this->getAccessibleMock(
-            SetupModuleController::class,
-            ['getFlashMessage', 'enqueueFlashMessages'],
-            [],
-            '',
-            false
-        );
-
-        $setupModuleControllerMock->_set('settingsAreResetToDefault', true);
-        $flashMessage1 = new FlashMessage('foo', 'bar');
-        $flashMessage2 = new FlashMessage('bar', 'foo');
-        $setupModuleControllerMock
-            ->expects($this->atMost(2))
-            ->method('getFlashMessage')
-            ->withConsecutive(
-                ['settingsAreReset', 'resetConfiguration'],
-                ['activateChanges', '']
-            )->willReturnOnConsecutiveCalls(
-                $flashMessage1,
-                $flashMessage2
-            );
-
-        $setupModuleControllerMock
-            ->expects($this->once())
-            ->method('enqueueFlashMessages')
-            ->with([$flashMessage1, $flashMessage2]);
-        $setupModuleControllerMock->_call('addFlashMessages');
-    }
-}
index ab6404b..8e9944b 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\SysNote\Tests\Unit\Tca;
+namespace TYPO3\CMS\SysNote\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\SysNote\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class NoteVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class NoteVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * @var array
index 73aaaa7..8de3311 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
+namespace TYPO3\CMS\Workspaces\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class WorkspaceStageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class WorkspaceStageVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * @var array
index 60d8632..07e1dba 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
+namespace TYPO3\CMS\Workspaces\Tests\Functional\Tca;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -17,8 +17,9 @@ namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
-class WorkspaceVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class WorkspaceVisibleFieldsTest extends FunctionalTestCase
 {
     /**
      * @var array