Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deleted TimeZoneObservance and TimeZoneEvaluator, TimeZoneInfo, etc. #9

Merged
merged 20 commits into from
May 28, 2016
Merged

Deleted TimeZoneObservance and TimeZoneEvaluator, TimeZoneInfo, etc. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
651de39
OffsetFrom isn't used for anything
rianjs May 28, 2016
82dc194
Not-useful TimeZoneObservance usage
rianjs May 28, 2016
6ad1dd0
TimeZoneObservance's Period property isn't used by anything
rianjs May 28, 2016
7dc6247
More unused code in TimeZoneObservance
rianjs May 28, 2016
1e70130
More unused code
rianjs May 28, 2016
d250d29
TimeZoneObservance struct is no longer used, deleted
rianjs May 28, 2016
85f51c7
Unnecessary using statements
rianjs May 28, 2016
f82c518
ITimeZoneInfo.TzId isn't used
rianjs May 28, 2016
e486bb9
ITimeZoneInfo is empty
rianjs May 28, 2016
784904e
Not being able to find a time zone is an error, not something to be f…
rianjs May 29, 2016
66d6fce
TimeZoneEvaluator isn't used by anything
rianjs May 29, 2016
26b5d82
Unnecessary using statement
rianjs May 29, 2016
c4cebf7
TimeZoneInfos collection isn't used by anything
rianjs May 29, 2016
2117936
TimeZoneInfoEvaluator isn't used by anything
rianjs May 29, 2016
5f9ef8b
Delete unit tests that never worked
rianjs May 29, 2016
d29c120
More shrinkage of ITimeZoneInfo
rianjs May 29, 2016
7a56108
I was able to shrink the ITimeZone and VTimeZone objects significantl…
rianjs May 29, 2016
b0fb969
Unnecessary using statements
rianjs May 29, 2016
455cc44
ITimeZoneInfo and its implementation no longer needed
rianjs May 29, 2016
4e13bbc
Dead code
rianjs May 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions ical.NET.UnitTests/AlarmTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@ namespace ical.NET.UnitTests
[TestFixture]
public class AlarmTest
{
private string _tzid;

[TestFixtureSetUp]
public void InitAll()
{
_tzid = "US-Eastern";
}
private const string _tzid = "US-Eastern";

public void TestAlarm(string calendar, List<IDateTime> dates, CalDateTime start, CalDateTime end)
{
Expand Down
32 changes: 0 additions & 32 deletions ical.NET.UnitTests/Custom/Custom1.cs
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions ical.NET.UnitTests/ProgramTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
using System.Linq;
using Ical.Net;
using Ical.Net.DataTypes;
using Ical.Net.ExtensionMethods;
using Ical.Net.Interfaces;
using Ical.Net.Interfaces.DataTypes;
using Ical.Net.Serialization.iCalendar.Serializers;
using Ical.Net.Utility;
using NUnit.Framework;

Expand Down Expand Up @@ -230,108 +228,6 @@ public void Merge1()
Assert.AreEqual(dateTimes1.Length, occurrences.Count, "There should be exactly " + dateTimes1.Length + " occurrences; there were " + occurrences.Count);
}

//[Test] //Broken in dday
public void Merge2()
{
var iCal = new Calendar();
var tmpCal = Calendar.LoadFromFile(@"Calendars\Serialization\TimeZone3.ics")[0];
iCal.MergeWith(tmpCal);

tmpCal = Calendar.LoadFromFile(@"Calendars\Serialization\TimeZone3.ics")[0];

// Compare the two calendars -- they should match exactly
SerializationTest.CompareCalendars(iCal, tmpCal);
}

/// <summary>
/// The following tests the MergeWith() method of iCalendar to
/// ensure that unique component merging happens as expected.
/// </summary>
//[Test] //Broken in dday
public void Merge3()
{
var iCal1 = Calendar.LoadFromFile(@"Calendars\Recurrence\MonthlyCountByMonthDay3.ics")[0];
var iCal2 = Calendar.LoadFromFile(@"Calendars\Recurrence\YearlyByMonth1.ics")[0];

iCal1.MergeWith(iCal2);

Assert.AreEqual(1, iCal1.Events.Count);
}


/// <summary>
/// Tests conversion of the system time zone to one compatible with Ical.Net.
/// Also tests the gaining/loss of an hour over time zone boundaries.
/// </summary>
//[Test] //Broken in dday
public void SystemTimeZone1()
{
var tzi = TimeZoneInfo.FindSystemTimeZoneById("Mountain Standard Time");
Assert.IsNotNull(tzi);

var iCal = new Calendar();
var tz = VTimeZone.FromSystemTimeZone(tzi, new DateTime(2000, 1, 1), false);
Assert.IsNotNull(tz);
iCal.AddChild(tz);

var serializer = new CalendarSerializer();
serializer.Serialize(iCal, @"Calendars\Serialization\SystemTimeZone1.ics");

// Ensure the time zone transition works as expected
// (i.e. it takes 1 hour and 1 second to transition from
// 2003-10-26 12:59:59 AM to
// 2003-10-26 01:00:00 AM)
var dt1 = new CalDateTime(2003, 10, 26, 0, 59, 59, tz.TzId, iCal);
var dt2 = new CalDateTime(2003, 10, 26, 1, 0, 0, tz.TzId, iCal);

var result = dt2 - dt1;
Assert.AreEqual(TimeSpan.FromHours(1) + TimeSpan.FromSeconds(1), result);

// Ensure another time zone transition works as expected
// (i.e. it takes negative 59 minutes and 59 seconds to transition from
// 2004-04-04 01:59:59 AM to
// 2004-04-04 02:00:00 AM)
dt1 = new CalDateTime(2004, 4, 4, 1, 59, 59, tz.TzId, iCal);
dt2 = new CalDateTime(2004, 4, 4, 2, 0, 0, tz.TzId, iCal);
result = dt2 - dt1;
Assert.AreEqual(TimeSpan.FromHours(-1) + TimeSpan.FromSeconds(1), result);
}

/// <summary>
/// Ensures the AddTimeZone() method works as expected.
/// </summary>
//[Test] //Broken in dday
public void SystemTimeZone2()
{
var tzi = TimeZoneInfo.FindSystemTimeZoneById("Mountain Standard Time");
Assert.IsNotNull(tzi);

var iCal = new Calendar();
var tz = iCal.AddTimeZone(tzi, new DateTime(2000, 1, 1), false);
Assert.IsNotNull(tz);

var serializer = new CalendarSerializer();
serializer.Serialize(iCal, @"Calendars\Serialization\SystemTimeZone2.ics");

// Ensure the time zone transition works as expected
// (i.e. it takes 1 hour and 1 second to transition from
// 2003-10-26 12:59:59 AM to
// 2003-10-26 01:00:00 AM)
var dt1 = new CalDateTime(2003, 10, 26, 0, 59, 59, tz.TzId, iCal);
var dt2 = new CalDateTime(2003, 10, 26, 1, 0, 0, tz.TzId, iCal);
var result = dt2 - dt1;
Assert.AreEqual(TimeSpan.FromHours(1) + TimeSpan.FromSeconds(1), result);

// Ensure another time zone transition works as expected
// (i.e. it takes negative 59 minutes and 59 seconds to transition from
// 2004-04-04 01:59:59 AM to
// 2004-04-04 02:00:00 AM)
dt1 = new CalDateTime(2004, 4, 4, 1, 59, 59, tz.TzId, iCal);
dt2 = new CalDateTime(2004, 4, 4, 2, 0, 0, tz.TzId, iCal);
result = dt2 - dt1;
Assert.AreEqual(TimeSpan.FromHours(-1) + TimeSpan.FromSeconds(1), result);
}

[Test]
public void SystemTimeZone3()
{
Expand All @@ -351,14 +247,7 @@ public void SystemTimeZone3()
{
Assert.Fail("Not found: " + zone.StandardName);
}

if (tzinfo != null)
{
var icalTz = VTimeZone.FromSystemTimeZone(tzinfo);
Assert.AreNotEqual(0, icalTz.TimeZoneInfos.Count, zone.StandardName + ": no time zone information was extracted.");
}
}
}

}
}
155 changes: 0 additions & 155 deletions ical.NET.UnitTests/RecurrenceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Ical.Net.DataTypes;
using Ical.Net.Evaluation;
using Ical.Net.Exceptions;
using Ical.Net.ExtensionMethods;
using Ical.Net.Interfaces;
using Ical.Net.Interfaces.Components;
using Ical.Net.Interfaces.DataTypes;
Expand Down Expand Up @@ -1863,55 +1862,6 @@ public void Bug1741093()
);
}

/// <summary>
/// Tests recurrence rule issue noted in
/// Bug #1821721 - Recur for every-other-month doesn't evaluate correctly
/// </summary>
//[Test, Category("Recurrence")] //Broken in dday
public void Bug1821721()
{
var iCal = new Calendar();

var tz = iCal.Create<VTimeZone>();

tz.TzId = "US-Eastern";

ITimeZoneInfo standard = new CalTimeZoneInfo(Components.Standard);
standard.Start = new CalDateTime(new DateTime(1967, 10, 29, 2, 0, 0, DateTimeKind.Utc));
standard.RecurrenceRules.Add(new RecurrencePattern("FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10"));
tz.AddChild(standard);

ITimeZoneInfo daylight = new CalTimeZoneInfo(Components.Daylight);
daylight.Start = new CalDateTime(new DateTime(1987, 4, 5, 2, 0, 0, DateTimeKind.Utc));
daylight.RecurrenceRules.Add(new RecurrencePattern("FREQ=YEARLY;BYDAY=1SU;BYMONTH=4"));

tz.AddChild(daylight);

IEvent evt = iCal.Create<Event>();
evt.Summary = "Test event";
evt.Start = new CalDateTime(2007, 1, 24, 8, 0, 0, _tzid);
evt.Duration = TimeSpan.FromHours(1);
evt.End = new CalDateTime(2007, 1, 24, 9, 0, 0, _tzid);
IRecurrencePattern recur = new RecurrencePattern("FREQ=MONTHLY;INTERVAL=2;BYDAY=4WE");
evt.RecurrenceRules.Add(recur);

EventOccurrenceTest(
iCal,
new CalDateTime(2007, 1, 24),
new CalDateTime(2007, 12, 31),
new[]
{
new CalDateTime(2007, 1, 24, 8, 0, 0, _tzid),
new CalDateTime(2007, 3, 28, 8, 0, 0, _tzid),
new CalDateTime(2007, 5, 23, 8, 0, 0, _tzid),
new CalDateTime(2007, 7, 25, 8, 0, 0, _tzid),
new CalDateTime(2007, 9, 26, 8, 0, 0, _tzid),
new CalDateTime(2007, 11, 28, 8, 0, 0, _tzid)
},
null
);
}

/// <summary>
/// Ensures that, by default, SECONDLY recurrence rules are not allowed.
/// </summary>
Expand Down Expand Up @@ -2906,24 +2856,6 @@ public void Test2()
"Serialized recurrence string is incorrect");
}

//[Test, Category("Recurrence")] //Console.WriteLine is not a unit test
public void Test3()
{
ICalendar cal = new Calendar();
IEvent evt = cal.Create<Event>();

evt.Start = new CalDateTime(2008, 10, 18, 10, 30, 0);
evt.Summary = "Test Event";
evt.Duration = TimeSpan.FromHours(1);
evt.RecurrenceRules.Add(new RecurrencePattern("RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH"));

IDateTime doomsdayDate = new CalDateTime(2010, 12, 31, 10, 30, 0);
var allOcc = evt.GetOccurrences(evt.Start, doomsdayDate);

//foreach (var occ in allOcc)
// Console.WriteLine(occ.Period.StartTime.ToString("d") + " " + occ.Period.StartTime.ToString("t"));
}

[Test, Category("Recurrence")]
public void Test4()
{
Expand Down Expand Up @@ -2959,92 +2891,5 @@ public void Test4()
Assert.AreEqual(30, periods[8].StartTime.Day);
Assert.AreEqual(31, periods[9].StartTime.Day);
}

// FIXME: re-implement
///// <summary>
///// Tests that BYHOUR values work properly with GetNextOccurrence()
///// when the LastOccurrence is somewhat randomized between BYHOUR values.
///// </summary>
//[Test, Category("Recurrence")]
//public void Test5()
//{
// RecurrencePattern rpattern = new RecurrencePattern();
// rpattern.ByHour.Add(8);
// rpattern.ByHour.Add(17);

// rpattern.Frequency = FrequencyType.Daily;

// IDateTime lastOccurrence = new iCalDateTime(2006, 10, 1, 11, 15, 0);

// for (int i = 0; i < 20; i++)
// {
// IPeriod nextOccurrence = rpattern.GetNextOccurrence(lastOccurrence);
// IDateTime expectedNextOccurrence;
// if (lastOccurrence.Hour > 17)
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddDays(1).AddHours(8).AddMinutes(15);
// else
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddHours(17).AddMinutes(15);

// Assert.AreEqual(expectedNextOccurrence, nextOccurrence.StartTime);
// lastOccurrence = lastOccurrence.AddHours(12);
// }
//}

// FIXME: re-implement
///// <summary>
///// Similar to TEST5(), except on the last day of the month.
///// This ensures the "next day" values are properly calculated.
///// </summary>
//[Test, Category("Recurrence")]
//public void Test6()
//{
// IRecurrencePattern rpattern = new RecurrencePattern();
// rpattern.ByHour.Add(8);
// rpattern.ByHour.Add(17);
// rpattern.Frequency = FrequencyType.Daily;

// IDateTime lastOccurrence = new iCalDateTime(2009, 9, 30, 11, 42, 53);

// for (int i = 0; i < 20; i++)
// {
// IPeriod nextOccurrence = rpattern.GetNextOccurrence(lastOccurrence);
// IDateTime expectedNextOccurrence;
// if (lastOccurrence.Hour > 17)
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddDays(1).AddHours(8).AddMinutes(42).AddSeconds(53);
// else
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddHours(17).AddMinutes(42).AddSeconds(53);

// Assert.AreEqual(expectedNextOccurrence, nextOccurrence.StartTime);
// lastOccurrence = lastOccurrence.AddHours(12);
// }
//}

// FIXME: re-implement
///// <summary>
///// Similar to TEST6(), except on the last day of the year.
///// </summary>
//[Test, Category("Recurrence")]
//public void Test7()
//{
// IRecurrencePattern rpattern = new RecurrencePattern();
// rpattern.ByHour.Add(8);
// rpattern.ByHour.Add(17);
// rpattern.Frequency = FrequencyType.Daily;

// IDateTime lastOccurrence = new iCalDateTime(2009, 12, 31, 11, 42, 53);

// for (int i = 0; i < 20; i++)
// {
// IPeriod nextOccurrence = rpattern.GetNextOccurrence(lastOccurrence);
// IDateTime expectedNextOccurrence;
// if (lastOccurrence.Hour > 17)
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddDays(1).AddHours(8).AddMinutes(42).AddSeconds(53);
// else
// expectedNextOccurrence = DateUtil.StartOfDay(lastOccurrence).AddHours(17).AddMinutes(42).AddSeconds(53);

// Assert.AreEqual(expectedNextOccurrence, nextOccurrence);
// lastOccurrence = lastOccurrence.AddHours(12);
// }
//}
}
}
Loading