From 82f7dc03b6a0e65b6d9954628b220ad608259564 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 27 Aug 2024 14:44:36 +0200
Subject: [PATCH] [TASK] Simplify a ContentObjectRendererTest detail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some setUp() code is not triggered and thus obsolete.
Resolves: #104747
Releases: main
Change-Id: I72099d5d09bf36f83c381f3e12415a73e4190e56
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85791
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Garvin Hicking <gh@faktor-e.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Garvin Hicking <gh@faktor-e.de>
---
.../ContentObjectRendererTest.php | 30 +++++--------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index c27d80bbfcff..0841854bcee8 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -63,13 +63,11 @@ use TYPO3\CMS\Core\TypoScript\Tokenizer\LossyTokenizer;
use TYPO3\CMS\Core\Utility\DebugUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
use TYPO3\CMS\Frontend\Cache\CacheInstruction;
use TYPO3\CMS\Frontend\ContentObject\AbstractContentObject;
use TYPO3\CMS\Frontend\ContentObject\CaseContentObject;
use TYPO3\CMS\Frontend\ContentObject\ContentContentObject;
-use TYPO3\CMS\Frontend\ContentObject\ContentDataProcessor;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectArrayContentObject;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectArrayInternalContentObject;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectFactory;
@@ -89,7 +87,6 @@ use TYPO3\CMS\Frontend\ContentObject\TextContentObject;
use TYPO3\CMS\Frontend\ContentObject\UserContentObject;
use TYPO3\CMS\Frontend\ContentObject\UserInternalContentObject;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Frontend\DataProcessing\DataProcessorRegistry;
use TYPO3\CMS\Frontend\Page\PageInformation;
use TYPO3\CMS\Frontend\Tests\Unit\ContentObject\Fixtures\TestSanitizerBuilder;
use TYPO3\CMS\Frontend\Typolink\LinkFactory;
@@ -161,16 +158,13 @@ final class ContentObjectRendererTest extends UnitTestCase
$request = new ServerRequest();
$this->subject->setRequest($request);
+ // @todo: This thing needs a review and should be refactored away, for instance by putting
+ // whatever is really needed into single tests instead. Also, ContentObjectFactory
+ // needs an overhaul in general.
$contentObjectFactoryMock = $this->createContentObjectFactoryMock();
$cObj = $this->subject;
foreach ($this->contentObjectMap as $name => $className) {
- $contentObjectFactoryMock->addGetContentObjectCallback(
- $name,
- $className,
- $request,
- $cObj,
- $this->getMockBuilder(DataProcessorRegistry::class)->disableOriginalConstructor()->getMock()
- );
+ $contentObjectFactoryMock->addGetContentObjectCallback($name, $className, $request, $cObj);
}
$container = new Container();
$container->set(ContentObjectFactory::class, $contentObjectFactoryMock);
@@ -7389,20 +7383,10 @@ final class ContentObjectRendererTest extends UnitTestCase
/**
* @internal This method is just for testing purpose.
*/
- public function addGetContentObjectCallback(string $name, string $className, ServerRequestInterface $request, ContentObjectRenderer $cObj, MockObject&DataProcessorRegistry $dataProcessorRegistry): void
+ public function addGetContentObjectCallback(string $name, string $className, ServerRequestInterface $request, ContentObjectRenderer $cObj): void
{
- $this->getContentObjectCallbacks[$name] = static function () use ($className, $request, $cObj, $dataProcessorRegistry) {
- if ($className === 'FluidTemplateContentObject') {
- $contentObject = new FluidTemplateContentObject(
- new ContentDataProcessor(
- new Container(),
- $dataProcessorRegistry
- ),
- new StandaloneView()
- );
- } else {
- $contentObject = new $className();
- }
+ $this->getContentObjectCallbacks[$name] = static function () use ($className, $request, $cObj) {
+ $contentObject = new $className();
$contentObject->setRequest($request);
$contentObject->setContentObjectRenderer($cObj);
return $contentObject;
--
GitLab