allow to change time using duration

Author: dgafka

packages/Ecotone/src/Lite/Test/ConfiguredMessagingSystemWithTestSupport.php

@@ -13,6 +13,7 @@
 use Ecotone\Messaging\MessageChannel;
 use Ecotone\Messaging\MessageHeaders;
 use Ecotone\Messaging\MessagePublisher;
+use Ecotone\Messaging\Scheduling\Duration;
 use Ecotone\Messaging\Scheduling\EcotoneClockInterface;
 use Ecotone\Modelling\AggregateFlow\SaveAggregate\AggregateResolver\AggregateDefinitionRegistry;
 use Ecotone\Modelling\CommandBus;
@@ -134,21 +135,26 @@ public function replaceWith(ConfiguredMessagingSystem $messagingSystem): void
         $this->configuredMessagingSystem->replaceWith($messagingSystem);
     }
 
-    public function withCurrentTime(DateTimeImmutable $targetTime): self
+    public function changeTime(DateTimeImmutable|Duration $time): self
     {
         $psrClock = $this->getStaticPsrClockFromContainer();
 
-        if ($psrClock->hasBeenChanged() && $targetTime <= $psrClock->now()) {
+        if ($time instanceof Duration) {
+            $psrClock->sleep($time);
+            return $this;
+        }
+
+        if ($psrClock->hasBeenChanged() && $time <= $psrClock->now()) {
             throw new InvalidArgumentException(
                 sprintf(
                     'Cannot move time backwards. Current clock time: %s, requested time: %s',
                     $psrClock->now()->format('Y-m-d H:i:s.u'),
-                    $targetTime->format('Y-m-d H:i:s.u')
+                    $time->format('Y-m-d H:i:s.u')
                 )
             );
         }
 
-        $psrClock->setCurrentTime($targetTime);
+        $psrClock->setCurrentTime($time);
 
         return $this;
     }

packages/Ecotone/src/Lite/Test/FlowTestSupport.php

@@ -19,6 +19,7 @@
 use Ecotone\Messaging\MessagingException;
 use Ecotone\Messaging\PollableChannel;
 use Ecotone\Messaging\Scheduling\Clock;
+use Ecotone\Messaging\Scheduling\Duration;
 use Ecotone\Messaging\Scheduling\EcotoneClockInterface;
 use Ecotone\Messaging\Scheduling\TimeSpan;
 use Ecotone\Messaging\Support\Assert;
@@ -211,21 +212,26 @@ public function waitTill(TimeSpan|DateTimeInterface $time): self
         return $this;
     }
 
-    public function withCurrentTime(DateTimeImmutable $targetTime): self
+    public function changeTime(DateTimeImmutable|Duration $time): self
     {
         $psrClock = $this->getStaticPsrClockFromContainer();
 
-        if ($psrClock->hasBeenChanged() && $targetTime <= $psrClock->now()) {
+        if ($time instanceof Duration) {
+            $psrClock->sleep($time);
+            return $this;
+        }
+
+        if ($psrClock->hasBeenChanged() && $time <= $psrClock->now()) {
             throw new InvalidArgumentException(
                 \sprintf(
                     'Cannot move time backwards. Current clock time: %s, requested time: %s',
                     $psrClock->now()->format('Y-m-d H:i:s.u'),
-                    $targetTime->format('Y-m-d H:i:s.u')
+                    $time->format('Y-m-d H:i:s.u')
                 )
             );
         }
 
-        $psrClock->setCurrentTime($targetTime);
+        $psrClock->setCurrentTime($time);
 
         return $this;
     }

packages/Ecotone/tests/Messaging/Integration/Scheduling/DelayedMessageAgainstGlobalClockTest.php

@@ -89,7 +89,7 @@ public function test_delayed_message_observes_clock_changes_natively_by_moving_t
         );
     }
 
-    public function test_delayed_message_is_released_when_moving_time_forward_using_with_current_time(): void
+    public function test_delayed_message_is_released_when_moving_time_forward_using_change_time(): void
     {
         $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
             [OrderService::class, NotificationService::class, CustomNotifier::class],
@@ -104,13 +104,34 @@ public function test_delayed_message_is_released_when_moving_time_forward_using_
         $ecotoneTestSupport->run('notifications');
         $this->assertCount(0, $notifier->getNotificationsOf('placedOrder'));
 
-        $ecotoneTestSupport->withCurrentTime(new \DateTimeImmutable('2025-08-11 16:01:01'));
+        $ecotoneTestSupport->changeTime(new \DateTimeImmutable('2025-08-11 16:01:01'));
         $ecotoneTestSupport->run('notifications');
 
         $this->assertCount(1, $notifier->getNotificationsOf('placedOrder'));
     }
 
-    public function test_first_with_current_time_call_allows_any_time(): void
+    public function test_delayed_message_is_released_when_advancing_time_using_duration(): void
+    {
+        $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
+            [OrderService::class, NotificationService::class, CustomNotifier::class],
+            [ClockInterface::class => new StaticPsrClock('2025-08-11 16:00:00'), new OrderService(), new NotificationService(), $notifier = new CustomNotifier()],
+            enableAsynchronousProcessing: [
+                SimpleMessageChannelBuilder::createQueueChannel('notifications', true),
+            ]
+        );
+
+        $ecotoneTestSupport->sendCommandWithRoutingKey('order.register', new PlaceOrder('123'));
+
+        $ecotoneTestSupport->run('notifications');
+        $this->assertCount(0, $notifier->getNotificationsOf('placedOrder'));
+
+        $ecotoneTestSupport->changeTime(Duration::minutes(2));
+        $ecotoneTestSupport->run('notifications');
+
+        $this->assertCount(1, $notifier->getNotificationsOf('placedOrder'));
+    }
+
+    public function test_first_change_time_call_allows_any_time(): void
     {
         $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
             [OrderService::class, NotificationService::class, CustomNotifier::class],
@@ -120,12 +141,12 @@ public function test_first_with_current_time_call_allows_any_time(): void
             ]
         );
 
-        $ecotoneTestSupport->withCurrentTime(new \DateTimeImmutable('2020-01-01 12:00:00'));
+        $ecotoneTestSupport->changeTime(new \DateTimeImmutable('2020-01-01 12:00:00'));
 
         $this->assertEquals('2020-01-01 12:00:00', $ecotoneTestSupport->getServiceFromContainer(ClockInterface::class)->now()->format('Y-m-d H:i:s'));
     }
 
-    public function test_with_current_time_throws_exception_when_moving_backwards_after_first_setup(): void
+    public function test_change_time_throws_exception_when_moving_backwards_after_first_setup(): void
     {
         $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
             [OrderService::class, NotificationService::class, CustomNotifier::class],
@@ -135,11 +156,11 @@ public function test_with_current_time_throws_exception_when_moving_backwards_af
             ]
         );
 
-        $ecotoneTestSupport->withCurrentTime(new \DateTimeImmutable('2025-08-11 17:00:00'));
+        $ecotoneTestSupport->changeTime(new \DateTimeImmutable('2025-08-11 17:00:00'));
 
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Cannot move time backwards');
 
-        $ecotoneTestSupport->withCurrentTime(new \DateTimeImmutable('2025-08-11 16:30:00'));
+        $ecotoneTestSupport->changeTime(new \DateTimeImmutable('2025-08-11 16:30:00'));
     }
 }