Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Messenger] Add more tests around the AMQP transport #27206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2018
Merged

[Messenger] Add more tests around the AMQP transport #27206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 3 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
use Symfony\Component\Messenger\Transport\TransportFactory;
use Symfony\Component\PropertyAccess\PropertyAccessor;
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
Expand Down Expand Up @@ -528,6 +529,8 @@ public function testMessenger()
$container = $this->createContainerFromFile('messenger');
$this->assertTrue($container->hasAlias('message_bus'));
$this->assertFalse($container->hasDefinition('messenger.transport.amqp.factory'));
$this->assertTrue($container->hasDefinition('messenger.transport_factory'));
$this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
}

public function testMessengerTransports()
Expand Down
48 changes: 48 additions & 0 deletions 48 src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;

use PHPUnit\Framework\TestCase;
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport;
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory;
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface;
use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;

class AmqpTransportFactoryTest extends TestCase
{
public function testSupportsOnlyAmqpTransports()
{
$factory = new AmqpTransportFactory(
$this->getMockBuilder(EncoderInterface::class)->getMock(),
$this->getMockBuilder(DecoderInterface::class)->getMock(),
true
);

$this->assertTrue($factory->supports('amqp://localhost', array()));
$this->assertFalse($factory->supports('sqs://localhost', array()));
$this->assertFalse($factory->supports('invalid-dsn', array()));
}

public function testItCreatesTheTransport()
{
$factory = new AmqpTransportFactory(
$encoder = $this->getMockBuilder(EncoderInterface::class)->getMock(),
$decoder = $this->getMockBuilder(DecoderInterface::class)->getMock(),
true
);

$expectedTransport = new AmqpTransport($encoder, $decoder, Connection::fromDsn('amqp://localhost', array('foo' => 'bar'), true), array('foo' => 'bar'), true);

$this->assertEquals($expectedTransport, $factory->createTransport('amqp://localhost', array('foo' => 'bar')));
}
}
66 changes: 66 additions & 0 deletions 66 src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;

use PHPUnit\Framework\TestCase;
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport;
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface;
use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;
use Symfony\Component\Messenger\Transport\TransportInterface;

/**
* @requires extension amqp
*/
class AmqpTransportTest extends TestCase
{
public function testItIsATransport()
{
$transport = $this->getTransport();

$this->assertInstanceOf(TransportInterface::class, $transport);
}

public function testReceivesMessages()
{
$transport = $this->getTransport(
null,
$decoder = $this->getMockBuilder(DecoderInterface::class)->getMock(),
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock()
);

$decodedMessage = new DummyMessage('Decoded.');

$amqpEnvelope = $this->getMockBuilder(\AMQPEnvelope::class)->getMock();
$amqpEnvelope->method('getBody')->willReturn('body');
$amqpEnvelope->method('getHeaders')->willReturn(array('my' => 'header'));

$decoder->method('decode')->with(array('body' => 'body', 'headers' => array('my' => 'header')))->willReturn($decodedMessage);
$connection->method('get')->willReturn($amqpEnvelope);

$transport->receive(function ($message) use ($transport, $decodedMessage) {
$this->assertSame($decodedMessage, $message);

$transport->stop();
});
}

private function getTransport(EncoderInterface $encoder = null, DecoderInterface $decoder = null, Connection $connection = null)
{
$encoder = $encoder ?: $this->getMockBuilder(EncoderInterface::class)->getMock();
$decoder = $decoder ?: $this->getMockBuilder(DecoderInterface::class)->getMock();
$connection = $connection ?: $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();

return new AmqpTransport($encoder, $decoder, $connection);
}
}
18 changes: 4 additions & 14 deletions 18 src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,15 @@ class AmqpTransport implements TransportInterface
{
private $encoder;
private $decoder;
private $dsn;
private $options;
private $debug;
private $connection;
private $receiver;
private $sender;

public function __construct(EncoderInterface $encoder, DecoderInterface $decoder, string $dsn, array $options, bool $debug)
public function __construct(EncoderInterface $encoder, DecoderInterface $decoder, Connection $connection)
{
$this->encoder = $encoder;
$this->decoder = $decoder;
$this->dsn = $dsn;
$this->options = $options;
$this->debug = $debug;
$this->connection = $connection;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes laziness. I'd suggest to try harder keeping feature. The factory could validate the dsn itself if that's the goal here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non. The laziness is already within the Connection object. There is no point of making a class creation lazy 😄 (and even that is already lazy as behind service locators)

}

/**
Expand Down Expand Up @@ -64,16 +59,11 @@ public function send($message): void

private function getReceiver()
{
return $this->receiver = new AmqpReceiver($this->decoder, $this->connection ?? $this->getConnection());
return $this->receiver = new AmqpReceiver($this->decoder, $this->connection);
}

private function getSender()
{
return $this->sender = new AmqpSender($this->encoder, $this->connection ?? $this->getConnection());
}

private function getConnection()
{
return $this->connection = Connection::fromDsn($this->dsn, $this->options, $this->debug);
return $this->sender = new AmqpSender($this->encoder, $this->connection);
}
}
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(EncoderInterface $encoder, DecoderInterface $decoder

public function createTransport(string $dsn, array $options): TransportInterface
{
return new AmqpTransport($this->encoder, $this->decoder, $dsn, $options, $this->debug);
return new AmqpTransport($this->encoder, $this->decoder, Connection::fromDsn($dsn, $options, $this->debug));
}

public function supports(string $dsn, array $options): bool
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.