[consumption] fix onStart extension tests.

makasim · makasim · commit 52c4cb9ea856 · 2018-10-05T10:34:47.000+03:00
diff --git a/pkg/enqueue/Client/ConsumptionExtension/SetupBrokerExtension.php b/pkg/enqueue/Client/ConsumptionExtension/SetupBrokerExtension.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Client\ConsumptionExtension;
 
 use Enqueue\Client\DriverInterface;
-use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\EmptyExtensionTrait;
 use Enqueue\Consumption\ExtensionInterface;
 
@@ -30,10 +30,7 @@ public function __construct(DriverInterface $driver)
         $this->isDone = false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function onStart(Context $context)
+    public function onStart(Start $context): void
     {
         if (false == $this->isDone) {
             $this->isDone = true;
diff --git a/pkg/enqueue/Consumption/Extension/LoggerExtension.php b/pkg/enqueue/Consumption/Extension/LoggerExtension.php
@@ -3,11 +3,13 @@
 namespace Enqueue\Consumption\Extension;
 
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\EmptyExtensionTrait;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
 use Interop\Queue\Message as InteropMessage;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 class LoggerExtension implements ExtensionInterface
 {
@@ -26,19 +28,16 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function onStart(Context $context)
+    public function onStart(Start $context): void
     {
-        if ($context->getLogger()) {
+        if ($context->getLogger() && false == $context->getLogger() instanceof NullLogger) {
             $context->getLogger()->debug(sprintf(
                 'Skip setting context\'s logger "%s". Another one "%s" has already been set.',
                 get_class($this->logger),
                 get_class($context->getLogger())
             ));
         } else {
-            $context->setLogger($this->logger);
+            $context->changeLogger($this->logger);
             $this->logger->debug(sprintf('Set context\'s logger "%s"', get_class($this->logger)));
         }
     }
diff --git a/pkg/enqueue/Consumption/Extension/NicenessExtension.php b/pkg/enqueue/Consumption/Extension/NicenessExtension.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Consumption\Extension;
 
-use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\EmptyExtensionTrait;
 use Enqueue\Consumption\ExtensionInterface;
 
@@ -32,10 +32,7 @@ public function __construct($niceness)
         $this->niceness = $niceness;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function onStart(Context $context)
+    public function onStart(Start $context): void
     {
         if (0 !== $this->niceness) {
             $changed = @proc_nice($this->niceness);
diff --git a/pkg/enqueue/Consumption/Extension/SignalExtension.php b/pkg/enqueue/Consumption/Extension/SignalExtension.php
@@ -3,6 +3,7 @@
 namespace Enqueue\Consumption\Extension;
 
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\EmptyExtensionTrait;
 use Enqueue\Consumption\Exception\LogicException;
 use Enqueue\Consumption\ExtensionInterface;
@@ -22,10 +23,7 @@ class SignalExtension implements ExtensionInterface
      */
     protected $logger;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function onStart(Context $context)
+    public function onStart(Start $context): void
     {
         if (false == extension_loaded('pcntl')) {
             throw new LogicException('The pcntl extension is required in order to catch signals.');
diff --git a/pkg/enqueue/Symfony/Consumption/QueueConsumerOptionsCommandTrait.php b/pkg/enqueue/Symfony/Consumption/QueueConsumerOptionsCommandTrait.php
@@ -26,11 +26,11 @@ protected function configureQueueConsumerOptions()
     protected function setQueueConsumerOptions(QueueConsumerInterface $consumer, InputInterface $input)
     {
         if (null !== $idleTimeout = $input->getOption('idle-time')) {
-            $consumer->setIdleTime((float) $idleTimeout);
+            $consumer->setIdleTime((int) $idleTimeout);
         }
 
         if (null !== $receiveTimeout = $input->getOption('receive-timeout')) {
-            $consumer->setReceiveTimeout((float) $receiveTimeout);
+            $consumer->setReceiveTimeout((int) $receiveTimeout);
         }
     }
 }
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/FlushSpoolProducerExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/FlushSpoolProducerExtensionTest.php
@@ -5,9 +5,11 @@
 use Enqueue\Client\ConsumptionExtension\FlushSpoolProducerExtension;
 use Enqueue\Client\SpoolProducer;
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 
 class FlushSpoolProducerExtensionTest extends TestCase
 {
@@ -32,7 +34,9 @@ public function testShouldDoNothingOnStart()
         ;
 
         $extension = new FlushSpoolProducerExtension($producer);
-        $extension->onStart($this->createContextMock());
+        $extension->onStart(
+            new Start($this->createMock(\Interop\Queue\Context::class), new NullLogger(), [], 0, 0, 0)
+        );
     }
 
     public function testShouldDoNothingOnBeforeReceive()
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\Client\ConsumptionExtension\SetupBrokerExtension;
 use Enqueue\Client\DriverInterface;
-use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Queue\Context as InteropContext;
@@ -36,8 +36,7 @@ public function testShouldSetupBroker()
             ->with($this->identicalTo($logger))
         ;
 
-        $context = new Context($this->createMock(InteropContext::class));
-        $context->setLogger($logger);
+        $context = new Start($this->createMock(InteropContext::class), $logger, [], 0, 0, 0);
 
         $extension = new SetupBrokerExtension($driver);
         $extension->onStart($context);
@@ -54,8 +53,7 @@ public function testShouldSetupBrokerOnlyOnce()
             ->with($this->identicalTo($logger))
         ;
 
-        $context = new Context($this->createMock(InteropContext::class));
-        $context->setLogger($logger);
+        $context = new Start($this->createMock(InteropContext::class), $logger, [], 0, 0, 0);
 
         $extension = new SetupBrokerExtension($driver);
         $extension->onStart($context);
diff --git a/pkg/enqueue/Tests/Consumption/ChainExtensionTest.php b/pkg/enqueue/Tests/Consumption/ChainExtensionTest.php
@@ -4,9 +4,11 @@
 
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 class ChainExtensionTest extends TestCase
 {
@@ -24,7 +26,7 @@ public function testCouldBeConstructedWithExtensionsArray()
 
     public function testShouldProxyOnStartToAllInternalExtensions()
     {
-        $context = $this->createContextMock();
+        $context = new Start($this->createMock(\Interop\Queue\Context::class), $this->createLoggerMock(), [], 0, 0, 0);
 
         $fooExtension = $this->createExtension();
         $fooExtension
@@ -176,6 +178,14 @@ public function testShouldProxyOnInterruptedToAllInternalExtensions()
         $extensions->onInterrupted($context);
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function createLoggerMock(): LoggerInterface
+    {
+        return $this->createMock(LoggerInterface::class);
+    }
+
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|Context
      */
diff --git a/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php
@@ -3,6 +3,7 @@
 namespace Enqueue\Tests\Consumption\Extension;
 
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\Extension\LoggerExtension;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
@@ -12,6 +13,7 @@
 use Interop\Queue\Context as InteropContext;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 class LoggerExtensionTest extends TestCase
 {
@@ -33,7 +35,7 @@ public function testShouldSetLoggerToContextOnStart()
 
         $extension = new LoggerExtension($logger);
 
-        $context = new Context($this->createContextMock());
+        $context = new Start($this->createContextMock(), new NullLogger(), [], 0, 0, 0);
 
         $extension->onStart($context);
 
@@ -51,7 +53,7 @@ public function testShouldAddInfoMessageOnStart()
 
         $extension = new LoggerExtension($logger);
 
-        $context = new Context($this->createContextMock());
+        $context = new Start($this->createContextMock(), new NullLogger(), [], 0, 0, 0);
 
         $extension->onStart($context);
     }
@@ -168,8 +170,7 @@ public function testShouldNotSetLoggerIfOneHasBeenSetOnStart()
 
         $extension = new LoggerExtension($logger);
 
-        $context = new Context($this->createContextMock());
-        $context->setLogger($alreadySetLogger);
+        $context = new Start($this->createContextMock(), $alreadySetLogger, [], 0, 0, 0);
 
         $extension->onStart($context);
     }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php
@@ -2,13 +2,11 @@
 
 namespace Enqueue\Tests\Consumption\Extension;
 
-use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\Extension\NicenessExtension;
-use Interop\Queue\Consumer;
 use Interop\Queue\Context as InteropContext;
-use Interop\Queue\Processor;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 class NicenessExtensionTest extends TestCase
 {
@@ -28,20 +26,17 @@ public function testShouldThrowWarningOnInvalidArgument()
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('proc_nice(): Only a super user may attempt to increase the priority of a process');
 
+        $context = new Start($this->createContextMock(), new NullLogger(), [], 0, 0, 0);
+
         $extension = new NicenessExtension(-1);
-        $extension->onStart($this->createContext());
+        $extension->onStart($context);
     }
 
     /**
-     * @return Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext
      */
-    protected function createContext(): Context
+    protected function createContextMock(): InteropContext
     {
-        $context = new Context($this->createMock(InteropContext::class));
-        $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setConsumer($this->createMock(Consumer::class));
-        $context->setProcessor($this->createMock(Processor::class));
-
-        return $context;
+        return $this->createMock(InteropContext::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php
@@ -3,6 +3,7 @@
 namespace Enqueue\Tests\Consumption\Extension;
 
 use Enqueue\Consumption\Context;
+use Enqueue\Consumption\Context\Start;
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
@@ -39,7 +40,7 @@ public function testShouldDoNothingOnStart()
     {
         $extension = new ReplyExtension();
 
-        $extension->onStart(new Context($this->createNeverUsedContextMock()));
+        $extension->onStart(new Start($this->createNeverUsedContextMock(), new NullLogger(), [], 0, 0, 0));
     }
 
     public function testShouldDoNothingOnBeforeReceive()
diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php
@@ -12,12 +12,26 @@
 use Enqueue\Container\Container;
 use Enqueue\Null\NullQueue;
 use Enqueue\Symfony\Client\ConsumeCommand;
+use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class ConsumeCommandTest extends TestCase
 {
+    use ClassExtensionTrait;
+
+    public function testShouldBeSubClassOfCommand()
+    {
+        $this->assertClassExtends(Command::class, ConsumeCommand::class);
+    }
+
+    public function testShouldNotBeFinal()
+    {
+        $this->assertClassNotFinal(ConsumeCommand::class);
+    }
+
     public function testCouldBeConstructedWithRequiredAttributes()
     {
         new ConsumeCommand($this->createMock(ContainerInterface::class));
diff --git a/pkg/enqueue/Tests/Symfony/Client/ProduceCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ProduceCommandTest.php
@@ -5,12 +5,26 @@
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Container\Container;
 use Enqueue\Symfony\Client\ProduceCommand;
+use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class ProduceCommandTest extends TestCase
 {
+    use ClassExtensionTrait;
+
+    public function testShouldBeSubClassOfCommand()
+    {
+        $this->assertClassExtends(Command::class, ProduceCommand::class);
+    }
+
+    public function testShouldNotBeFinal()
+    {
+        $this->assertClassNotFinal(ProduceCommand::class);
+    }
+
     public function testCouldBeConstructedWithContainerAsFirstArgument()
     {
         new ProduceCommand($this->createMock(ContainerInterface::class));
diff --git a/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php
@@ -23,9 +23,9 @@ public function testShouldBeSubClassOfCommand()
         $this->assertClassExtends(Command::class, RoutesCommand::class);
     }
 
-    public function testShouldBeFinal()
+    public function testShouldNotBeFinal()
     {
-        $this->assertClassFinal(RoutesCommand::class);
+        $this->assertClassNotFinal(RoutesCommand::class);
     }
 
     public function testCouldBeConstructedWithConfigAndRouteCollectionAsArguments()
diff --git a/pkg/enqueue/Tests/Symfony/Client/SetupBrokerCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/SetupBrokerCommandTest.php
@@ -5,12 +5,26 @@
 use Enqueue\Client\DriverInterface;
 use Enqueue\Container\Container;
 use Enqueue\Symfony\Client\SetupBrokerCommand;
+use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class SetupBrokerCommandTest extends TestCase
 {
+    use ClassExtensionTrait;
+
+    public function testShouldBeSubClassOfCommand()
+    {
+        $this->assertClassExtends(Command::class, SetupBrokerCommand::class);
+    }
+
+    public function testShouldNotBeFinal()
+    {
+        $this->assertClassNotFinal(SetupBrokerCommand::class);
+    }
+
     public function testCouldBeConstructedWithContainerAsFirstArgument()
     {
         new SetupBrokerCommand($this->createMock(ContainerInterface::class));
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ConfigurableConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ConfigurableConsumeCommandTest.php
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeCommandTest.php
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/QueueConsumerOptionsCommandTraitTest.php b/pkg/enqueue/Tests/Symfony/Consumption/QueueConsumerOptionsCommandTraitTest.php
diff --git a/pkg/test/ClassExtensionTrait.php b/pkg/test/ClassExtensionTrait.php

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ protected function configureQueueConsumerOptions()`
`26`	`26`	`protected function setQueueConsumerOptions(QueueConsumerInterface $consumer, InputInterface $input)`
`27`	`27`	`{`
`28`	`28`	`if (null !== $idleTimeout = $input->getOption('idle-time')) {`
`29`		`- $consumer->setIdleTime((float) $idleTimeout);`
	`29`	`+ $consumer->setIdleTime((int) $idleTimeout);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if (null !== $receiveTimeout = $input->getOption('receive-timeout')) {`
`33`		`- $consumer->setReceiveTimeout((float) $receiveTimeout);`
	`33`	`+ $consumer->setReceiveTimeout((int) $receiveTimeout);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,11 @@`
`5`	`5`	`use Enqueue\Client\ConsumptionExtension\FlushSpoolProducerExtension;`
`6`	`6`	`use Enqueue\Client\SpoolProducer;`
`7`	`7`	`use Enqueue\Consumption\Context;`
	`8`	`+use Enqueue\Consumption\Context\Start;`
`8`	`9`	`use Enqueue\Consumption\ExtensionInterface;`
`9`	`10`	`use Enqueue\Test\ClassExtensionTrait;`
`10`	`11`	`use PHPUnit\Framework\TestCase;`
	`12`	`+use Psr\Log\NullLogger;`
`11`	`13`
`12`	`14`	`class FlushSpoolProducerExtensionTest extends TestCase`
`13`	`15`	`{`
`@@ -32,7 +34,9 @@ public function testShouldDoNothingOnStart()`
`32`	`34`	`;`
`33`	`35`
`34`	`36`	`$extension = new FlushSpoolProducerExtension($producer);`
`35`		`- $extension->onStart($this->createContextMock());`
	`37`	`+ $extension->onStart(`
	`38`	`+ new Start($this->createMock(\Interop\Queue\Context::class), new NullLogger(), [], 0, 0, 0)`
	`39`	`+ );`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`public function testShouldDoNothingOnBeforeReceive()`