AsUtc should return the right UTC time associated with the CalDateTim…

…e, even if the TzId property has changed #387
ical-org · May 21, 2018 · 84ad5ae · 84ad5ae
1 parent d84cc39
commit 84ad5ae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/net-core/Ical.Net.CoreUnitTests/CalDateTimeTests.cs b/net-core/Ical.Net.CoreUnitTests/CalDateTimeTests.cs
@@ -98,5 +98,19 @@ public static IEnumerable<ITestCaseData> AsDateTimeOffsetTestCases()
                 .SetName($"Summer DateTime with no time zone information returns the system-local's UTC offset ({currentSystemOffset})")
                 .Returns(new DateTimeOffset(summerDate, currentSystemOffset));
         }
+
+        [Test(Description = "Calling AsUtc should always return the proper UTC time, even if the TzId has changed")]
+        public void TestTzidChanges()
+        {
+            var someTime = DateTimeOffset.Parse("2018-05-21T11:35:00-04:00");
+
+            var someDt = new CalDateTime(someTime.DateTime) { TzId = "America/New_York" };
+            var firstUtc = someDt.AsUtc;
+            Assert.AreEqual(someTime.UtcDateTime, firstUtc);
+
+            someDt.TzId = "Europe/Berlin";
+            var berlinUtc = someDt.AsUtc;
+            Assert.AreNotEqual(firstUtc, berlinUtc);
+        }
     }
 }
diff --git a/net-core/Ical.Net.FrameworkUnitTests/CalDateTimeTests.cs b/net-core/Ical.Net.FrameworkUnitTests/CalDateTimeTests.cs
@@ -98,5 +98,19 @@ public static IEnumerable<ITestCaseData> AsDateTimeOffsetTestCases()
                 .SetName($"Summer DateTime with no time zone information returns the system-local's UTC offset ({currentSystemOffset})")
                 .Returns(new DateTimeOffset(summerDate, currentSystemOffset));
         }
+
+        [Test(Description = "Calling AsUtc should always return the proper UTC time, even if the TzId has changed")]
+        public void TestTzidChanges()
+        {
+            var someTime = DateTimeOffset.Parse("2018-05-21T11:35:00-04:00");
+
+            var someDt = new CalDateTime(someTime.DateTime) { TzId = "America/New_York" };
+            var firstUtc = someDt.AsUtc;
+            Assert.AreEqual(someTime.UtcDateTime, firstUtc);
+
+            someDt.TzId = "Europe/Berlin";
+            var berlinUtc = someDt.AsUtc;
+            Assert.AreNotEqual(firstUtc, berlinUtc);
+        }
     }
 }
diff --git a/net-core/Ical.Net/DataTypes/CalDateTime.cs b/net-core/Ical.Net/DataTypes/CalDateTime.cs
@@ -314,6 +314,8 @@ public string TzId
                     return;
                 }
 
+                _asUtc = DateTime.MinValue;
+
                 var isEmpty = string.IsNullOrWhiteSpace(value);
                 if (isEmpty)
                 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -314,6 +314,8 @@ public string TzId @@
                         return;
                     }
+                    _asUtc = DateTime.MinValue;
                     var isEmpty = string.IsNullOrWhiteSpace(value);
                     if (isEmpty)
                     {
@@ Expand Down @@