From 560350526b2a6fdacebfefbf5b37bb7de9c21dd3 Mon Sep 17 00:00:00 2001
From: "dmitry.trefilov" <Dmitry.Trefilov@quest.com>
Date: Sat, 13 Oct 2018 22:42:19 +0000
Subject: [PATCH] deserialize daylight standard timezone infos

---
 .../SerializationTests.cs                     | 47 ++++++++++++++++---
 .../Ical.Net/CalendarComponents/VTimeZone.cs  |  7 +--
 .../Serialization/CalendarComponentFactory.cs |  4 ++
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/net-core/Ical.Net.FrameworkUnitTests/SerializationTests.cs b/net-core/Ical.Net.FrameworkUnitTests/SerializationTests.cs
index e840ee30..5e86f6da 100644
--- a/net-core/Ical.Net.FrameworkUnitTests/SerializationTests.cs
+++ b/net-core/Ical.Net.FrameworkUnitTests/SerializationTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
@@ -10,6 +10,7 @@
 using Ical.Net.Serialization.DataTypes;
 using Ical.Net.Utility;
 using NUnit.Framework;
+using System.IO;
 
 namespace Ical.Net.FrameworkUnitTests
 {
@@ -420,11 +421,11 @@ public void UnicodeDescription()
 DTEND;TZID=Europe/Helsinki:20160707T140000
 SUMMARY:Some summary
 UID:20160627T123608Z-182847102@atlassian.net
-DESCRIPTION:Key points:\n•	Some text (text,
- , text\, text\, TP) some text\;\n•	some tex
- t Some text (Text\, Text)\;\n•	Some tex
+DESCRIPTION:Key points:\n•	Some text (text,
+ , text\, text\, TP) some text\;\n•	some tex
+ t Some text (Text\, Text)\;\n•	Some tex
  t some text\, some text\, text.\;\n\nsome te
- xt some tex‘t some text. 
+ xt some tex‘t some text. 
 ORGANIZER;X-CONFLUENCE-USER-KEY=ff801df01547101c6720006;CN=Some
  user;CUTYPE=INDIVIDUAL:mailto:some.mail@domain.com
 CREATED:20160627T123608Z
@@ -439,8 +440,40 @@ public void UnicodeDescription()
             var deserializedEvent = Calendar.Load<CalendarEvent>(ics).Single();
 
             Assert.IsTrue(deserializedEvent.Description.Contains("\t"));
-            Assert.IsTrue(deserializedEvent.Description.Contains("•"));
-            Assert.IsTrue(deserializedEvent.Description.Contains("‘"));
+            Assert.IsTrue(deserializedEvent.Description.Contains("•"));
+            Assert.IsTrue(deserializedEvent.Description.Contains("‘"));
+        }
+
+        [Test]
+        public void TestStandardDaylightTimeZoneInfoDeserialization()
+        {
+
+            const string ics = @"BEGIN:VTIMEZONE
+TZID:
+BEGIN:STANDARD
+DTSTART:16010101T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:16010101T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE";
+            var timeZone = Calendar.Load<VTimeZone>(ics).Single();
+            Assert.IsNotNull(timeZone, "Expected the TimeZone to be successfully deserialized");
+            var timeZoneInfos = timeZone.TimeZoneInfos;
+            Assert.IsNotNull(timeZoneInfos, "Expected TimeZoneInfos to be deserialized");
+            Assert.AreEqual(2, timeZoneInfos.Count, "Expected 2 TimeZoneInfos");
+            Assert.AreEqual("STANDARD", timeZoneInfos[0].Name);
+            Assert.AreEqual(new UtcOffset("+0200"), timeZoneInfos[0].OffsetFrom);
+            Assert.AreEqual(new UtcOffset("+0100"), timeZoneInfos[0].OffsetTo);
+            Assert.AreEqual("DAYLIGHT", timeZoneInfos[1].Name);
+            Assert.AreEqual(new UtcOffset("+0100"), timeZoneInfos[1].OffsetFrom);
+            Assert.AreEqual(new UtcOffset("+0200"), timeZoneInfos[1].OffsetTo);
         }
 
         [Test]
diff --git a/net-core/Ical.Net/CalendarComponents/VTimeZone.cs b/net-core/Ical.Net/CalendarComponents/VTimeZone.cs
index 14b91622..ad40f774 100644
--- a/net-core/Ical.Net/CalendarComponents/VTimeZone.cs
+++ b/net-core/Ical.Net/CalendarComponents/VTimeZone.cs
@@ -5,6 +5,7 @@
 using Ical.Net.Utility;
 using NodaTime;
 using NodaTime.TimeZones;
+using Ical.Net.Proxies;
 
 namespace Ical.Net.CalendarComponents
 {
@@ -151,13 +152,13 @@ private static VTimeZoneInfo CreateTimeZoneInfo(List<ZoneInterval> matchedInterv
 
             if (isDaylight)
             {
-                timeZoneInfo.Name = "DAYLIGHT";
+                timeZoneInfo.Name = Components.Daylight;
                 timeZoneInfo.OffsetFrom = new UtcOffset(utcOffset);
                 timeZoneInfo.OffsetTo = new UtcOffset(utcOffset - delta);
             }
             else
             {
-                timeZoneInfo.Name = "STANDARD";
+                timeZoneInfo.Name = Components.Standard;
                 timeZoneInfo.OffsetFrom = new UtcOffset(utcOffset + delta);
                 timeZoneInfo.OffsetTo = new UtcOffset(utcOffset);
             }
@@ -341,7 +342,7 @@ public string Location
             }
         }
 
-        public HashSet<VTimeZoneInfo> TimeZoneInfos { get; set; }
+        public ICalendarObjectList<VTimeZoneInfo> TimeZoneInfos => new CalendarObjectListProxy<VTimeZoneInfo>(Children);
 
         protected bool Equals(VTimeZone other)
             => string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase)
diff --git a/net-core/Ical.Net/Serialization/CalendarComponentFactory.cs b/net-core/Ical.Net/Serialization/CalendarComponentFactory.cs
index ed70c15c..6f68ef68 100644
--- a/net-core/Ical.Net/Serialization/CalendarComponentFactory.cs
+++ b/net-core/Ical.Net/Serialization/CalendarComponentFactory.cs
@@ -32,6 +32,10 @@ public virtual ICalendarComponent Build(string objectName)
                 case Components.Calendar:
                     c = new Calendar();
                     break;
+                case Components.Daylight:
+                case Components.Standard:
+                    c = new VTimeZoneInfo();
+                    break;
                 default:
                     c = new CalendarComponent();
                     break;