[All] fix split test

mpoiriert · Jun 28, 2024 · 5a48855 · 5a48855
1 parent f2e4d58
commit 5a48855
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 7 deletions.
diff --git a/packages/application/Tests/DependencyInjection/ConfigurationIntegrationTest.php b/packages/application/Tests/DependencyInjection/ConfigurationIntegrationTest.php
@@ -2,7 +2,6 @@
 
 namespace Draw\Component\Application\Tests\DependencyInjection;
 
-use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
 use Draw\Component\Application\Configuration\DoctrineConfigurationRegistry;
 use Draw\Component\Application\Configuration\Entity\Config;
 use Draw\Component\Application\DependencyInjection\ConfigurationIntegration;
@@ -49,7 +48,7 @@ public function testPrependNoDoctrineExtension(): void
     public function testPrepend(): void
     {
         $containerBuilder = new ContainerBuilder();
-        $containerBuilder->registerExtension(new DoctrineExtension());
+        $containerBuilder->registerExtension($this->mockExtension('doctrine'));
 
         $this->integration->prepend(
             $containerBuilder,

diff --git a/packages/application/Tests/DependencyInjection/SystemMonitoringIntegrationTest.php b/packages/application/Tests/DependencyInjection/SystemMonitoringIntegrationTest.php
@@ -2,7 +2,6 @@
 
 namespace Draw\Component\Application\Tests\DependencyInjection;
 
-use Draw\Bundle\FrameworkExtraBundle\DependencyInjection\DrawFrameworkExtraExtension;
 use Draw\Component\Application\DependencyInjection\SystemMonitoringIntegration;
 use Draw\Component\Application\SystemMonitoring\Action\PingAction;
 use Draw\Component\Application\SystemMonitoring\Bridge\Doctrine\DBALConnectionStatusProvider;
@@ -45,7 +44,7 @@ public function getDefaultConfiguration(): array
     public function testPrepend(): void
     {
         $containerBuilder = new ContainerBuilder();
-        $containerBuilder->registerExtension(new DrawFrameworkExtraExtension());
+        $containerBuilder->registerExtension($this->mockExtension('draw_framework_extra'));
 
         $this->integration->prepend(
             $containerBuilder,

diff --git a/packages/application/composer.json b/packages/application/composer.json
@@ -20,7 +20,8 @@
         "draw/dependency-injection": "^0.11",
         "draw/tester": "^0.11",
         "symfony/cache": "^6.4.0",
-        "symfony/console": "^6.4.0"
+        "symfony/console": "^6.4.0",
+        "symfony/messenger": "^6.4.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/packages/console/Tests/DependencyInjection/ConsoleIntegrationTest.php b/packages/console/Tests/DependencyInjection/ConsoleIntegrationTest.php
@@ -60,7 +60,7 @@ public function testPrependNoDoctrineExtension(): void
     public function testPrepend(): void
     {
         $containerBuilder = new ContainerBuilder();
-        $containerBuilder->registerExtension(new DoctrineExtension());
+        $containerBuilder->registerExtension($this->mockExtension('doctrine'));
 
         $this->integration->prepend(
             $containerBuilder,

diff --git a/packages/dependency-injection/Integration/IntegrationTrait.php b/packages/dependency-injection/Integration/IntegrationTrait.php
@@ -24,6 +24,7 @@ private static function getDefaultExcludedDirectories(): array
             'Resources/',
             'Stamp/',
             'Tests/',
+            'vendor/',
         ];
     }
 

diff --git a/packages/dependency-injection/Integration/Test/IntegrationTestCase.php b/packages/dependency-injection/Integration/Test/IntegrationTestCase.php
@@ -10,6 +10,7 @@
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 abstract class IntegrationTestCase extends TestCase
@@ -24,6 +25,22 @@ abstract public function getDefaultConfiguration(): array;
 
     abstract public static function provideTestLoad(): iterable;
 
+    protected function mockExtension(string $name): ExtensionInterface
+    {
+        $extension = $this->createMock(ExtensionInterface::class);
+
+        $extension->expects(static::any())
+            ->method('getAlias')
+            ->willReturn($name);
+
+        $extension
+            ->expects(static::any())
+            ->method('getNamespace')
+            ->willReturn($name);
+
+        return $extension;
+    }
+
     protected function setUp(): void
     {
         $this->integration = $this->createIntegration();

diff --git a/...ges/dependency-injection/Tests/DependencyInjection/DependencyInjectionIntegrationTest.php b/...ges/dependency-injection/Tests/DependencyInjection/DependencyInjectionIntegrationTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Draw\Component\DependencyInjection\Tests\DependencyInjection;
+
+use Draw\Component\DependencyInjection\DependencyInjection\DependencyInjectionIntegration;
+use Draw\Component\DependencyInjection\Integration\IntegrationInterface;
+use Draw\Component\DependencyInjection\Integration\Test\IntegrationTestCase;
+
+class DependencyInjectionIntegrationTest extends IntegrationTestCase
+{
+    public function createIntegration(): IntegrationInterface
+    {
+        return new DependencyInjectionIntegration();
+    }
+
+    public function getConfigurationSectionName(): string
+    {
+        return 'dependency_injection';
+    }
+
+    public function getDefaultConfiguration(): array
+    {
+        return [];
+    }
+
+    public static function provideTestLoad(): iterable
+    {
+        yield [];
+    }
+}
diff --git a/packages/dependency-injection/composer.json b/packages/dependency-injection/composer.json
@@ -12,7 +12,8 @@
   ],
   "require": {
     "php": ">=8.1",
-    "symfony/config": "^6.4.0"
+    "symfony/config": "^6.4.0",
+    "symfony/dependency-injection": "^6.4.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.0"