Skip to content

Commit 9a900f7

Browse files
adm-bomeadm-bome
committed
altered tests
 - added null values in testing config - testing defaults - testing logic
1 parent 08fae3a commit 9a900f7

File tree

2 files changed

+105
-9
lines changed

2 files changed

+105
-9
lines changed

‎tests/Functional/RabbitMQQueueTest.php‎

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public function testConfigRerouteFailed(): void
3131

3232
$queue = $this->connection('rabbitmq-with-options-empty');
3333
$this->assertFalse($this->callProperty($queue, 'config')->isRerouteFailed());
34+
35+
$queue = $this->connection('rabbitmq-with-options-null');
36+
$this->assertFalse($this->callProperty($queue, 'config')->isRerouteFailed());
3437
}
3538

3639
public function testConfigPrioritizeDelayed(): void
@@ -43,6 +46,9 @@ public function testConfigPrioritizeDelayed(): void
4346

4447
$queue = $this->connection('rabbitmq-with-options-empty');
4548
$this->assertFalse($this->callProperty($queue, 'config')->isPrioritizeDelayed());
49+
50+
$queue = $this->connection('rabbitmq-with-options-null');
51+
$this->assertFalse($this->callProperty($queue, 'config')->isPrioritizeDelayed());
4652
}
4753

4854
public function testQueueMaxPriority(): void
@@ -58,6 +64,10 @@ public function testQueueMaxPriority(): void
5864
$queue = $this->connection('rabbitmq-with-options-empty');
5965
$this->assertIsInt($this->callProperty($queue, 'config')->getQueueMaxPriority());
6066
$this->assertSame(2, $this->callProperty($queue, 'config')->getQueueMaxPriority());
67+
68+
$queue = $this->connection('rabbitmq-with-options-null');
69+
$this->assertIsInt($this->callProperty($queue, 'config')->getQueueMaxPriority());
70+
$this->assertSame(2, $this->callProperty($queue, 'config')->getQueueMaxPriority());
6171
}
6272

6373
public function testConfigExchangeType(): void
@@ -69,66 +79,109 @@ public function testConfigExchangeType(): void
6979

7080
$queue = $this->connection('rabbitmq-with-options');
7181
$this->assertSame(AMQPExchangeType::TOPIC, $this->callMethod($queue, 'getExchangeType'));
82+
$this->assertSame(AMQPExchangeType::DIRECT, $this->callMethod($queue, 'getExchangeType', ['direct']));
7283

7384
$queue = $this->connection('rabbitmq-with-options-empty');
7485
$this->assertSame(AMQPExchangeType::DIRECT, $this->callMethod($queue, 'getExchangeType'));
86+
87+
$queue = $this->connection('rabbitmq-with-options-null');
88+
$this->assertSame(AMQPExchangeType::DIRECT, $this->callMethod($queue, 'getExchangeType'));
89+
90+
//testing an unkown type with a default
91+
$this->callProperty($queue, 'config')->setExchangeType('unknown');
92+
$this->assertSame(AMQPExchangeType::DIRECT, $this->callMethod($queue, 'getExchangeType'));
7593
}
7694

7795
public function testExchange(): void
7896
{
7997
$queue = $this->connection();
8098
$this->assertSame('test', $this->callMethod($queue, 'getExchange', ['test']));
81-
$this->assertNull($this->callMethod($queue, 'getExchange', ['']));
82-
$this->assertNull($this->callMethod($queue, 'getExchange'));
99+
$this->assertSame('', $this->callMethod($queue, 'getExchange', ['']));
100+
$this->assertSame('', $this->callMethod($queue, 'getExchange', [null]));
101+
$this->assertSame('', $this->callMethod($queue, 'getExchange'));
83102

84103
$queue = $this->connection('rabbitmq-with-options');
85-
$this->assertNotNull($this->callMethod($queue, 'getExchange'));
86104
$this->assertSame('application-x', $this->callMethod($queue, 'getExchange'));
105+
$this->assertSame('application-x', $this->callMethod($queue, 'getExchange', [null]));
106+
$this->assertSame('test', $this->callMethod($queue, 'getExchange', ['test']));
107+
$this->assertSame('', $this->callMethod($queue, 'getExchange', ['']));
87108

88109
$queue = $this->connection('rabbitmq-with-options-empty');
89-
$this->assertNull($this->callMethod($queue, 'getExchange'));
110+
$this->assertSame('', $this->callMethod($queue, 'getExchange'));
111+
$this->assertSame('', $this->callMethod($queue, 'getExchange', [null]));
112+
$this->assertSame('test', $this->callMethod($queue, 'getExchange', ['test']));
113+
$this->assertSame('', $this->callMethod($queue, 'getExchange', ['']));
114+
115+
$queue = $this->connection('rabbitmq-with-options-null');
116+
$this->assertSame('', $this->callMethod($queue, 'getExchange'));
117+
$this->assertSame('', $this->callMethod($queue, 'getExchange', [null]));
118+
$this->assertSame('test', $this->callMethod($queue, 'getExchange', ['test']));
119+
$this->assertSame('', $this->callMethod($queue, 'getExchange', ['']));
90120
}
91121

92122
public function testFailedExchange(): void
93123
{
94124
$queue = $this->connection();
95125
$this->assertSame('test', $this->callMethod($queue, 'getFailedExchange', ['test']));
96-
$this->assertNull($this->callMethod($queue, 'getExchange', ['']));
97-
$this->assertNull($this->callMethod($queue, 'getFailedExchange'));
126+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', ['']));
127+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', [null]));
128+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange'));
98129

99130
$queue = $this->connection('rabbitmq-with-options');
100-
$this->assertNotNull($this->callMethod($queue, 'getFailedExchange'));
101131
$this->assertSame('failed-exchange', $this->callMethod($queue, 'getFailedExchange'));
132+
$this->assertSame('failed-exchange', $this->callMethod($queue, 'getFailedExchange', [null]));
133+
$this->assertSame('test', $this->callMethod($queue, 'getFailedExchange', ['test']));
134+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', ['']));
102135

103136
$queue = $this->connection('rabbitmq-with-options-empty');
104-
$this->assertNull($this->callMethod($queue, 'getFailedExchange'));
137+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange'));
138+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', [null]));
139+
$this->assertSame('test', $this->callMethod($queue, 'getFailedExchange', ['test']));
140+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', ['']));
141+
142+
$queue = $this->connection('rabbitmq-with-options-null');
143+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange'));
144+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', [null]));
145+
$this->assertSame('test', $this->callMethod($queue, 'getFailedExchange', ['test']));
146+
$this->assertSame('', $this->callMethod($queue, 'getFailedExchange', ['']));
105147
}
106148

107149
public function testRoutingKey(): void
108150
{
109151
$queue = $this->connection();
110152
$this->assertSame('test', $this->callMethod($queue, 'getRoutingKey', ['test']));
153+
$this->assertSame('test', $this->callMethod($queue, 'getRoutingKey', ['.test']));
111154
$this->assertSame('', $this->callMethod($queue, 'getRoutingKey', ['']));
112155

113156
$queue = $this->connection('rabbitmq-with-options');
114157
$this->assertSame('process.test', $this->callMethod($queue, 'getRoutingKey', ['test']));
115158

116159
$queue = $this->connection('rabbitmq-with-options-empty');
117160
$this->assertSame('test', $this->callMethod($queue, 'getRoutingKey', ['test']));
161+
162+
$queue = $this->connection('rabbitmq-with-options-null');
163+
$this->assertSame('test', $this->callMethod($queue, 'getRoutingKey', ['test']));
164+
$this->callProperty($queue, 'config')->setExchangeRoutingKey('.an.alternate.routing-key');
165+
$this->assertSame('an.alternate.routing-key', $this->callMethod($queue, 'getRoutingKey', ['test']));
118166
}
119167

120168
public function testFailedRoutingKey(): void
121169
{
122170
$queue = $this->connection();
123-
124171
$this->assertSame('test.failed', $this->callMethod($queue, 'getFailedRoutingKey', ['test']));
172+
$this->assertSame('test.failed', $this->callMethod($queue, 'getFailedRoutingKey', ['.test']));
125173
$this->assertSame('failed', $this->callMethod($queue, 'getFailedRoutingKey', ['']));
126174

127175
$queue = $this->connection('rabbitmq-with-options');
128176
$this->assertSame('application-x.test.failed', $this->callMethod($queue, 'getFailedRoutingKey', ['test']));
129177

130178
$queue = $this->connection('rabbitmq-with-options-empty');
131179
$this->assertSame('test.failed', $this->callMethod($queue, 'getFailedRoutingKey', ['test']));
180+
181+
$queue = $this->connection('rabbitmq-with-options-null');
182+
$this->assertSame('test.failed', $this->callMethod($queue, 'getFailedRoutingKey', ['test']));
183+
$this->callProperty($queue, 'config')->setFailedRoutingKey('.an.alternate.routing-key');
184+
$this->assertSame('an.alternate.routing-key', $this->callMethod($queue, 'getFailedRoutingKey', ['test']));
132185
}
133186

134187
public function testConfigQuorum(): void
@@ -142,6 +195,9 @@ public function testConfigQuorum(): void
142195
$queue = $this->connection('rabbitmq-with-options-empty');
143196
$this->assertFalse($this->callProperty($queue, 'config')->isQuorum());
144197

198+
$queue = $this->connection('rabbitmq-with-options-null');
199+
$this->assertFalse($this->callProperty($queue, 'config')->isQuorum());
200+
145201
$queue = $this->connection('rabbitmq-with-quorum-options');
146202
$this->assertTrue($this->callProperty($queue, 'config')->isQuorum());
147203
}

‎tests/Functional/TestCase.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,46 @@ protected function getEnvironmentSetUp($app): void
118118

119119
'worker' => 'default',
120120

121+
]);
122+
$app['config']->set('queue.connections.rabbitmq-with-options-null', [
123+
'driver' => 'rabbitmq',
124+
'queue' => 'order',
125+
'connection' => 'default',
126+
127+
'hosts' => [
128+
[
129+
'host' => null,
130+
'port' => null,
131+
'vhost' => null,
132+
'user' => null,
133+
'password' => null,
134+
],
135+
],
136+
137+
'options' => [
138+
'ssl_options' => [
139+
'cafile' => null,
140+
'local_cert' => null,
141+
'local_key' => null,
142+
'verify_peer' => null,
143+
'passphrase' => null,
144+
],
145+
146+
'queue' => [
147+
'prioritize_delayed' => null,
148+
'queue_max_priority' => null,
149+
'exchange' => null,
150+
'exchange_type' => null,
151+
'exchange_routing_key' => null,
152+
'reroute_failed' => null,
153+
'failed_exchange' => null,
154+
'failed_routing_key' => null,
155+
'quorum' => null,
156+
],
157+
],
158+
159+
'worker' => 'default',
160+
121161
]);
122162
$app['config']->set('queue.connections.rabbitmq-with-quorum-options', [
123163
'driver' => 'rabbitmq',

0 commit comments

Comments
 (0)