IDateTimeUtility をサービス化

Covid19Radar/Covid19Radar/App.xaml.cs

@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
@@ -179,6 +179,9 @@ private static void RegisterCommonTypes(IContainer container)
             container.Register<IStorageService, StorageService>(Reuse.Singleton);
 #endif
             container.Register<ISecureStorageService, SecureStorageService>(Reuse.Singleton);
+
+            // Utilities
+            container.Register<IDateTimeUtility, DateTimeUtility>(Reuse.Singleton);
         }
 
         protected override void OnStart()

Covid19Radar/Covid19Radar/Common/DateTimeUtility.cs

@@ -1,18 +1,18 @@
-using System;
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+using System;
+
 namespace Covid19Radar.Common
 {
     public interface IDateTimeUtility
     {
-        DateTime UtcNow { get; }
+        public DateTime UtcNow { get; }
     }
+
     public class DateTimeUtility : IDateTimeUtility
     {
-        public static IDateTimeUtility Instance = new DateTimeUtility();
-
-        public DateTimeUtility()
-        {
-        }
-
         public DateTime UtcNow => DateTime.UtcNow;
     }
 }

Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs

@@ -53,17 +53,25 @@ public class ExposureNotificationService : IExposureNotificationService
         private readonly ISecureStorageService secureStorageService;
         private readonly IPreferencesService preferencesService;
         private readonly IApplicationPropertyService applicationPropertyService;
+        private readonly IDateTimeUtility dateTimeUtility;
 
         public string CurrentStatusMessage { get; set; } = "初期状態";
         public Status ExposureNotificationStatus { get; set; }
 
-        public ExposureNotificationService(ILoggerService loggerService, IHttpClientService httpClientService, ISecureStorageService secureStorageService, IPreferencesService preferencesService, IApplicationPropertyService applicationPropertyService)
+        public ExposureNotificationService(
+            ILoggerService loggerService,
+            IHttpClientService httpClientService,
+            ISecureStorageService secureStorageService,
+            IPreferencesService preferencesService,
+            IApplicationPropertyService applicationPropertyService,
+            IDateTimeUtility dateTimeUtility)
         {
             this.loggerService = loggerService;
             this.httpClientService = httpClientService;
             this.secureStorageService = secureStorageService;
             this.preferencesService = preferencesService;
             this.applicationPropertyService = applicationPropertyService;
+            this.dateTimeUtility = dateTimeUtility;
 
             _ = GetExposureNotificationConfig();
         }
@@ -246,7 +254,7 @@ public List<UserExposureInfo> GetExposureInformationListToDisplay()
         {
             loggerService.StartMethod();
             var list = GetExposureInformationList()?
-                .Where(x => x.Timestamp.CompareTo(DateTimeUtility.Instance.UtcNow.AddDays(AppConstants.DaysOfExposureInformationToDisplay)) >= 0)
+                .Where(x => x.Timestamp.CompareTo(dateTimeUtility.UtcNow.AddDays(AppConstants.DaysOfExposureInformationToDisplay)) >= 0)
                 .ToList();
             loggerService.EndMethod();
             return list;

Covid19Radar/Tests/Covid19Radar.UnitTests/Services/ExposureNotificationServiceTests.cs

@@ -38,7 +38,6 @@ public ExposureNotificationServiceTests()
             mockPreferencesService = mockRepository.Create<IPreferencesService>();
             mockApplicationPropertyService = mockRepository.Create<IApplicationPropertyService>();
             mockDateTimeUtility = mockRepository.Create<IDateTimeUtility>();
-            DateTimeUtility.Instance = mockDateTimeUtility.Object;
         }
 
         private ExposureNotificationService CreateService()
@@ -48,7 +47,8 @@ private ExposureNotificationService CreateService()
                 mockHttpClientService.Object,
                 mockSecureStorageService.Object,
                 mockPreferencesService.Object,
-                mockApplicationPropertyService.Object);
+                mockApplicationPropertyService.Object,
+                mockDateTimeUtility.Object);
         }
 
         [Theory]