Skip to content

Commit

Permalink
[TASK] Don't use GeneralUtility::getContainer in functional tests
Browse files Browse the repository at this point in the history 
As GeneralUtility::getContainer is marked internal, we do now avoid
to use this method in core tests in order to demonstrate best
practices for third party extensions that may use core tests as
inspiration.

This change requires an update for typo3/testing-framework which now
provides a getContainer() method as API in functional tests:

  composer require --dev typo3/testing-framework:^6.2.5

Releases: master
Resolves: #91363
Change-Id: I844973ddd3355d15c72307ac9533429333a396da
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64456
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Susanne Moog <look@susi.dev>
Reviewed-by: Benni Mack <benni@typo3.org>
  • Loading branch information
@bnf @bmack
bnf authored and bmack committed May 13, 2020
1 parent 1c92d05 commit 3c7867f
Show file tree
Hide file tree
Showing 16 changed files with 99 additions and 109 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Expand Up @@ -89,7 +89,7 @@
"phpstan/phpstan": "^0.12.13",
"rector/rector": "^0.7.14",
"typo3/cms-styleguide": "~10.0.2",
"typo3/testing-framework": "^6.2.4"
"typo3/testing-framework": "^6.2.5"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
Expand Down
13 changes: 7 additions & 6 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
View file
Expand Up @@ -69,7 +69,7 @@
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.13",
"typo3/cms-styleguide": "~10.0.2",
"typo3/testing-framework": "^6.2.4"
"typo3/testing-framework": "^6.2.5"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/extbase/Tests/Functional/Mvc/Validation/ActionControllerValidationTest.php
View file
Expand Up @@ -67,7 +67,7 @@ public function forwardedActionValidatesPreviouslyIgnoredArgumentDataProvider()
*/
public function forwardedActionValidatesPreviouslyIgnoredArgument(array $blogPostArgument, array $trustedProperties, array $expectedErrorCodes)
{
$GLOBALS['LANG'] = GeneralUtility::getContainer()->get(LanguageService::class);
$GLOBALS['LANG'] = $this->getContainer()->get(LanguageService::class);
$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 'testkey';

$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
Expand Down Expand Up @@ -115,7 +115,7 @@ public function forwardedActionValidatesPreviouslyIgnoredArgument(array $blogPos
*/
public function validationResultsAreProvidedForTheSameObjectInDifferentArguments()
{
$GLOBALS['LANG'] = GeneralUtility::getContainer()->get(LanguageService::class);
$GLOBALS['LANG'] = $this->getContainer()->get(LanguageService::class);
$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 'testkey';

$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
Expand Down
40 changes: 20 additions & 20 deletions typo3/sysext/extbase/Tests/Functional/Mvc/Web/RequestBuilderTest.php
View file
Expand Up @@ -57,7 +57,7 @@ public function buildBuildsARequestInterfaceObject()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -89,7 +89,7 @@ public function loadDefaultValuesOverridesFormatIfConfigured()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -122,7 +122,7 @@ public function buildOverridesFormatIfSetInGetParameters()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand All @@ -138,7 +138,7 @@ public function loadDefaultValuesThrowsExceptionIfExtensionNameIsNotProperlyConf
static::expectExceptionCode(1289843275);
static::expectExceptionMessage('"extensionName" is not properly configured. Request can\'t be dispatched!');

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand All @@ -155,7 +155,7 @@ public function loadDefaultValuesThrowsExceptionIfPluginNameIsNotProperlyConfigu
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration(['extensionName' => 'blog_example']);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -191,7 +191,7 @@ public function untangleFilesArrayDetectsASingleUploadedFile()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -248,7 +248,7 @@ public function untangleFilesArrayDetectsMultipleUploadedFile()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -300,7 +300,7 @@ public function resolveControllerClassNameThrowsInvalidControllerNameExceptionIf
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -335,7 +335,7 @@ public function resolveControllerClassNameThrowsPageNotFoundException()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand All @@ -359,7 +359,7 @@ public function resolveControllerClassNameThrowsAnExceptionIfTheDefaultControlle
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -390,7 +390,7 @@ public function resolveControllerClassNameReturnsDefaultControllerIfCallDefaultA
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -432,7 +432,7 @@ public function resolveControllerClassNameReturnsControllerDefinedViaParametersI
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -469,7 +469,7 @@ public function resolveActionNameThrowsInvalidActionNameExceptionIfNonExistentAc
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -504,7 +504,7 @@ public function resolveActionNameThrowsPageNotFoundException()
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -535,7 +535,7 @@ public function resolveActionNameReturnsDefaultActionIfCallDefaultActionIfAction
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -570,7 +570,7 @@ public function resolveActionNameReturnsActionDefinedViaParametersIfActionIsConf
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -604,7 +604,7 @@ public function resolveActionNameThrowsAnExceptionIfTheDefaultActionCannotBeDete
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$requestBuilder->build();
}

Expand Down Expand Up @@ -638,7 +638,7 @@ public function resolveActionNameReturnsActionDefinedViaParametersOfServerReques
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -677,7 +677,7 @@ public function resolveActionNameReturnsActionDefinedViaPageArgumentOfServerRequ
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down Expand Up @@ -714,7 +714,7 @@ public function resolveActionNameReturnsActionDefinedViaParsedBodyOfServerReques
$configurationManager = GeneralUtility::makeInstance(ObjectManager::class)->get(ConfigurationManagerInterface::class);
$configurationManager->setConfiguration($configuration);

$requestBuilder = GeneralUtility::getContainer()->get(RequestBuilder::class);
$requestBuilder = $this->getContainer()->get(RequestBuilder::class);
$request = $requestBuilder->build();

self::assertInstanceOf(RequestInterface::class, $request);
Expand Down

0 comments on commit 3c7867f

Please sign in to comment.