diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php index 0d004a2ef1663ad6c812fdb4283ce9e4b7518b4d..b7e5a3f6d8e27cb32ebf98ca3834f15cec5a48d4 100644 --- a/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php +++ b/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php @@ -47,17 +47,24 @@ protected function setUp(): void { /** * Tests if the module configure routes exists. - * - * @dataProvider coreModuleListDataProvider */ - public function testModuleConfigureRoutes(string $module_name): void { + public function testModuleConfigureRoutes(): void { + foreach (static::coreModuleListDataProvider() as $module_name => $info) { + $this->doTestModuleConfigureRoutes($module_name); + } + } + + /** + * Checks the configure route for a single module. + */ + protected function doTestModuleConfigureRoutes(string $module_name): void { $module_info = $this->moduleInfo[$module_name]->info; if (!isset($module_info['configure'])) { - $this->markTestSkipped("$module_name has no configure route"); + return; } $module_lifecycle = $module_info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]; if (isset($module_lifecycle) && $module_lifecycle === ExtensionLifecycle::DEPRECATED) { - $this->markTestSkipped("$module_name is $module_lifecycle"); + return; } $this->container->get('module_installer')->install([$module_name]); $this->assertModuleConfigureRoutesExist($module_name, $module_info); @@ -70,17 +77,24 @@ public function testModuleConfigureRoutes(string $module_name): void { * deprecated module doesn't trigger a deprecation notice. * * @group legacy - * - * @dataProvider coreModuleListDataProvider */ - public function testDeprecatedModuleConfigureRoutes(string $module_name): void { + public function testDeprecatedModuleConfigureRoutes(): void { + foreach (static::coreModuleListDataProvider() as $module_name => $info) { + $this->doTestDeprecatedModuleConfigureRoutes($module_name); + } + } + + /** + * Check the configure route for a single module. + */ + protected function doTestDeprecatedModuleConfigureRoutes(string $module_name): void { $module_info = $this->moduleInfo[$module_name]->info; if (!isset($module_info['configure'])) { - $this->markTestSkipped("$module_name has no configure route"); + return; } $module_lifecycle = $module_info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]; if (isset($module_lifecycle) && $module_lifecycle !== ExtensionLifecycle::DEPRECATED) { - $this->markTestSkipped("$module_name is not $module_lifecycle"); + return; } $this->container->get('module_installer')->install([$module_name]); $this->assertModuleConfigureRoutesExist($module_name, $module_info);