fixes

Author: dgafka

packages/Ecotone/src/Test/StaticPsrClock.php

@@ -16,17 +16,22 @@ final class StaticPsrClock implements ClockInterface, SleepInterface
 {
     private ?DateTimeImmutable $frozenTime = null;
     private bool $hasBeenChanged = false;
+    private Duration $sleepDuration;
 
-    public function __construct(?string $now = null)
+    public function __construct(private ?string $now = null)
     {
-        if ($now !== null) {
-            $this->frozenTime = new DateTimeImmutable($now);
-        }
+        $this->sleepDuration = Duration::zero();
     }
 
     public function now(): DateTimeImmutable
     {
-        return $this->frozenTime ?? new DateTimeImmutable();
+        if ($this->frozenTime !== null) {
+            return $this->frozenTime;
+        }
+
+        $now = $this->now === null ? new DateTimeImmutable() : new DateTimeImmutable($this->now);
+
+        return $now->modify("+{$this->sleepDuration->zeroIfNegative()->inMicroseconds()} microseconds");
     }
 
     public function sleep(Duration $duration): void

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

@@ -175,6 +175,17 @@ public function test_time_advances_before_change_time_is_called(): void
         $this->assertGreaterThan($time1, $time2);
     }
 
+    public function test_time_advances_when_constructed_with_now_string(): void
+    {
+        $clock = new StaticPsrClock('now');
+
+        $time1 = $clock->now();
+        usleep(1000);
+        $time2 = $clock->now();
+
+        $this->assertGreaterThan($time1, $time2);
+    }
+
     public function test_time_freezes_after_change_time_with_duration(): void
     {
         $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
@@ -194,4 +205,28 @@ public function test_time_freezes_after_change_time_with_duration(): void
 
         $this->assertEquals($time1, $time2);
     }
+
+    public function test_time_advances_when_constructed_with_null(): void
+    {
+        $clock = new StaticPsrClock(null);
+
+        $time1 = $clock->now();
+        usleep(1000);
+        $time2 = $clock->now();
+
+        $this->assertGreaterThan($time1, $time2);
+    }
+
+    public function test_time_freezes_after_sleep_is_called(): void
+    {
+        $clock = new StaticPsrClock('now');
+
+        $clock->sleep(Duration::seconds(1));
+
+        $time1 = $clock->now();
+        usleep(1000);
+        $time2 = $clock->now();
+
+        $this->assertEquals($time1, $time2);
+    }
 }