Skip to content

Commit 229de4f

Browse files
daniellienertdaniellienert
committed
TASK: Adjust unit tests to phpunit 8
1 parent 9bb94fa commit 229de4f

5 files changed

Lines changed: 48 additions & 49 deletions

File tree

‎Tests/Functional/AbstractQueueTest.php‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ abstract class AbstractQueueTest extends FunctionalTestCase
3333
/**
3434
* Set up dependencies
3535
*/
36-
public function setUp()
36+
public function setUp(): void
3737
{
3838
parent::setUp();
3939
$configurationManager = $this->objectManager->get(ConfigurationManager::class);
@@ -65,7 +65,7 @@ abstract protected function getQueue();
6565
public function submitReturnsMessageId()
6666
{
6767
$messageId = $this->queue->submit('some message payload');
68-
$this->assertInternalType('string', $messageId);
68+
self::assertInternalType('string', $messageId);
6969
}
7070

7171
/**
@@ -77,16 +77,16 @@ public function submitAndWaitWithMessageWorks()
7777
$this->queue->submit($payload);
7878

7979
$message = $this->queue->waitAndTake(1);
80-
$this->assertInstanceOf(Message::class, $message, 'waitAndTake should return message');
81-
$this->assertEquals($payload, $message->getPayload(), 'message should have payload as before');
80+
self::assertInstanceOf(Message::class, $message, 'waitAndTake should return message');
81+
self::assertEquals($payload, $message->getPayload(), 'message should have payload as before');
8282
}
8383

8484
/**
8585
* @test
8686
*/
8787
public function waitForMessageTimesOut()
8888
{
89-
$this->assertNull($this->queue->waitAndTake(1), 'wait should return NULL after timeout');
89+
self::assertNull($this->queue->waitAndTake(1), 'wait should return NULL after timeout');
9090
}
9191

9292
/**
@@ -98,24 +98,24 @@ public function peekReturnsNextMessagesIfQueueHasMessages()
9898
$this->queue->submit('Another message');
9999

100100
$messages = $this->queue->peek(1);
101-
$this->assertCount(1, $messages, 'peek should return a message');
101+
self::assertCount(1, $messages, 'peek should return a message');
102102
/** @var Message $firstMessage */
103103
$firstMessage = array_shift($messages);
104-
$this->assertEquals('First message', $firstMessage->getPayload());
104+
self::assertEquals('First message', $firstMessage->getPayload());
105105

106106
$messages = $this->queue->peek(1);
107-
$this->assertCount(1, $messages, 'peek should return a message again');
107+
self::assertCount(1, $messages, 'peek should return a message again');
108108
/** @var Message $firstMessage */
109109
$firstMessage = array_shift($messages);
110-
$this->assertEquals('First message', $firstMessage->getPayload(), 'second peek should return the same message again');
110+
self::assertEquals('First message', $firstMessage->getPayload(), 'second peek should return the same message again');
111111
}
112112

113113
/**
114114
* @test
115115
*/
116116
public function peekReturnsEmptyArrayIfQueueHasNoMessage()
117117
{
118-
$this->assertEquals([], $this->queue->peek(), 'peek should not return a message');
118+
self::assertEquals([], $this->queue->peek(), 'peek should not return a message');
119119
}
120120

121121
/**
@@ -127,13 +127,13 @@ public function waitAndReserveWithFinishRemovesMessage()
127127
$messageId = $this->queue->submit($payload);
128128

129129
$message = $this->queue->waitAndReserve(1);
130-
$this->assertNotNull($message, 'waitAndReserve should receive message');
131-
$this->assertSame($payload, $message->getPayload(), 'message should have payload as before');
130+
self::assertNotNull($message, 'waitAndReserve should receive message');
131+
self::assertSame($payload, $message->getPayload(), 'message should have payload as before');
132132

133133
$message = $this->queue->peek();
134-
$this->assertEquals([], $message, 'no message should be present in queue');
134+
self::assertEquals([], $message, 'no message should be present in queue');
135135

136-
$this->assertTrue($this->queue->finish($messageId));
136+
self::assertTrue($this->queue->finish($messageId));
137137
}
138138

139139
/**
@@ -144,10 +144,10 @@ public function releasePutsMessageBackToQueue()
144144
$messageId = $this->queue->submit('A message');
145145

146146
$this->queue->waitAndReserve(1);
147-
$this->assertSame(0, $this->queue->countReady());
147+
self::assertSame(0, $this->queue->countReady());
148148

149149
$this->queue->release($messageId);
150-
$this->assertSame(1, $this->queue->countReady());
150+
self::assertSame(1, $this->queue->countReady());
151151
}
152152

153153
/**
@@ -158,15 +158,15 @@ public function releaseIncreasesNumberOfReleases()
158158
$messageId = $this->queue->submit('A message');
159159

160160
$message = $this->queue->waitAndReserve(1);
161-
$this->assertSame(0, $message->getNumberOfReleases());
161+
self::assertSame(0, $message->getNumberOfReleases());
162162

163163
$this->queue->release($messageId);
164164
$message = $this->queue->waitAndReserve(1);
165-
$this->assertSame(1, $message->getNumberOfReleases());
165+
self::assertSame(1, $message->getNumberOfReleases());
166166

167167
$this->queue->release($messageId);
168168
$message = $this->queue->waitAndReserve(1);
169-
$this->assertSame(2, $message->getNumberOfReleases());
169+
self::assertSame(2, $message->getNumberOfReleases());
170170

171171
$this->queue->abort($messageId);
172172
}
@@ -181,16 +181,16 @@ public function abortRemovesMessageFromActiveQueue()
181181
$this->queue->waitAndReserve(1);
182182

183183
$this->queue->abort($messageId);
184-
$this->assertSame(0, $this->queue->countReady());
185-
$this->assertNull($this->queue->waitAndTake(1));
184+
self::assertSame(0, $this->queue->countReady());
185+
self::assertNull($this->queue->waitAndTake(1));
186186
}
187187

188188
/**
189189
* @test
190190
*/
191191
public function countReadyReturnsZeroByDefault()
192192
{
193-
$this->assertSame(0, $this->queue->countReady());
193+
self::assertSame(0, $this->queue->countReady());
194194
}
195195

196196
/**
@@ -201,15 +201,15 @@ public function countReadyReturnsNumberOfReadyJobs()
201201
$this->queue->submit('First message');
202202
$this->queue->submit('Second message');
203203

204-
$this->assertSame(2, $this->queue->countReady());
204+
self::assertSame(2, $this->queue->countReady());
205205
}
206206

207207
/**
208208
* @test
209209
*/
210210
public function countFailedReturnsZeroByDefault()
211211
{
212-
$this->assertSame(0, $this->queue->countFailed());
212+
self::assertSame(0, $this->queue->countFailed());
213213
}
214214

215215
/**
@@ -220,18 +220,18 @@ public function countFailedReturnsNumberOfFailedMessages()
220220
$messageId = $this->queue->submit('A message');
221221

222222
$this->queue->waitAndReserve(1);
223-
$this->assertSame(0, $this->queue->countFailed());
223+
self::assertSame(0, $this->queue->countFailed());
224224

225225
$this->queue->abort($messageId);
226-
$this->assertSame(1, $this->queue->countFailed());
226+
self::assertSame(1, $this->queue->countFailed());
227227
}
228228

229229
/**
230230
* @test
231231
*/
232232
public function countReservedReturnsZeroByDefault()
233233
{
234-
$this->assertSame(0, $this->queue->countReserved());
234+
self::assertSame(0, $this->queue->countReserved());
235235
}
236236

237237
/**
@@ -242,9 +242,9 @@ public function countReservedReturnsNumberOfReservedMessages()
242242
$messageId = $this->queue->submit('A message');
243243

244244
$this->queue->waitAndReserve(1);
245-
$this->assertSame(1, $this->queue->countReserved());
245+
self::assertSame(1, $this->queue->countReserved());
246246

247247
$this->queue->abort($messageId);
248-
$this->assertSame(0, $this->queue->countReserved());
248+
self::assertSame(0, $this->queue->countReserved());
249249
}
250250
}

‎Tests/Functional/Job/JobManagerTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class JobManagerTest extends FunctionalTestCase
3333
*/
3434
protected $jobManager;
3535

36-
3736
/**
3837
* @var QueueManager|MockObject
3938
*/
@@ -54,7 +53,7 @@ class JobManagerTest extends FunctionalTestCase
5453
*/
5554
protected $emittedSignals = [];
5655

57-
public function setUp()
56+
public function setUp(): void
5857
{
5958
parent::setUp();
6059
$this->mockQueueManager = $this->getMockBuilder(QueueManager::class)->disableOriginalConstructor()->getMock();
@@ -104,13 +103,13 @@ protected function assertSignalEmitted($signalName, array $arguments = [])
104103
if (!isset($this->emittedSignals[$fullSignalName])) {
105104
$this->fail('Signal "' . $signalName . '" has not been emitted!');
106105
}
107-
$this->assertCount(1, $this->emittedSignals[$fullSignalName]);
106+
self::assertCount(1, $this->emittedSignals[$fullSignalName]);
108107
foreach ($arguments as $argumentIndex => $expectedArgument) {
109108
$actualArgument = $this->emittedSignals[$fullSignalName][0][$argumentIndex];
110109
if ($expectedArgument instanceof Constraint) {
111110
$expectedArgument->evaluate($actualArgument);
112111
} else {
113-
$this->assertSame($expectedArgument, $actualArgument);
112+
self::assertSame($expectedArgument, $actualArgument);
114113
}
115114
}
116115
}

‎Tests/Unit/Job/JobManagerTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Flowpack\JobQueue\Common\Job\JobManager;
1818
use Flowpack\JobQueue\Common\Queue\QueueManager;
1919
use Flowpack\JobQueue\Common\Tests\Unit\Fixtures\TestJob;
20+
use PHPUnit\Framework\MockObject\MockObject;
2021

2122
/**
2223
* Unit tests for the JobManager
@@ -29,7 +30,7 @@ class JobManagerTest extends UnitTestCase
2930
protected $jobManager;
3031

3132
/**
32-
* @var QueueManager|\PHPUnit_Framework_MockObject_MockObject
33+
* @var QueueManager|MockObject
3334
*/
3435
protected $mockQueueManager;
3536

@@ -39,11 +40,11 @@ class JobManagerTest extends UnitTestCase
3940
protected $testQueue;
4041

4142

42-
public function setUp()
43+
public function setUp(): void
4344
{
4445
$this->mockQueueManager = $this->getMockBuilder(QueueManager::class)->disableOriginalConstructor()->getMock();
4546
$this->testQueue = new TestQueue('TestQueue');
46-
$this->mockQueueManager->expects($this->any())->method('getQueue')->with('TestQueue')->will($this->returnValue($this->testQueue));
47+
$this->mockQueueManager->expects($this->any())->method('getQueue')->with('TestQueue')->will(self::returnValue($this->testQueue));
4748

4849
$this->jobManager = new JobManager();
4950
$this->inject($this->jobManager, 'queueManager', $this->mockQueueManager);
@@ -58,7 +59,7 @@ public function queueSubmitsMessageToQueue()
5859
$this->jobManager->queue('TestQueue', $job);
5960

6061
$messageId = $this->testQueue->peek();
61-
$this->assertNotNull($messageId);
62+
self::assertNotNull($messageId);
6263
}
6364

6465
/**
@@ -70,6 +71,6 @@ public function queuePassesOptionsToQueue()
7071
$job = new TestJob();
7172
$this->jobManager->queue('TestQueue', $job, $mockOptions);
7273

73-
$this->assertSame($mockOptions, $this->testQueue->getLastSubmitOptions());
74+
self::assertSame($mockOptions, $this->testQueue->getLastSubmitOptions());
7475
}
7576
}

‎Tests/Unit/Queue/QueueManagerTest.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020
*/
2121
class QueueManagerTest extends UnitTestCase
2222
{
23-
2423
/**
2524
* @var QueueManager
2625
*/
2726
protected $queueManager;
2827

29-
public function setUp()
28+
public function setUp(): void
3029
{
3130
$this->queueManager = new QueueManager();
3231
$this->inject($this->queueManager, 'settings', [
@@ -91,7 +90,7 @@ public function getQueueSettingsMergesPresetWithQueueSettings()
9190
];
9291

9392
$queueSettings = $this->queueManager->getQueueSettings('TestQueue');
94-
$this->assertSame($expectedSettings, $queueSettings);
93+
self::assertSame($expectedSettings, $queueSettings);
9594
}
9695

9796
/**
@@ -101,8 +100,8 @@ public function getQueueCreatesInstanceByQueueName()
101100
{
102101
/** @var TestQueue $queue */
103102
$queue = $this->queueManager->getQueue('TestQueue');
104-
$this->assertInstanceOf(TestQueue::class, $queue);
105-
$this->assertSame('TestQueue', $queue->getName());
103+
self::assertInstanceOf(TestQueue::class, $queue);
104+
self::assertSame('TestQueue', $queue->getName());
106105
}
107106

108107
/**
@@ -123,7 +122,7 @@ public function getQueueSetsOptionsOnInstance()
123122

124123
/** @var TestQueue $queue */
125124
$queue = $this->queueManager->getQueue('TestQueue');
126-
$this->assertEquals(['foo' => 'bar'], $queue->getOptions());
125+
self::assertEquals(['foo' => 'bar'], $queue->getOptions());
127126
}
128127

129128
/**
@@ -132,15 +131,15 @@ public function getQueueSetsOptionsOnInstance()
132131
public function getQueueReusesInstances()
133132
{
134133
$queue = $this->queueManager->getQueue('TestQueue');
135-
$this->assertSame($queue, $this->queueManager->getQueue('TestQueue'));
134+
self::assertSame($queue, $this->queueManager->getQueue('TestQueue'));
136135
}
137136

138137
/**
139138
* @test
140-
* @expectedException \Flowpack\JobQueue\Common\Exception
141139
*/
142140
public function getQueueThrowsExceptionWhenSettingsReferToNonExistingPreset()
143141
{
142+
self::expectException(\Flowpack\JobQueue\Common\Exception::class);
144143
$this->inject($this->queueManager, 'settings', [
145144
'queues' => [
146145
'TestQueue' => [
@@ -169,7 +168,7 @@ public function queueNamesArePrefixedWithDefaultQueueNamePrefix()
169168

170169
/** @var TestQueue $queue */
171170
$queue = $this->queueManager->getQueue('TestQueue');
172-
$this->assertSame('specialQueueTestQueue', $queue->getName());
171+
self::assertSame('specialQueueTestQueue', $queue->getName());
173172
}
174173

175174
/**
@@ -194,6 +193,6 @@ public function queueNamePrefixFromPresetCanBeOverruled()
194193

195194
/** @var TestQueue $queue */
196195
$queue = $this->queueManager->getQueue('TestQueue');
197-
$this->assertSame('overriddenPrefixTestQueue', $queue->getName());
196+
self::assertSame('overriddenPrefixTestQueue', $queue->getName());
198197
}
199198
}

‎Tests/Unit/Utility/VariableDumperTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class VariableDumperTest extends UnitTestCase
2929
public function dumpValueReturnsStringifiedValue($input, $expectedOutput)
3030
{
3131
$output = VariableDumper::dumpValue($input);
32-
$this->assertSame($expectedOutput, $output);
32+
self::assertSame($expectedOutput, $output);
3333
}
3434

3535
public function dumpValueExamples()

0 commit comments

Comments
 (0)