Tidy up code and syntax

MJB222398 · Oct 29, 2021 · 81ae863 · 81ae863
1 parent d53812b
commit 81ae863
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/Abstractions.DateAndTime.ExampleApp.Tests/DateTimeHelperTests.cs b/Abstractions.DateAndTime.ExampleApp.Tests/DateTimeHelperTests.cs
@@ -22,26 +22,26 @@ public DateTimeHelperTests()
         [Test]
         public void FormatCurrentDateTime_ReturnsCorrectlyFormattedDateTime()
         {
-            // ARRANGE
+            // Arrange
             A.CallTo(() => _dateTimeService.Now()).Returns(new DateTime(2021, 6, 20, 13, 21, 04));
 
-            // ACT
+            // Act
             var formattedCurrentDateTime = _dateTimeHelper.FormatCurrentDateTime();
 
-            //ASSERT
+            // Assert
             Assert.That(formattedCurrentDateTime, Is.EqualTo("20/06/2021 13:21:04"));
         }
 
         [Test]
         public void FormatCurrentOffsetDateTime_ReturnsCorrectlyFormattedDateTime()
         {
-            // ARRANGE
+            // Arrange
             A.CallTo(() => _dateTimeOffsetService.Now()).Returns(new DateTimeOffset(2021, 6, 20, 13, 21, 04, new TimeSpan(2, 0, 0)));
 
-            // ACT
+            // Act
             var formattedCurrentOffsetDateTime = _dateTimeHelper.FormatCurrentOffsetDateTime();
 
-            //ASSERT
+            // Assert
             Assert.That(formattedCurrentOffsetDateTime, Is.EqualTo("20/06/2021 13:21:04 +02:00"));
         }
     }

diff --git a/Abstractions.DateAndTime.ExampleApp/Program.cs b/Abstractions.DateAndTime.ExampleApp/Program.cs
@@ -21,13 +21,12 @@ static void Main(string[] args)
 
         private static IServiceProvider GetServiceProvider()
         {
-            var services = new ServiceCollection();
-            services.AddSingleton<IConsoleOutputManager, ConsoleOutputManager>();
-            services.AddSingleton<IDateTimeHelper, DateTimeHelper>();
-            services.AddDateTimeService();
-            services.AddDateTimeOffsetService();
-
-            return services.BuildServiceProvider();
+            return new ServiceCollection()
+                .AddSingleton<IConsoleOutputManager, ConsoleOutputManager>()
+                .AddSingleton<IDateTimeHelper, DateTimeHelper>()
+                .AddDateTimeService()
+                .AddDateTimeOffsetService()
+                .BuildServiceProvider();
         }
     }
 }
diff --git a/Abstractions.DateAndTime/DateTimeOffsetService/DateTimeOffsetService.cs b/Abstractions.DateAndTime/DateTimeOffsetService/DateTimeOffsetService.cs
@@ -4,10 +4,6 @@ namespace Abstractions.DateAndTime.Services
 {
     public class DateTimeOffsetService : IDateTimeOffsetService
     {
-        public DateTimeOffsetService()
-        {
-        }
-
         public DateTimeOffset Now()
         {
             return DateTimeOffset.Now;

diff --git a/Abstractions.DateAndTime/DateTimeService/DateTimeService.cs b/Abstractions.DateAndTime/DateTimeService/DateTimeService.cs
@@ -4,10 +4,6 @@ namespace Abstractions.DateAndTime.Services
 {
     public class DateTimeService : IDateTimeService
     {
-        public DateTimeService()
-        {
-        }
-
         public DateTime Now()
         {
             return DateTime.Now;

diff --git a/Abstractions.DateAndTime/Extensions/ServiceCollectionExtensions.cs b/Abstractions.DateAndTime/Extensions/ServiceCollectionExtensions.cs
@@ -11,19 +11,15 @@ public static IServiceCollection AddDateTimeService(this IServiceCollection serv
             if (services == null)
                 throw new ArgumentNullException(nameof(services));
 
-            services.AddSingleton<IDateTimeService, DateTimeService>();
-
-            return services;
+            return services.AddSingleton<IDateTimeService, DateTimeService>();
         }
 
         public static IServiceCollection AddDateTimeOffsetService(this IServiceCollection services)
         {
             if (services == null)
                 throw new ArgumentNullException(nameof(services));
 
-            services.AddSingleton<IDateTimeOffsetService, DateTimeOffsetService>();
-
-            return services;
+            return services.AddSingleton<IDateTimeOffsetService, DateTimeOffsetService>();
         }
     }
 }
diff --git a/README.md b/README.md
@@ -57,13 +57,13 @@ public DateTimeHelperTests()
 [Test]
 public void FormatCurrentDateTime_ReturnsCorrectlyFormattedDateTime()
 {
-    // ARRANGE
+    // Arrange
     A.CallTo(() => _dateTimeService.Now()).Returns(new DateTime(2021, 6, 20, 13, 21, 04));
 
-    // ACT
+    // Act
     var formattedCurrentDateTime = _dateTimeHelper.FormatCurrentDateTime();
 
-    //ASSERT
+    // Assert
     Assert.That(formattedCurrentDateTime, Is.EqualTo("20/06/2021 13:21:04"));
 }
 ```