Skip to content

Commit a1febdb

Browse files
GuikingoneGuikingone
committed
tests(core): improvements
1 parent bcbf847 commit a1febdb

File tree

4 files changed

+10
-125
lines changed

4 files changed

+10
-125
lines changed

‎src/Bridge/ApiPlatform/Filter/SearchFilter.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ public function filter(TaskListInterface $list, array $filters = []): TaskListIn
9999
$list = $list->filter(fn (TaskInterface $task): bool => $value === $task->getState());
100100
break;
101101
case 'timezone':
102-
$list = $list->filter(fn (TaskInterface $task): bool => null !== $task->getTimezone() && $value === $task->getTimezone()->getName());
102+
$list = $list->filter(function (TaskInterface $task) use ($value): bool {
103+
$timezone = $task->getTimezone();
104+
105+
return null !== $timezone && $value === $timezone->getName();
106+
});
103107
break;
104108
case 'type':
105109
$list = $list->filter(fn (TaskInterface $task): bool => $value === get_class($task));

‎tests/Bridge/ApiPlatform/Filter/SearchFilterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public function testFilterCanFilterOnTaskTimezone(): void
164164
$task->expects(self::never())->method('getExpression');
165165
$task->expects(self::never())->method('isQueued');
166166
$task->expects(self::never())->method('getState');
167-
$task->expects(self::exactly(2))->method('getTimezone')->willReturn(new DateTimeZone('UTC'));
167+
$task->expects(self::once())->method('getTimezone')->willReturn(new DateTimeZone('UTC'));
168168

169169
$filter = new SearchFilter();
170170
$list = $filter->filter(new TaskList([$task]), [

‎tests/EventListener/WorkerLifecycleSubscriberTest.php‎

Lines changed: 4 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,6 @@ public function testSubscriberLogOnWorkerRestartedWithoutExecutedTask(): void
5454
$workerLifecycleSubscriber->onWorkerRestarted(new WorkerRestartedEvent($worker));
5555
}
5656

57-
public function testSubscriberLogOnWorkerRestartedWithoutExecutedTask(): void
58-
{
59-
$list = $this->createMock(TaskListInterface::class);
60-
$list->expects(self::once())->method('count')->willReturn(0);
61-
62-
$worker = $this->createMock(WorkerInterface::class);
63-
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
64-
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn(null);
65-
66-
$logger = $this->createMock(LoggerInterface::class);
67-
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been restarted'), self::equalTo([
68-
'failedTasks' => 0,
69-
'lastExecutedTask' => null,
70-
]));
71-
72-
$subscriber = new WorkerLifecycleSubscriber($logger);
73-
$subscriber->onWorkerRestarted(new WorkerRestartedEvent($worker));
74-
}
75-
7657
public function testSubscriberLogOnWorkerRestarted(): void
7758
{
7859
$task = $this->createMock(TaskInterface::class);
@@ -83,7 +64,7 @@ public function testSubscriberLogOnWorkerRestarted(): void
8364

8465
$worker = $this->createMock(WorkerInterface::class);
8566
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
86-
$worker->expects(self::exactly(2))->method('getLastExecutedTask')->willReturn($task);
67+
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn($task);
8768

8869
$logger = $this->createMock(LoggerInterface::class);
8970
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been restarted'), self::equalTo([
@@ -115,26 +96,6 @@ public function testSubscriberLogOnWorkerRunningWithoutExecutedTask(): void
11596
$workerLifecycleSubscriber->onWorkerRunning(new WorkerRunningEvent($worker));
11697
}
11798

118-
public function testSubscriberLogOnWorkerRunningWithoutExecutedTask(): void
119-
{
120-
$list = $this->createMock(TaskListInterface::class);
121-
$list->expects(self::once())->method('count')->willReturn(0);
122-
123-
$worker = $this->createMock(WorkerInterface::class);
124-
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
125-
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn(null);
126-
127-
$logger = $this->createMock(LoggerInterface::class);
128-
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker is currently running'), self::equalTo([
129-
'failedTasks' => 0,
130-
'lastExecutedTask' => null,
131-
'idle' => false,
132-
]));
133-
134-
$subscriber = new WorkerLifecycleSubscriber($logger);
135-
$subscriber->onWorkerRunning(new WorkerRunningEvent($worker));
136-
}
137-
13899
public function testSubscriberLogOnWorkerRunning(): void
139100
{
140101
$task = $this->createMock(TaskInterface::class);
@@ -145,7 +106,7 @@ public function testSubscriberLogOnWorkerRunning(): void
145106

146107
$worker = $this->createMock(WorkerInterface::class);
147108
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
148-
$worker->expects(self::exactly(2))->method('getLastExecutedTask')->willReturn($task);
109+
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn($task);
149110

150111
$logger = $this->createMock(LoggerInterface::class);
151112
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker is currently running'), self::equalTo([
@@ -177,25 +138,6 @@ public function testSubscriberLogOnWorkerStartedWithoutExecutedTask(): void
177138
$workerLifecycleSubscriber->onWorkerStarted(new WorkerStartedEvent($worker));
178139
}
179140

180-
public function testSubscriberLogOnWorkerStartedWithoutExecutedTask(): void
181-
{
182-
$list = $this->createMock(TaskListInterface::class);
183-
$list->expects(self::once())->method('count')->willReturn(0);
184-
185-
$worker = $this->createMock(WorkerInterface::class);
186-
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
187-
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn(null);
188-
189-
$logger = $this->createMock(LoggerInterface::class);
190-
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been started'), self::equalTo([
191-
'failedTasks' => 0,
192-
'lastExecutedTask' => null,
193-
]));
194-
195-
$subscriber = new WorkerLifecycleSubscriber($logger);
196-
$subscriber->onWorkerStarted(new WorkerStartedEvent($worker));
197-
}
198-
199141
public function testSubscriberLogOnWorkerStarted(): void
200142
{
201143
$task = $this->createMock(TaskInterface::class);
@@ -206,7 +148,7 @@ public function testSubscriberLogOnWorkerStarted(): void
206148

207149
$worker = $this->createMock(WorkerInterface::class);
208150
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
209-
$worker->expects(self::exactly(2))->method('getLastExecutedTask')->willReturn($task);
151+
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn($task);
210152

211153
$logger = $this->createMock(LoggerInterface::class);
212154
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been started'), self::equalTo([
@@ -237,25 +179,6 @@ public function testSubscriberLogOnWorkerStoppedWithoutExecutedTask(): void
237179
$workerLifecycleSubscriber->onWorkerStopped(new WorkerStoppedEvent($worker));
238180
}
239181

240-
public function testSubscriberLogOnWorkerStoppedWithoutExecutedTask(): void
241-
{
242-
$list = $this->createMock(TaskListInterface::class);
243-
$list->expects(self::once())->method('count')->willReturn(0);
244-
245-
$worker = $this->createMock(WorkerInterface::class);
246-
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
247-
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn(null);
248-
249-
$logger = $this->createMock(LoggerInterface::class);
250-
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been stopped'), self::equalTo([
251-
'failedTasks' => 0,
252-
'lastExecutedTask' => null,
253-
]));
254-
255-
$subscriber = new WorkerLifecycleSubscriber($logger);
256-
$subscriber->onWorkerStopped(new WorkerStoppedEvent($worker));
257-
}
258-
259182
public function testSubscriberLogOnWorkerStopped(): void
260183
{
261184
$task = $this->createMock(TaskInterface::class);
@@ -266,7 +189,7 @@ public function testSubscriberLogOnWorkerStopped(): void
266189

267190
$worker = $this->createMock(WorkerInterface::class);
268191
$worker->expects(self::once())->method('getFailedTasks')->willReturn($list);
269-
$worker->expects(self::exactly(2))->method('getLastExecutedTask')->willReturn($task);
192+
$worker->expects(self::once())->method('getLastExecutedTask')->willReturn($task);
270193

271194
$logger = $this->createMock(LoggerInterface::class);
272195
$logger->expects(self::once())->method('info')->with(self::equalTo('The worker has been stopped'), self::equalTo([

‎tests/Serializer/TaskNormalizerTest.php‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -950,48 +950,6 @@ public function testChainedTaskWithCommandTaskCanBeDenormalized(): void
950950
self::assertContains('-vvv', $fooThirdTask->getOptions());
951951
}
952952

953-
public function testChainedTaskWithCommandTaskCanBeDenormalized(): void
954-
{
955-
$objectNormalizer = new ObjectNormalizer(null, null, null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]));
956-
$notificationTaskBagNormalizer = new NotificationTaskBagNormalizer($objectNormalizer);
957-
958-
$serializer = new Serializer([
959-
$notificationTaskBagNormalizer,
960-
new TaskNormalizer(new DateTimeNormalizer(), new DateTimeZoneNormalizer(), new DateIntervalNormalizer(), $objectNormalizer, $notificationTaskBagNormalizer),
961-
new DateTimeNormalizer(),
962-
new DateIntervalNormalizer(),
963-
new JsonSerializableNormalizer(),
964-
$objectNormalizer,
965-
], [new JsonEncoder()]);
966-
$objectNormalizer->setSerializer($serializer);
967-
968-
$data = $serializer->serialize(new ChainedTask(
969-
'foo',
970-
new ShellTask('bar', ['echo', 'Symfony']),
971-
new CommandTask('foo_second', 'cache:clear', [], ['--no-warmup']),
972-
new CommandTask('foo_third', 'cache:clear', [], ['--no-warmup'])
973-
), 'json');
974-
$task = $serializer->deserialize($data, TaskInterface::class, 'json');
975-
976-
self::assertInstanceOf(ChainedTask::class, $task);
977-
self::assertNotEmpty($task->getTasks());
978-
self::assertCount(3, $task->getTasks());
979-
self::assertInstanceOf(ShellTask::class, $task->getTask(0));
980-
self::assertSame('bar', $task->getTask(0)->getName());
981-
982-
self::assertInstanceOf(CommandTask::class, $task->getTask(1));
983-
self::assertSame('foo_second', $task->getTask(1)->getName());
984-
self::assertSame('cache:clear', $task->getTask(1)->getCommand());
985-
self::assertEmpty($task->getTask(1)->getArguments());
986-
self::assertNotEmpty($task->getTask(1)->getOptions());
987-
988-
self::assertInstanceOf(CommandTask::class, $task->getTask(2));
989-
self::assertSame('foo_third', $task->getTask(2)->getName());
990-
self::assertSame('cache:clear', $task->getTask(2)->getCommand());
991-
self::assertEmpty($task->getTask(2)->getArguments());
992-
self::assertNotEmpty($task->getTask(2)->getOptions());
993-
}
994-
995953
public function testShellTaskWithBeforeSchedulingNotificationTaskBagCanBeNormalized(): void
996954
{
997955
$objectNormalizer = new ObjectNormalizer(null, null, null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]));

0 commit comments

Comments
 (0)