Update DispatchSchedulerEventListenerTest.php

bartholdbos · bartholdbos · commit 548551ee27e7 · 2024-12-20T16:51:22.000+01:00
diff --git a/src/Symfony/Component/Scheduler/Tests/EventListener/DispatchSchedulerEventListenerTest.php b/src/Symfony/Component/Scheduler/Tests/EventListener/DispatchSchedulerEventListenerTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
+use Symfony\Component\Messenger\Stamp\HandledStamp;
 use Symfony\Component\Scheduler\Event\FailureEvent;
 use Symfony\Component\Scheduler\Event\PostRunEvent;
 use Symfony\Component\Scheduler\Event\PreRunEvent;
@@ -44,7 +45,7 @@ public function testDispatchSchedulerEvents()
 
         $listener = new DispatchSchedulerEventListener($scheduleProviderLocator, $eventDispatcher = new EventDispatcher());
         $workerReceivedEvent = new WorkerMessageReceivedEvent($envelope, 'default');
-        $workerHandledEvent = new WorkerMessageHandledEvent($envelope, 'default');
+        $workerHandledEvent = new WorkerMessageHandledEvent($envelope->with(new HandledStamp('result', 'handlerName')), 'default');
         $workerFailedEvent = new WorkerMessageFailedEvent($envelope, 'default', new \Exception());
         $secondListener = new TestEventListener();
 
@@ -55,33 +56,34 @@ public function testDispatchSchedulerEvents()
         $listener->onMessageHandled($workerHandledEvent);
         $listener->onMessageFailed($workerFailedEvent);
 
-        $this->assertTrue($secondListener->preInvoked);
-        $this->assertTrue($secondListener->postInvoked);
-        $this->assertTrue($secondListener->failureInvoked);
+        $this->assertInstanceOf(PreRunEvent::class, $secondListener->preRunEvent);
+        $this->assertEquals('result', $secondListener->postRunEvent->getResult());
+        $this->assertInstanceOf(PostRunEvent::class, $secondListener->postRunEvent);
+        $this->assertInstanceOf(FailureEvent::class, $secondListener->failureEvent);
+        $this->assertEquals(new \Exception(), $secondListener->failureEvent->getError());
     }
 }
 
 class TestEventListener
 {
-    public string $name;
-    public bool $preInvoked = false;
-    public bool $postInvoked = false;
-    public bool $failureInvoked = false;
+    public ?PreRunEvent $preRunEvent = null;
+    public ?PostRunEvent $postRunEvent = null;
+    public ?FailureEvent $failureEvent = null;
 
     /* Listener methods */
 
     public function preRun($e)
     {
-        $this->preInvoked = true;
+        $this->preRunEvent = $e;
     }
 
     public function postRun($e)
     {
-        $this->postInvoked = true;
+        $this->postRunEvent = $e;
     }
 
     public function onFailure($e)
     {
-        $this->failureInvoked = true;
+        $this->failureEvent = $e;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;`
`19`	`19`	`use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;`
`20`	`20`	`use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;`
	`21`	`+use Symfony\Component\Messenger\Stamp\HandledStamp;`
`21`	`22`	`use Symfony\Component\Scheduler\Event\FailureEvent;`
`22`	`23`	`use Symfony\Component\Scheduler\Event\PostRunEvent;`
`23`	`24`	`use Symfony\Component\Scheduler\Event\PreRunEvent;`
`@@ -44,7 +45,7 @@ public function testDispatchSchedulerEvents()`
`44`	`45`
`45`	`46`	`$listener = new DispatchSchedulerEventListener($scheduleProviderLocator, $eventDispatcher = new EventDispatcher());`
`46`	`47`	`$workerReceivedEvent = new WorkerMessageReceivedEvent($envelope, 'default');`
`47`		`- $workerHandledEvent = new WorkerMessageHandledEvent($envelope, 'default');`
	`48`	`+ $workerHandledEvent = new WorkerMessageHandledEvent($envelope->with(new HandledStamp('result', 'handlerName')), 'default');`
`48`	`49`	`$workerFailedEvent = new WorkerMessageFailedEvent($envelope, 'default', new \Exception());`
`49`	`50`	`$secondListener = new TestEventListener();`
`50`	`51`
`@@ -55,33 +56,34 @@ public function testDispatchSchedulerEvents()`
`55`	`56`	`$listener->onMessageHandled($workerHandledEvent);`
`56`	`57`	`$listener->onMessageFailed($workerFailedEvent);`
`57`	`58`
`58`		`- $this->assertTrue($secondListener->preInvoked);`
`59`		`- $this->assertTrue($secondListener->postInvoked);`
`60`		`- $this->assertTrue($secondListener->failureInvoked);`
	`59`	`+ $this->assertInstanceOf(PreRunEvent::class, $secondListener->preRunEvent);`
	`60`	`+ $this->assertEquals('result', $secondListener->postRunEvent->getResult());`
	`61`	`+ $this-& 10000 gt;assertInstanceOf(PostRunEvent::class, $secondListener->postRunEvent);`
	`62`	`+ $this->assertInstanceOf(FailureEvent::class, $secondListener->failureEvent);`
	`63`	`+ $this->assertEquals(new \Exception(), $secondListener->failureEvent->getError());`
`61`	`64`	`}`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`class TestEventListener`
`65`	`68`	`{`
`66`		`- public string $name;`
`67`		`- public bool $preInvoked = false;`
`68`		`- public bool $postInvoked = false;`
`69`		`- public bool $failureInvoked = false;`
	`69`	`+ public ?PreRunEvent $preRunEvent = null;`
	`70`	`+ public ?PostRunEvent $postRunEvent = null;`
	`71`	`+ public ?FailureEvent $failureEvent = null;`
`70`	`72`
`71`	`73`	`/* Listener methods */`
`72`	`74`
`73`	`75`	`public function preRun($e)`
`74`	`76`	`{`
`75`		`- $this->preInvoked = true;`
	`77`	`+ $this->preRunEvent = $e;`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`public function postRun($e)`
`79`	`81`	`{`
`80`		`- $this->postInvoked = true;`
	`82`	`+ $this->postRunEvent = $e;`
`81`	`83`	`}`
`82`	`84`
`83`	`85`	`public function onFailure($e)`
`84`	`86`	`{`
`85`		`- $this->failureInvoked = true;`
	`87`	`+ $this->failureEvent = $e;`
`86`	`88`	`}`
`87`	`89`	`}`