dotnet · tarekgh · Dec 12, 2018 · Dec 9, 2018 · Dec 10, 2018 · Dec 10, 2018
diff --git a/src/System.Runtime/tests/System/DateTimeTests.cs b/src/System.Runtime/tests/System/DateTimeTests.cs
@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
 using Xunit;
 
 namespace System.Tests
@@ -721,7 +722,7 @@ public void Subtract_TimeSpan_ReturnsExpected(DateTime dateTime, TimeSpan timeSp
             Assert.Equal(expected, dateTime.Subtract(timeSpan));
             Assert.Equal(expected, dateTime - timeSpan);
         }
-        
+
         public static IEnumerable<object[]> Subtract_OutOfRangeTimeSpan_TestData()
         {
             yield return new object[] { DateTime.Now, TimeSpan.MinValue };
@@ -2177,6 +2178,70 @@ public void GetObjectData_NullInfo_ThrowsArgumentNullException()
             AssertExtensions.Throws<ArgumentNullException>("info", () => ((ISerializable)DateTime.Now).GetObjectData(null, new StreamingContext()));
         }
 
+        [Fact]
+        public void TestRoundTrippingDateTimeAndFileTime()
+        {
+            // This test ensure the round tripping of DateTime with the system file time.
+            // It is important to have this working on systems supporting leap seconds as the conversion wouldn't be simple
+            // conversion but involve some OS calls to ensure the right conversion is happening.
+
+            DateTime now = DateTime.UtcNow;
+            long fileTime = now.ToFileTimeUtc();
+            DateTime roundTrippedDateTime = DateTime.FromFileTimeUtc(fileTime);
+            Assert.Equal(now, roundTrippedDateTime);
+
+            now = DateTime.Now;
+            fileTime = now.ToFileTime();
+            roundTrippedDateTime = DateTime.FromFileTime(fileTime);
+            Assert.Equal(now, roundTrippedDateTime);
+        }
+
+        [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]
+        public void TestTimeSynchronizationWithTheSystem()
+        {
+            // The reported time by the framework should be synchronized with the OS.
+            // There shouldn't be any shift by more than one second, otherwise there is something wrong.
+            // This test is useful when running on a system supporting leap seconds to ensure when the system
+            // has leap seconds, the framework reported time will still be synchronized.
+
+            SYSTEMTIME st;
+            SYSTEMTIME st1;
+
+            GetSystemTime(out st);
+            DateTime dt = DateTime.UtcNow;
+            GetSystemTime(out st1);
+
+            DateTime systemDateTimeNow1  = new DateTime(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMillisecond, DateTimeKind.Utc);
+            DateTime systemDateTimeNow2  = new DateTime(st1.wYear, st1.wMonth, st1.wDay, st1.wHour, st1.wMinute, st1.wSecond, st1.wMillisecond, DateTimeKind.Utc);
+
+            // Usually GetSystemTime and DateTime.UtcNow calls doesn't take one second to execute, if this is not the case then
+            // the thread was sleeping for awhile and we cannot test reliably on that case.
+
+            TimeSpan diff = systemDateTimeNow2 - systemDateTimeNow1;
+            if (diff < TimeSpan.FromSeconds(1))
+            {
+                diff = dt - systemDateTimeNow1;
+                Assert.True(diff < TimeSpan.FromSeconds(1), $"Reported DateTime.UtcNow {dt} is shifted by more than one second then the system time {systemDateTimeNow1}");
+            }
+        }
+
+        [DllImport("Kernel32.dll")]
+        internal static extern void GetSystemTime(out SYSTEMTIME lpSystemTime);
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct SYSTEMTIME
+        {
+            internal ushort wYear;
+            internal ushort wMonth;
+            internal ushort wDayOfWeek;
+            internal ushort wDay;
+            internal ushort wHour;
+            internal ushort wMinute;
+            internal ushort wSecond;
+            internal ushort wMillisecond;
+        }
+
         private class DateMaxCalendar : Calendar
         {
             public override int[] Eras => throw new NotImplementedException();