add utcnow

Author: tocsoft

Tocsoft.DateTimeAbstractions.Analyzer.Test/TocsoftDateTimeAbstractionsAnalyzerUnitTests.cs

@@ -97,6 +97,46 @@ public TypeName(){
             VerifyCSharpFix(test, fixtest);
         }
 
+        [TestMethod]
+        public void DateTimeUtcNowMappsToClockUtcNow()
+        {
+            var test = @"
+using System;
+namespace TestApplication
+{
+    class TypeName
+    {   
+        public TypeName(){
+            DateTime time = DateTime.UtcNow;
+        }
+    }
+}";
+            AdditionalCodeFiles = new[] {
+                @"
+using System;
+
+namespace Tocsoft.DateTimeAbstractions
+{
+    public static class Clock { public static DateTime UtcNow { get; set; } }
+}"
+            };
+
+            var fixtest = @"
+using System;
+using Tocsoft.DateTimeAbstractions;
+
+namespace TestApplication
+{
+    class TypeName
+    {   
+        public TypeName(){
+            DateTime time = Clock.UtcNow;
+        }
+    }
+}";
+            VerifyCSharpFix(test, fixtest);
+        }
+
         protected override CodeFixProvider GetCSharpCodeFixProvider()
         {
             return new DateTimeUsageCodeFixProvider();

Tocsoft.DateTimeAbstractions.Analyzer/DateTimeUsageCodeFixProvider.cs

@@ -33,10 +33,8 @@ public sealed override FixAllProvider GetFixAllProvider()
             return WellKnownFixAllProviders.BatchFixer;
         }
 
-        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+        public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-           
-            // TODO: Replace the following code with your own analysis, generating a CodeAction for each fix to suggest
             var diagnostic = context.Diagnostics.First();
 
             // Register a code action that will invoke the fix.
@@ -46,6 +44,8 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     createChangedDocument: c => ReplaceWithCallToClock(context, c),
                     equivalenceKey: title),
                 diagnostic);
+
+            return Task.CompletedTask;
         }
 
         private async Task<Document> ReplaceWithCallToClock(CodeFixContext context, CancellationToken cancellationToken)
@@ -54,7 +54,7 @@ private async Task<Document> ReplaceWithCallToClock(CodeFixContext context, Canc
 
             var root = await context.Document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
 
-            // this is us accessing the proeprty on datetime i.e. the call to 'DateTime.Now'
+            // this is us accessing the property on datetime i.e. the call to 'DateTime.Now'
 
             root = await ReplaceMemberCall(context, root).ConfigureAwait(false);
             root = ApplyUsings(root);

Tocsoft.DateTimeAbstractions.Tests/AsyncScoppedClock.cs

@@ -8,6 +8,38 @@ namespace Tocsoft.DateTimeAbstractions.Tests
 {
     public class AsyncScoppedClock
     {
+        [Fact]
+        public void LocalTimeConfiguredStaticProviderNowAlwausReturnsLocalTime()
+        {
+            var p = new StaticDateTimeProvider(new DateTime(2000, 01, 01, 1, 2, 3, DateTimeKind.Local));
+            var localTime = p.Now();
+            Assert.Equal(DateTimeKind.Local, localTime.Kind);
+        }
+
+        [Fact]
+        public void UtcTimeConfiguredStaticProviderNowAlwausReturnsLocalTime()
+        {
+            var p = new StaticDateTimeProvider(new DateTime(2000, 01, 01, 1, 2, 3, DateTimeKind.Utc));
+            var localTime = p.Now();
+            Assert.Equal(DateTimeKind.Local, localTime.Kind);
+        }
+
+        [Fact]
+        public void LocalTimeConfiguredStaticProviderUtcNowAlwausReturnsUtcTime()
+        {
+            var p = new StaticDateTimeProvider(new DateTime(2000, 01, 01, 1, 2, 3, DateTimeKind.Local));
+            var localTime = p.UtcNow();
+            Assert.Equal(DateTimeKind.Utc, localTime.Kind);
+        }
+
+        [Fact]
+        public void UtcTimeConfiguredStaticProviderUtcNowAlwausReturnsUtcTime()
+        {
+            var p = new StaticDateTimeProvider(new DateTime(2000, 01, 01, 1, 2, 3, DateTimeKind.Utc));
+            var localTime = p.UtcNow();
+            Assert.Equal(DateTimeKind.Utc, localTime.Kind);
+        }
+
         [Theory]
         [InlineData(1)]
         [InlineData(100)]
@@ -64,8 +96,6 @@ private async Task RunTest(int count)
             // we move away from the pinned after the using statement
             Assert.NotEqual(date, Clock.Now);
 
-            Clock.DefaultProvider = new UtcCurrentDateTimeProvider();
-
             using (Clock.Pin(new StaticDateTimeProvider(date)))
             {
                 var task1 = DelayedNow(true);
@@ -102,15 +132,15 @@ public async Task PinSubContext()
 
         public async Task<DateTime> DelayedNow(bool continueOnCapturedContext)
         {
-            await Task.Delay(1).ConfigureAwait(continueOnCapturedContext); // to force a propert delay
+            await Task.Delay(1).ConfigureAwait(continueOnCapturedContext); // to force a proper delay
             return Clock.Now;
         }
 
         public async Task<DateTime> DelayedDate(DateTime pinnedDate)
         {
             using (Clock.Pin(new StaticDateTimeProvider(pinnedDate)))
             {
-                await Task.Delay(1); // to force a propert delay
+                await Task.Delay(1); // to force a proper delay
                 return Clock.Now;
             }
         }

Tocsoft.DateTimeAbstractions/Clock.cs

@@ -65,5 +65,6 @@ public void Dispose()
         }
 
         public static DateTime Now => CurrentProvider.Now();
+        public static DateTime UtcNow => CurrentProvider.UtcNow();
     }
 }

Tocsoft.DateTimeAbstractions/Providers/CurrentDateTimeProvider.cs

@@ -5,6 +5,11 @@ namespace Tocsoft.DateTimeAbstractions.Providers
     public class CurrentDateTimeProvider : DateTimeProvider
     {
         public override DateTime Now()
+        {
+            return DateTime.Now;
+        }
+
+        public override DateTime UtcNow()
         {
             return DateTime.UtcNow;
         }

Tocsoft.DateTimeAbstractions/Providers/DateTimeProvider.cs

@@ -5,5 +5,6 @@ namespace Tocsoft.DateTimeAbstractions.Providers
     public abstract class DateTimeProvider
     {
         public abstract DateTime Now();
+        public abstract DateTime UtcNow();
     }
 }

Tocsoft.DateTimeAbstractions/Providers/StaticDateTimeProvider.cs

@@ -4,16 +4,31 @@ namespace Tocsoft.DateTimeAbstractions.Providers
 {
     public class StaticDateTimeProvider : DateTimeProvider
     {
+        private readonly DateTime utcdate;
+
         private readonly DateTime date;
 
         public StaticDateTimeProvider(DateTime date)
         {
-            this.date = date;
+            if (date.Kind == DateTimeKind.Utc)
+            {
+                this.utcdate = date;
+                this.date = date.ToLocalTime();
+            }
+            else
+            {
+                this.date = date;
+                this.utcdate = date.ToUniversalTime();
+            }
         }
 
         public override DateTime Now()
         {
             return date;
         }
+        public override DateTime UtcNow()
+        {
+            return utcdate;
+        }
     }
 }