8000 Fix tests · symfony/symfony@b975e95 · GitHub
[go: up one dir, main page]
Skip to content

Commit b975e95

Browse files
jderussejderusse
committed
Fix tests
1 parent c4ba470 commit b975e95

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsIntegrationTest.php

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Tests\Transport;
1313

14+
use AsyncAws\Sqs\SqsClient;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Messenger\Bridge\AmazonSqs\Tests\Fixtures\DummyMessage;
1617
use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\Connection;
@@ -39,7 +40,7 @@ private function execute(string $dsn): void
3940
{
4041
$connection = Connection::fromDsn($dsn, []);
4142
$connection->setup();
42-
$this->clearSqs($connection);
43+
$this->clearSqs($dsn);
4344

4445
$connection->send('{"message": "Hi"}', ['type' => DummyMessage::class]);
4546
$this->assertSame(1, $connection->getMessageCount());
@@ -53,15 +54,12 @@ private function execute(string $dsn): void
5354
$this->assertEquals(['type' => DummyMessage::class], $encoded['headers']);
5455
}
5556

56-
private function clearSqs(Connection $connection): void
57+
private function clearSqs(string $dsn): void
5758
{
58-
$wait = 0;
59-
while ($wait++ < 50) {
60-
if (null === $message = $connection->get()) {
61-
usleep(5000);
62-
continue;
63-
}
64-
$connection->delete($message['id']);
65-
}
59+
$url = \parse_url($dsn);
60+
$client = new SqsClient(['endpoint' => "http://{$url['host']}:{$url['port']}"]);
61+
$client->purgeQueue([
62+
'QueueUrl' => $client->getQueueUrl(['QueueName' => ltrim($url['path'], '/')])->getQueueUrl()
63+
])->resolve();
6664
}
6765
}

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,27 @@ public function testKeepGettingPendingMessages()
9797
->willReturn(ResultMockFactory::create(GetQueueUrlResult::class, ['QueueUrl' => 'https://sqs.us-east-2.amazonaws.com/123456789012/MyQueue']));
9898
$client->expects($this->at(1))
9999
->method('receiveMessage')
100-
->with(['QueueUrl' => 'https://sqs.us-east-2.amazonaws.com/123456789012/MyQueue', 'MaxNumberOfMessages' => 9, 'WaitTimeSeconds' => 20, 'VisibilityTimeout' => null])
100+
->with([
101+
'QueueUrl' => 'https://sqs.us-east-2.amazonaws.com/123456789012/MyQueue',
102+
'MaxNumberOfMessages' => 9,
103+
'WaitTimeSeconds' => 20,
104+
'MessageAttributeNames' => ['All'],
105+
'VisibilityTimeout' => null,
106+
])
101107
->willReturn(ResultMockFactory::create(ReceiveMessageResult::class, ['Messages' => [
102-
new Message(['MessageId' => 1, 'Body' => '{"body":"this is a test","headers":{}}']),
103-
new Message(['MessageId' => 2, 'Body' => '{"body":"this is a test","headers":{}}']),
104-
new Message(['MessageId' => 3, 'Body' => '{"body":"this is a test","headers":{}}']),
108+
new Message(['MessageId' => 1, 'Body' => 'this is a test']),
109+
new Message(['MessageId' => 2, 'Body' => 'this is a test']),
110+
new Message(['MessageId' => 3, 'Body' => 'this is a test']),
105111
]]));
106112
$client->expects($this->at(2))
107113
->method('receiveMessage')
108-
->with(['QueueUrl' => 'https://sqs.us-east-2.amazonaws.com/123456789012/MyQueue', 'MaxNumberOfMessages' => 9, 'WaitTimeSeconds' => 20, 'VisibilityTimeout' => null])
114+
->with([
115+
'QueueUrl' => 'https://sqs.us-east-2.amazonaws.com/123456789012/MyQueue',
116+
'MaxNumberOfMessages' => 9,
117+
'WaitTimeSeconds' => 20,
118+
'MessageAttributeNames' => ['All'],
119+
'VisibilityTimeout' => null,
120+
])
109121
->willReturn(ResultMockFactory::create(ReceiveMessageResult::class, ['Messages' => [
110122
]]));
111123

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private function getNewMessages(): \Generator
180180
'QueueUrl' => $this->getQueueUrl(),
181181
'VisibilityTimeout' => $this->configuration['visibility_timeout'],
182182
'MaxNumberOfMessages' => $this->configuration['buffer_size'],
183-
'MessageAttributeName' => ['All'],
183+
'MessageAttributeNames' => ['All'],
184184
'WaitTimeSeconds' => $this->configuration['wait_time'],
185185
]);
186186
}
@@ -283,7 +283,7 @@ public function send(string $body, array $headers, int $delay = 0, ?string $mess
283283
];
284284

285285
foreach ($headers as $name => $value) {
286-
$parameters['MessageAttribute'][$name] = new MessageAttributeValue([
286+
$parameters['MessageAttributes'][$name] = new MessageAttributeValue([
287287
'DataType' => 'String',
288288
'StringValue' => $value,
289289
]);

0 commit comments

Comments
 (0)
0