Skip to content

[client] Redis driver #59

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.

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
Apr 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions pkg/enqueue-bundle/EnqueueBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Enqueue\Bundle\DependencyInjection\EnqueueExtension;
use Enqueue\Fs\FsContext;
use Enqueue\Fs\Symfony\FsTransportFactory;
use Enqueue\Redis\RedisContext;
use Enqueue\Redis\Symfony\RedisTransportFactory;
use Enqueue\Stomp\StompContext;
use Enqueue\Stomp\Symfony\RabbitMqStompTransportFactory;
use Enqueue\Stomp\Symfony\StompTransportFactory;
Expand Down Expand Up @@ -52,5 +54,9 @@ public function build(ContainerBuilder $container)
if (class_exists(FsContext::class)) {
$extension->addTransportFactory(new FsTransportFactory());
}

if (class_exists(RedisContext::class)) {
$extension->addTransportFactory(new RedisTransportFactory());
}
}
}
91 changes: 0 additions & 91 deletions pkg/enqueue-bundle/Tests/Functional/ConsumeMessagesCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,17 @@

namespace Enqueue\Bundle\Tests\Functional;

use Enqueue\AmqpExt\AmqpMessage;
use Enqueue\Bundle\Tests\Functional\App\AmqpAppKernel;
use Enqueue\Client\ProducerInterface;
use Enqueue\Symfony\Client\ConsumeMessagesCommand;
use Enqueue\Test\RabbitmqManagmentExtensionTrait;
use Symfony\Component\Console\Tester\CommandTester;

/**
* @group functional
*/
class ConsumeMessagesCommandTest extends WebTestCase
{
use RabbitmqManagmentExtensionTrait;

public function setUp()
{
parent::setUp();

$this->removeExchange('amqp.test');
$this->removeQueue('amqp.app.test');

$driver = $this->container->get('enqueue.client.driver');
$driver->setupBroker();
}

public function testCouldBeGetFromContainerAsService()
{
$command = $this->container->get('enqueue.client.consume_messages_command');

$this->assertInstanceOf(ConsumeMessagesCommand::class, $command);
}

public function testClientConsumeMessagesCommandShouldConsumeMessage()
{
$command = $this->container->get('enqueue.client.consume_messages_command');
$processor = $this->container->get('test.message.processor');

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$tester = new CommandTester($command);
$tester->execute([
'--message-limit' => 2,
'--time-limit' => 'now +10 seconds',
]);

$this->assertInstanceOf(AmqpMessage::class, $processor->message);
$this->assertEquals('test message body', $processor->message->getBody());
}

public function testClientConsumeMessagesFromExplicitlySetQueue()
{
$command = $this->container->get('enqueue.client.consume_messages_command');
$processor = $this->container->get('test.message.processor');

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$tester = new CommandTester($command);
$tester->execute([
'--message-limit' => 2,
'--time-limit' => 'now +10 seconds',
'client-queue-names' => ['test'],
]);

$this->assertInstanceOf(AmqpMessage::class, $processor->message);
$this->assertEquals('test message body', $processor->message->getBody());
}

public function testTransportConsumeMessagesCommandShouldConsumeMessage()
{
$command = $this->container->get('enqueue.command.consume_messages');
$command->setContainer($this->container);
$processor = $this->container->get('test.message.processor');

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$tester = new CommandTester($command);
$tester->execute([
'--message-limit' => 1,
'--time-limit' => '+10sec',
'queue' => 'amqp.app.test',
'processor-service' => 'test.message.processor',
]);

$this->assertInstanceOf(AmqpMessage::class, $processor->message);
$this->assertEquals('test message body', $processor->message->getBody());
}

/**
* @return string
*/
public static function getKernelClass()
{
include_once __DIR__.'/app/AmqpAppKernel.php';

return AmqpAppKernel::class;
}

/**
* @return ProducerInterface|object
*/
private function getMessageProducer()
{
return $this->container->get('enqueue.client.producer');
}
}
214 changes: 214 additions & 0 deletions pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<?php

namespace Enqueue\Bundle\Tests\Functional;

use Enqueue\Bundle\Tests\Functional\App\CustomAppKernel;
use Enqueue\Client\DriverInterface;
use Enqueue\Client\ProducerInterface;
use Enqueue\Psr\PsrContext;
use Enqueue\Psr\PsrMessage;
use Symfony\Component\Console\Tester\CommandTester;

/**
* @group functional
*/
class UseCasesTest extends WebTestCase
{
public function provideEnqueueConfigs()
{
return [
['amqp' => [
'transport' => [
'default' => 'amqp',
'amqp' => [
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
'login' => getenv('SYMFONY__RABBITMQ__USER'),
'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
'lazy' => false,
]
]
]],
['stomp' => [
'transport' => [
'default' => 'stomp',
'stomp' => [
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
'login' => getenv('SYMFONY__RABBITMQ__USER'),
'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
'lazy' => false,
]
]
]],
['predis' => [
'transport' => [
'default' => 'redis',
'redis' => [
'host' => getenv('SYMFONY__REDIS__HOST'),
'port' => (int) getenv('SYMFONY__REDIS__PORT'),
'vendor' => 'predis',
'lazy' => false,
]
]
]],
['phpredis' => [
'transport' => [
'default' => 'redis',
'redis' => [
'host' => getenv('SYMFONY__REDIS__HOST'),
'port' => (int) getenv('SYMFONY__REDIS__PORT'),
'vendor' => 'phpredis',
'lazy' => false,
]
]
]],
['fs' => [
'transport' => [
'default' => 'fs',
'fs' => [
'store_dir' => sys_get_temp_dir(),
]
]
]]
];
}

/**
* @dataProvider provideEnqueueConfigs
*/
public function testProducerSendsMessage(array $enqueueConfig)
{
$this->customSetUp($enqueueConfig);

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$queue = $this->getPsrContext()->createQueue('enqueue.test');

$consumer = $this->getPsrContext()->createConsumer($queue);

$message = $consumer->receive(100);

$this->assertInstanceOf(PsrMessage::class, $message);
$this->assertSame('test message body', $message->getBody());
}

/**
* @dataProvider provideEnqueueConfigs
*/
public function testClientConsumeMessagesFromExplicitlySetQueue(array $enqueueConfig)
{
$this->customSetUp($enqueueConfig);

$command = $this->container->get('enqueue.client.consume_messages_command');
$processor = $this->container->get('test.message.processor');

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$tester = new CommandTester($command);
$tester->execute([
'--message-limit' => 2,
'--time-limit' => 'now +10 seconds',
'client-queue-names' => ['test'],
]);

$this->assertInstanceOf(PsrMessage::class, $processor->message);
$this->assertEquals('test message body', $processor->message->getBody());
}

/**
* @dataProvider provideEnqueueConfigs
*/
public function testTransportConsumeMessagesCommandShouldConsumeMessage(array $enqueueConfig)
{
$this->customSetUp($enqueueConfig);

$command = $this->container->get('enqueue.command.consume_messages');
$command->setContainer($this->container);
$processor = $this->container->get('test.message.processor');

$this->getMessageProducer()->send(TestProcessor::TOPIC, 'test message body');

$tester = new CommandTester($command);
$tester->execute([
'--message-limit' => 1,
'--time-limit' => '+10sec',
'queue' => 'enqueue.test',
'processor-service' => 'test.message.processor',
]);

$this->assertInstanceOf(PsrMessage::class, $processor->message);
$this->assertEquals('test message body', $processor->message->getBody());
}

/**
* @return ProducerInterface|object
*/
private function getMessageProducer()
{
return $this->container->get('enqueue.client.producer');
}

/**
* @return PsrContext|object
*/
private function getPsrContext()
{
return $this->container->get('enqueue.transport.context');
}

protected function customSetUp(array $enqueueConfig)
{
static::$class = null;

$this->client = static::createClient(['enqueue_config' => $enqueueConfig]);
$this->client->getKernel()->boot();
$this->container = static::$kernel->getContainer();

/** @var DriverInterface $driver */
$driver = $this->container->get('enqueue.client.driver');
$context = $this->getPsrContext();

$queue = $driver->createQueue('test');

//guard
$this->assertEquals('enqueue.test', $queue->getQueueName());

if (method_exists($context, 'deleteQueue')) {
$context->deleteQueue($queue);
}

$driver->setupBroker();
}

/**
* {@inheritdoc}
*/
protected static function createKernel(array $options = array())
{
/** @var CustomAppKernel $kernel */
$kernel = parent::createKernel($options);

$kernel->setEnqueueConfig(isset($options['enqueue_config']) ? $options['enqueue_config'] : []);

return $kernel;
}

/**
* @return string
*/
public static function getKernelClass()
{
include_once __DIR__.'/app/CustomAppKernel.php';

return CustomAppKernel::class;
}

public function setUp()
{
// do not call parent::setUp.
// parent::setUp();
}
}
53 changes: 0 additions & 53 deletions pkg/enqueue-bundle/Tests/Functional/app/AmqpAppKernel.php

This file was deleted.

Loading