Skip to content

Commit 2f66cb6

Browse files
weaverryanweaverryan
committed
fixing tests
1 parent 263148c commit 2f66cb6

File tree

3 files changed

+31
-32
lines changed

3 files changed

+31
-32
lines changed

‎src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ class ConsumeMessagesCommandTest extends TestCase
1919
{
2020
public function testConfigurationWithDefaultReceiver()
2121
{
22-
$command = new ConsumeMessagesCommand($this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), null, ['amqp']);
22+
$command = new ConsumeMessagesCommand($this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), null, ['amqp']);
2323
$inputArgument = $command->getDefinition()->getArgument('receiver');
2424
$this->assertFalse($inputArgument->isRequired());
2525
$this->assertSame('amqp', $inputArgument->getDefault());
2626
}
2727

2828
public function testConfigurationWithoutDefaultReceiver()
2929
{
30-
$command = new ConsumeMessagesCommand($this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), null, ['amqp', 'dummy']);
30+
$command = new ConsumeMessagesCommand($this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), $this->createMock(ServiceLocator::class), null, ['amqp', 'dummy']);
3131
$inputArgument = $command->getDefinition()->getArgument('receiver');
3232
$this->assertTrue($inputArgument->isRequired());
3333
$this->assertNull($inputArgument->getDefault());

‎src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ public function testItRegistersMultipleReceiversAndSetsTheReceiverNamesOnTheComm
251251
$container->register('console.command.messenger_consume_messages', ConsumeMessagesCommand::class)->setArguments([
252252
null,
253253
new Reference('messenger.receiver_locator'),
254+
new Reference('messenger.retry_strategy_locator'),
254255
null,
255256
null,
256257
null,
@@ -261,8 +262,8 @@ public function testItRegistersMultipleReceiversAndSetsTheReceiverNamesOnTheComm
261262

262263
(new MessengerPass())->process($container);
263264

264-
$this->assertSame(['amqp', 'dummy'], $container->getDefinition('console.command.messenger_consume_messages')->getArgument(3));
265-
$this->assertSame(['message_bus'], $container->getDefinition('console.command.messenger_consume_messages')->getArgument(4));
265+
$this->assertSame(['amqp', 'dummy'], $container->getDefinition('console.command.messenger_consume_messages')->getArgument(4));
266+
$this->assertSame(['message_bus'], $container->getDefinition('console.command.messenger_consume_messages')->getArgument(5));
266267
}
267268

268269
public function testItShouldNotThrowIfGeneratorIsReturnedInsteadOfArray()

‎src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -260,71 +260,69 @@ public function testItRetriesTheMessage()
260260
{
261261
$amqpConnection = $this->getMockBuilder(\AMQPConnection::class)->disableOriginalConstructor()->getMock();
262262
$amqpChannel = $this->getMockBuilder(\AMQPChannel::class)->disableOriginalConstructor()->getMock();
263-
$retryQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock();
263+
$delayQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock();
264264

265265
$factory = $this->getMockBuilder(AmqpFactory::class)->getMock();
266266
$factory->method('createConnection')->willReturn($amqpConnection);
267267
$factory->method('createChannel')->willReturn($amqpChannel);
268-
$factory->method('createQueue')->willReturn($retryQueue);
268+
$factory->method('createQueue')->willReturn($delayQueue);
269269
$factory->method('createExchange')->will($this->onConsecutiveCalls(
270-
$retryExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock(),
270+
$delayExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock(),
271271
$amqpExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock()
272272
));
273273

274274
$amqpExchange->expects($this->once())->method('setName')->with('messages');
275275
$amqpExchange->method('getName')->willReturn('messages');
276276

277-
$retryExchange->expects($this->once())->method('setName')->with('retry');
278-
$retryExchange->expects($this->once())->method('declareExchange');
279-
$retryExchange->method('getName')->willReturn('retry');
277+
$delayExchange->expects($this->once())->method('setName')->with('delay');
278+
$delayExchange->expects($this->once())->method('declareExchange');
279+
$delayExchange->method('getName')->willReturn('delay');
280280

281-
$retryQueue->expects($this->once())->method('setName')->with('retry_queue_1');
282-
$retryQueue->expects($this->once())->method('setArguments')->with([
283-
'x-message-ttl' => 10000,
281+
$delayQueue->expects($this->once())->method('setName')->with('delay_queue_5000');
282+
$delayQueue->expects($this->once())->method('setArguments')->with([
283+
'x-message-ttl' => 5000,
284284
'x-dead-letter-exchange' => 'messages',
285285
]);
286286

287-
$retryQueue->expects($this->once())->method('declareQueue');
288-
$retryQueue->expects($this->once())->method('bind')->with('retry', 'attempt_1');
287+
$delayQueue->expects($this->once())->method('declareQueue');
288+
$delayQueue->expects($this->once())->method('bind')->with('delay', 'delay_5000');
289289

290290
$envelope = $this->getMockBuilder(\AMQPEnvelope::class)->getMock();
291291
$envelope->method('getHeader')->with('symfony-messenger-attempts')->willReturn(false);
292292
$envelope->method('getHeaders')->willReturn(['x-some-headers' => 'foo']);
293293
$envelope->method('getBody')->willReturn('{}');
294294

295-
$retryExchange->expects($this->once())->method('publish')->with('{}', 'attempt_1', AMQP_NOPARAM, ['headers' => ['x-some-headers' => 'foo', 'symfony-messenger-attempts' => 1]]);
295+
$delayExchange->expects($this->once())->method('publish')->with('{}', 'delay_5000', AMQP_NOPARAM, ['headers' => ['x-some-headers' => 'foo', 'symfony-messenger-attempts' => 1]]);
296296

297-
$connection = Connection::fromDsn('amqp://localhost/%2f/messages', ['retry' => ['attempts' => 3]], $factory);
298-
$connection->publishForRetry($envelope);
297+
$connection = Connection::fromDsn('amqp://localhost/%2f/messages', [], $factory);
298+
$connection->publishForRetry($envelope, 5000);
299299
}
300300

301301
public function testItRetriesTheMessageWithADifferentRoutingKeyAndTTLs()
302302
{
303303
$amqpConnection = $this->getMockBuilder(\AMQPConnection::class)->disableOriginalConstructor()->getMock();
304304
$amqpChannel = $this->getMockBuilder(\AMQPChannel::class)->disableOriginalConstructor()->getMock();
305-
$retryQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock();
305+
$delayQueue = $this->getMockBuilder(\AMQPQueue::class)->disableOriginalConstructor()->getMock();
306306

307307
$factory = $this->getMockBuilder(AmqpFactory::class)->getMock();
308308
$factory->method('createConnection')->willReturn($amqpConnection);
309309
$factory->method('createChannel')->willReturn($amqpChannel);
310-
$factory->method('createQueue')->willReturn($retryQueue);
310+
$factory->method('createQueue')->willReturn($delayQueue);
311311
$factory->method('createExchange')->will($this->onConsecutiveCalls(
312-
$retryExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock(),
312+
$delayExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock(),
313313
$amqpExchange = $this->getMockBuilder(\AMQPExchange::class)->disableOriginalConstructor()->getMock()
314314
));
315315

316316
$amqpExchange->expects($this->once())->method('setName')->with('messages');
317317
$amqpExchange->method('getName')->willReturn('messages');
318318

319-
$retryExchange->expects($this->once())->method('setName')->with('retry');
320-
$retryExchange->expects($this->once())->method('declareExchange');
321-
$retryExchange->method('getName')->willReturn('retry');
319+
$delayExchange->expects($this->once())->method('setName')->with('delay');
320+
$delayExchange->expects($this->once())->method('declareExchange');
321+
$delayExchange->method('getName')->willReturn('delay');
322322

323323
$connectionOptions = [
324324
'retry' => [
325-
'attempts' => 3,
326325
'dead_routing_key' => 'my_dead_routing_key',
327-
'ttl' => [30000, 60000, 120000],
328326
],
329327
];
330328

@@ -335,17 +333,17 @@ public function testItRetriesTheMessageWithADifferentRoutingKeyAndTTLs()
335333
$messageRetriedTwice->method('getHeaders')->willReturn(['symfony-messenger-attempts' => '2']);
336334
$messageRetriedTwice->method('getBody')->willReturn('{}');
337335

338-
$retryQueue->expects($this->once())->method('setName')->with('retry_queue_3');
339-
$retryQueue->expects($this->once())->method('setArguments')->with([
336+
$delayQueue->expects($this->once())->method('setName')->with('delay_queue_120000');
337+
$delayQueue->expects($this->once())->method('setArguments')->with([
340338
'x-message-ttl' => 120000,
341339
'x-dead-letter-exchange' => 'messages',
342340
]);
343341

344-
$retryQueue->expects($this->once())->method('declareQueue');
345-
$retryQueue->expects($this->once())->method('bind')->with('retry', 'attempt_3');
342+
$delayQueue->expects($this->once())->method('declareQueue');
343+
$delayQueue->expects($this->once())->method('bind')->with('delay', 'delay_120000');
346344

347-
$retryExchange->expects($this->once())->method('publish')->with('{}', 'attempt_3', AMQP_NOPARAM, ['headers' => ['symfony-messenger-attempts' => 3]]);
348-
$connection->publishForRetry($messageRetriedTwice);
345+
$delayExchange->expects($this->once())->method('publish')->with('{}', 'delay_120000', AMQP_NOPARAM, ['headers' => ['symfony-messenger-attempts' => 3]]);
346+
$connection->publishForRetry($messageRetriedTwice, 120000);
349347
}
350348
}
351349

0 commit comments

Comments
 (0)