fixed: FakeClock value changes must be atomic

revoframework · Jun 24, 2024 · 2853441 · 2853441
1 parent d86cc06
commit 2853441
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - fixed LambdaCommandBusExtensions return values
+- fixed: FakeClock value changes must be atomic
 
 ### Changed
 

diff --git a/Revo.Testing/Core/FakeClock.cs b/Revo.Testing/Core/FakeClock.cs
@@ -6,13 +6,13 @@ namespace Revo.Testing.Core
 {
     public static class FakeClock
     {
-        private static readonly AsyncLocal<FakeClockImpl> ClockLocal = new AsyncLocal<FakeClockImpl>();
-        private static readonly object SetupLock = new object();
+        private static readonly AsyncLocal<FakeClockImpl> ClockLocal = new();
+        private static readonly object SetupLock = new();
 
         public static DateTimeOffset Now
         {
-            get { return Clock.Now; }
-            set { Clock.Now = value; }
+            get => Clock.Now;
+            set => Clock.Now = value;
         }
 
         private static FakeClockImpl Clock
@@ -30,21 +30,33 @@ private static FakeClockImpl Clock
 
         public static void Setup()
         {
+            Now = DateTimeOffset.Now;
+
             lock (SetupLock)
             {
                 if (!(Revo.Core.Core.Clock.Current is FakeClockImpl))
                 {
                     Revo.Core.Core.Clock.SetClock(() => Clock);
                 }
             }
-
-            Now = DateTimeOffset.Now;
         }
 
         public class FakeClockImpl : IClock
         {
-            public DateTimeOffset Now { get; set; }
+            private DateTimeOffsetBoxed boxed = new(DateTimeOffset.Now);
+
+            public DateTimeOffset Now
+            {
+                get => boxed.Value;
+                set => boxed = new DateTimeOffsetBoxed(value);
+            }
+
             public DateTimeOffset UtcNow => Now.ToUniversalTime();
         }
+
+        private class DateTimeOffsetBoxed(DateTimeOffset value)
+        {
+            public DateTimeOffset Value { get; } = value;
+        }
     }
 }