Merge pull request #842 from j0k3r/fix/test-container-services

Change the way to retrieve services during tests
j0k3r · Nov 26, 2021 · cde6921 · cde6921
2 parents 04330e2 + bc9f50f
commit cde6921
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 89 deletions.
diff --git a/config/services_test.yaml b/config/services_test.yaml
diff --git a/tests/Command/FetchItemsCommandTest.php b/tests/Command/FetchItemsCommandTest.php
@@ -4,7 +4,11 @@
 
 use App\Command\FetchItemsCommand;
 use App\Content\Import;
+use App\Improver\ImproverChain;
 use App\Message\FeedSync;
+use App\Parser\ParserChain;
+use App\Repository\FeedRepository;
+use App\Repository\ItemRepository;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -75,46 +79,46 @@ protected function setUp(): void
         $logger->pushHandler($this->handler);
 
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
-        $container->get('app.parser.chain.test')->addParser(
-            $container->get('app.parser.internal.test'),
+        $container->get(ParserChain::class)->addParser(
+            $container->get('feed.parser.internal'),
             'internal'
         );
 
-        $container->get('app.parser.chain.test')->addParser(
-            $container->get('app.parser.external.test'),
+        $container->get(ParserChain::class)->addParser(
+            $container->get('feed.parser.external'),
             'external'
         );
 
-        $container->get('app.improver.chain.test')->addImprover(
-            $container->get('app.improver.default_improver.test'),
+        $container->get(ImproverChain::class)->addImprover(
+            $container->get('feed.improver.default_improver'),
             'default_improver'
         );
 
-        $container->get('app.improver.chain.test')->addImprover(
-            $container->get('app.improver.hackernews.test'),
+        $container->get(ImproverChain::class)->addImprover(
+            $container->get('feed.improver.hackernews'),
             'hackernews'
         );
 
         $import = new Import(
             $simplePieProxy,
-            $container->get('app.content.extractor.test'),
-            $container->get('event_dispatcher.test'),
-            $container->get('em.test'),
+            $container->get(\App\Content\Extractor::class),
+            $container->get('event_dispatcher'),
+            $container->get(\Doctrine\ORM\EntityManagerInterface::class),
             $logger,
-            $container->get('app.repository.feed.test'),
-            $container->get('app.repository.item.test')
+            $container->get(FeedRepository::class),
+            $container->get(ItemRepository::class)
         );
 
         $application = new Application(static::$kernel);
         $application->add(new FetchItemsCommand(
-            $container->get('app.repository.feed.test'),
-            $container->get('app.repository.item.test'),
+            $container->get(FeedRepository::class),
+            $container->get(ItemRepository::class),
             $import,
-            $container->get('router.test'),
+            $container->get('router'),
             'f43.me',
-            self::$kernel->getContainer()->get('messenger.transport.fetch_items.test'),
+            $container->get('messenger.transport.fetch_items'),
             $bus
         ));
 
@@ -181,7 +185,7 @@ public function testOld(): void
     public function testUsingQueue(): void
     {
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
         $bus = $this->getMockBuilder('Symfony\Component\Messenger\MessageBusInterface')
             ->disableOriginalConstructor()
@@ -201,10 +205,10 @@ public function testUsingQueue(): void
 
         $application = new Application(static::$kernel);
         $application->add(new FetchItemsCommand(
-            $container->get('app.repository.feed.test'),
-            $container->get('app.repository.item.test'),
+            $container->get(FeedRepository::class),
+            $container->get(ItemRepository::class),
             null,
-            $container->get('router.test'),
+            $container->get('router'),
             'f43.me',
             new AmqpTransport($connection),
             $bus
@@ -225,7 +229,7 @@ public function testUsingQueue(): void
     public function testCommandSyncAllUsersWithQueueFull(): void
     {
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
         $bus = $this->getMockBuilder('Symfony\Component\Messenger\MessageBusInterface')
             ->disableOriginalConstructor()
@@ -244,10 +248,10 @@ public function testCommandSyncAllUsersWithQueueFull(): void
 
         $application = new Application(static::$kernel);
         $application->add(new FetchItemsCommand(
-            $container->get('app.repository.feed.test'),
-            $container->get('app.repository.item.test'),
+            $container->get(FeedRepository::class),
+            $container->get(ItemRepository::class),
             null,
-            $container->get('router.test'),
+            $container->get('router'),
             'f43.me',
             new AmqpTransport($connection),
             $bus

diff --git a/tests/Command/RemoveItemsCommandTest.php b/tests/Command/RemoveItemsCommandTest.php
@@ -19,13 +19,13 @@ protected function setUp(): void
         static::createClient();
 
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
         $application = new Application(static::$kernel);
         $application->add(new RemoveItemsCommand(
-            $container->get('app.repository.feed.test'),
-            $container->get('app.repository.item.test'),
-            $container->get('em.test')
+            $container->get(\App\Repository\FeedRepository::class),
+            $container->get(\App\Repository\ItemRepository::class),
+            $container->get(\Doctrine\ORM\EntityManagerInterface::class)
         ));
 
         $this->command = $application->find('feed:remove-items');

diff --git a/tests/MessageHandler/FetchItemsHandlerTest.php b/tests/MessageHandler/FetchItemsHandlerTest.php
@@ -17,7 +17,7 @@ public function testProcessNoFeed(): void
         static::createClient();
 
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
         $doctrine = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
             ->disableOriginalConstructor()
@@ -40,7 +40,7 @@ public function testProcessNoFeed(): void
             $doctrine,
             $feedRepository,
             $contentImport,
-            $container->get('router.test'),
+            $container->get('router'),
             new NullLogger(),
             'f43.io'
         );
@@ -53,7 +53,7 @@ public function testProcessSuccessfulMessage(): void
         static::createClient();
 
         /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = self::$kernel->getContainer();
+        $container = self::getContainer();
 
         $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()
@@ -102,7 +102,7 @@ public function testProcessSuccessfulMessage(): void
             $doctrine,
             $feedRepository,
             $contentImport,
-            $container->get('router.test'),
+            $container->get('router'),
             $logger,
             'f43.io'
         );