Skip to content

Commit 8b1a30e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.1
* 4.4: Use createMock() and use import instead of FQCN
1 parent f3a43b3 commit 8b1a30e

File tree

3 files changed

+32
-22
lines changed

3 files changed

+32
-22
lines changed

‎Tests/Transport/AmqpReceiverTest.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceiver;
1818
use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection;
1919
use Symfony\Component\Messenger\Envelope;
20+
use Symfony\Component\Messenger\Exception\TransportException;
21+
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
22+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp;
23+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
24+
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
2025
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
2126
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
2227
use Symfony\Component\Serializer as SerializerComponent;
@@ -35,7 +40,7 @@ public function testItReturnsTheDecodedMessageToTheHandler()
3540
);
3641

3742
$amqpEnvelope = $this->createAMQPEnvelope();
38-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
43+
$connection = $this->createMock(Connection::class);
3944
$connection->method('getQueueNames')->willReturn(['queueName']);
4045
$connection->method('get')->with('queueName')->willReturn($amqpEnvelope);
4146

@@ -47,10 +52,10 @@ public function testItReturnsTheDecodedMessageToTheHandler()
4752

4853
public function testItThrowsATransportExceptionIfItCannotAcknowledgeMessage()
4954
{
50-
$this->expectException(\Symfony\Component\Messenger\Exception\TransportException::class);
55+
$this->expectException(TransportException::class);
5156
$serializer = $this->createMock(SerializerInterface::class);
5257
$amqpEnvelope = $this->createAMQPEnvelope();
53-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
58+
$connection = $this->createMock(Connection::class);
5459
$connection->method('getQueueNames')->willReturn(['queueName']);
5560
$connection->method('get')->with('queueName')->willReturn($amqpEnvelope);
5661
$connection->method('ack')->with($amqpEnvelope, 'queueName')->willThrowException(new \AMQPException());
@@ -61,10 +66,10 @@ public function testItThrowsATransportExceptionIfItCannotAcknowledgeMessage()
6166

6267
public function testItThrowsATransportExceptionIfItCannotRejectMessage()
6368
{
64-
$this->expectException(\Symfony\Component\Messenger\Exception\TransportException::class);
69+
$this->expectException(TransportException::class);
6570
$serializer = $this->createMock(SerializerInterface::class);
6671
$amqpEnvelope = $this->createAMQPEnvelope();
67-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
72+
$connection = $this->createMock(Connection::class);
6873
$connection->method('getQueueNames')->willReturn(['queueName']);
6974
$connection->method('get')->with('queueName')->willReturn($amqpEnvelope);
7075
$connection->method('nack')->with($amqpEnvelope, 'queueName', \AMQP_NOPARAM)->willThrowException(new \AMQPException());
@@ -75,7 +80,7 @@ public function testItThrowsATransportExceptionIfItCannotRejectMessage()
7580

7681
private function createAMQPEnvelope(): \AMQPEnvelope
7782
{
78-
$envelope = $this->getMockBuilder(\AMQPEnvelope::class)->getMock();
83+
$envelope = $this->createMock(\AMQPEnvelope::class);
7984
$envelope->method('getBody')->willReturn('{"message": "Hi"}');
8085
$envelope->method('getHeaders')->willReturn([
8186
'type' => DummyMessage::class,

‎Tests/Transport/AmqpSenderTest.php

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpStamp;
1818
use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection;
1919
use Symfony\Component\Messenger\Envelope;
20+
use Symfony\Component\Messenger\Exception\TransportException;
21+
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
22+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
23+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp;
24+
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
2025
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
2126

2227
/**
@@ -29,10 +34,10 @@ public function testItSendsTheEncodedMessage()
2934
$envelope = new Envelope(new DummyMessage('Oy'));
3035
$encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class]];
3136

32-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
37+
$serializer = $this->createMock(SerializerInterface::class);
3338
$serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
3439

35-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
40+
$connection = $this->createMock(Connection::class);
3641
$connection->expects($this->once())->method('publish')->with($encoded['body'], $encoded['headers']);
3742

3843
$sender = new AmqpSender($connection, $serializer);
@@ -59,10 +64,10 @@ public function testItSendsTheEncodedMessageWithoutHeaders()
5964
$envelope = new Envelope(new DummyMessage('Oy'));
6065
$encoded = ['body' => '...'];
6166

62-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
67+
$serializer = $this->createMock(SerializerInterface::class);
6368
$serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
6469

65-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
70+
$connection = $this->createMock(Connection::class);
6671
$connection->expects($this->once())->method('publish')->with($encoded['body'], []);
6772

6873
$sender = new AmqpSender($connection, $serializer);
@@ -74,10 +79,10 @@ public function testContentTypeHeaderIsMovedToAttribute()
7479
$envelope = new Envelope(new DummyMessage('Oy'));
7580
$encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class, 'Content-Type' => 'application/json']];
7681

77-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
82+
$serializer = $this->createMock(SerializerInterface::class);
7883
$serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
7984

80-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
85+
$connection = $this->createMock(Connection::class);
8186
unset($encoded['headers']['Content-Type']);
8287
$stamp = new AmqpStamp(null, \AMQP_NOPARAM, ['content_type' => 'application/json']);
8388
$connection->expects($this->once())->method('publish')->with($encoded['body'], $encoded['headers'], 0, $stamp);
@@ -91,10 +96,10 @@ public function testContentTypeHeaderDoesNotOverwriteAttribute()
9196
$envelope = (new Envelope(new DummyMessage('Oy')))->with($stamp = new AmqpStamp('rk', \AMQP_NOPARAM, ['content_type' => 'custom']));
9297
$encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class, 'Content-Type' => 'application/json']];
9398

94-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
99+
$serializer = $this->createMock(SerializerInterface::class);
95100
$serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
96101

97-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
102+
$connection = $this->createMock(Connection::class);
98103
unset($encoded['headers']['Content-Type']);
99104
$connection->expects($this->once())->method('publish')->with($encoded['body'], $encoded['headers'], 0, $stamp);
100105

@@ -104,14 +109,14 @@ public function testContentTypeHeaderDoesNotOverwriteAttribute()
104109

105110
public function testItThrowsATransportExceptionIfItCannotSendTheMessage()
106111
{
107-
$this->expectException(\Symfony\Component\Messenger\Exception\TransportException::class);
112+
$this->expectException(TransportException::class);
108113
$envelope = new Envelope(new DummyMessage('Oy'));
109114
$encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class]];
110115

111-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
116+
$serializer = $this->createMock(SerializerInterface::class);
112117
$serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
113118

114-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
119+
$connection = $this->createMock(Connection::class);
115120
$connection->method('publish')->with($encoded['body'], $encoded['headers'])->willThrowException(new \AMQPException());
116121

117122
$sender = new AmqpSender($connection, $serializer);

‎Tests/Transport/AmqpTransportTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ public function testItIsATransport()
3434
public function testReceivesMessages()
3535
{
3636
$transport = $this->getTransport(
37-
$serializer = $this->getMockBuilder(SerializerInterface::class)->getMock(),
38-
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock()
37+
$serializer = $this->createMock(SerializerInterface::class),
38+
$connection = $this->createMock(Connection::class)
3939
);
4040

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

43-
$amqpEnvelope = $this->getMockBuilder(\AMQPEnvelope::class)->getMock();
43+
$amqpEnvelope = $this->createMock(\AMQPEnvelope::class);
4444
$amqpEnvelope->method('getBody')->willReturn('body');
4545
$amqpEnvelope->method('getHeaders')->willReturn(['my' => 'header']);
4646

@@ -54,8 +54,8 @@ public function testReceivesMessages()
5454

5555
private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): AmqpTransport
5656
{
57-
$serializer = $serializer ?: $this->getMockBuilder(SerializerInterface::class)->getMock();
58-
$connection = $connection ?: $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
57+
$serializer = $serializer ?: $this->createMock(SerializerInterface::class);
58+
$connection = $connection ?: $this->createMock(Connection::class);
5959

6060
return new AmqpTransport($connection, $serializer);
6161
}

0 commit comments

Comments
 (0)