Utc method should return the Utc DateTimeKind (#126)

+ Updated unit tests to properly compare expected and output
M-Files · Feb 21, 2024 · 77fee5b · 77fee5b
1 parent c874758
commit 77fee5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/MFiles.VAF.Extensions.Tests/ExtensionMethods/TimeZoneInformationExtensionMethodsTests.cs b/MFiles.VAF.Extensions.Tests/ExtensionMethods/TimeZoneInformationExtensionMethodsTests.cs
@@ -23,14 +23,7 @@ DateTime expected
 
 			var output = tzMock.Object.EnsureLocalTime(input);
 			Assert.AreEqual(expected.ToString(), output.ToString());
-			Assert.AreEqual
-			(
-				expected.Kind, 
-				input.Kind == DateTimeKind.Unspecified
-					? DateTimeKind.Unspecified
-					: DateTimeKind.Local
-			);
-
+			Assert.AreEqual(expected.Kind, output.Kind);
 		}
 
 		public static IEnumerable<object[]> GetEnsureLocalTimeData()
@@ -69,14 +62,7 @@ DateTime expected
 
 			var output = tzMock.Object.EnsureUTCTime(input);
 			Assert.AreEqual(expected.ToString(), output.ToString());
-			Assert.AreEqual
-			(
-				expected.Kind,
-				input.Kind == DateTimeKind.Unspecified
-					? DateTimeKind.Unspecified
-					: DateTimeKind.Utc
-			);
-
+			Assert.AreEqual(expected.Kind, output.Kind);
 		}
 
 		public static IEnumerable<object[]> GetEnsureUtcTimeData()

diff --git a/MFiles.VAF.Extensions/ExtensionMethods/TimeZoneInformationExtensionMethods.cs b/MFiles.VAF.Extensions/ExtensionMethods/TimeZoneInformationExtensionMethods.cs
@@ -98,7 +98,7 @@ public static DateTime EnsureUTCTime(this TimeZoneInformation timeZoneInfo, Date
 			{
 				TimeZoneInfo tzi = TimeZoneInfo.FindSystemTimeZoneById(timeZoneInfo.StandardName);
 				var output = input.Subtract(tzi.GetUtcOffset(input));
-				return DateTime.SpecifyKind(output, DateTimeKind.Local);
+				return DateTime.SpecifyKind(output, DateTimeKind.Utc);
 			}
 			catch (Exception ex)
 			{