From 695446e4c955b8c3c9bf1b39cdb973fa70f0687f Mon Sep 17 00:00:00 2001 From: catch Date: Thu, 25 Apr 2024 21:55:53 +0100 Subject: [PATCH] Issue #3443528 by longwave: Change @dataprovider to static in TitleResolverTest (cherry picked from commit a109906ecfe812ba10c4065b634a1308a162c52e) --- .../Tests/Core/Controller/TitleResolverTest.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php index 73e3fe338b9..7ce370711b8 100644 --- a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php @@ -95,24 +95,17 @@ class TitleResolverTest extends UnitTestCase { * Tests a static title with a parameter. * * @see \Drupal\Core\Controller\TitleResolver::getTitle() - * - * @dataProvider providerTestStaticTitleWithParameter */ - public function testStaticTitleWithParameter($title, $expected_title) { + public function testStaticTitleWithParameter() { $raw_variables = new InputBag(['test' => 'value', 'test2' => 'value2']); $request = new Request(); $request->attributes->set('_raw_variables', $raw_variables); - $route = new Route('/test-route', ['_title' => $title]); - $this->assertEquals($expected_title, $this->titleResolver->getTitle($request, $route)); - } + $route = new Route('/test-route', ['_title' => 'static title @test']); + $this->assertEquals(new TranslatableMarkup('static title @test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $this->translationManager), $this->titleResolver->getTitle($request, $route)); - public function providerTestStaticTitleWithParameter() { - $translation_manager = $this->createMock('\Drupal\Core\StringTranslation\TranslationInterface'); - return [ - ['static title @test', new TranslatableMarkup('static title @test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $translation_manager)], - ['static title %test', new TranslatableMarkup('static title %test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $translation_manager)], - ]; + $route = new Route('/test-route', ['_title' => 'static title %test']); + $this->assertEquals(new TranslatableMarkup('static title %test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $this->translationManager), $this->titleResolver->getTitle($request, $route)); } /**