Skip to content

Refactor to use DateOnly and TimeOnly for date/time handling #658

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

Merged
merged 12 commits into from
Dec 6, 2024
Merged

Refactor to use DateOnly and TimeOnly for date/time handling #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7463f67
Refactor to use DateOnly and TimeOnly for date/time handling
axunonb Nov 30, 2024
67cda7c
Remove AsDateTimeOffset from IDateTime and CalDateTime
axunonb Dec 2, 2024
b8d5b8e
Floating date/time can convert to any timezone ID, keeping Value unch…
axunonb Dec 2, 2024
82044c9
Added unit test GetOccurrenceShouldExcludeDtEndZoned
axunonb Dec 2, 2024
9870716
Fix: Initialize CalDateTime with timezone UTC only, if TimeOnly is no…
axunonb Dec 2, 2024
c069577
Refactor time handling and remove millisecond/ticks methods
axunonb Dec 3, 2024
5797236
Remove setter from `CalendarEvent.AllDay`
axunonb Dec 3, 2024
cd878f9
Ensure transitive equality for CalDateTime
axunonb Dec 4, 2024
91bca73
Remove properties `Ticks` and `Millisecond`
axunonb Dec 4, 2024
55bb7fc
Remove redundant if clause
axunonb Dec 5, 2024
5956fb9
Simplify end period creation in GetOccurrences method
axunonb Dec 5, 2024
05030fe
Simplify GetOccurrences methods by removing time adjustments
axunonb Dec 5, 2024
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
285 changes: 140 additions & 145 deletions Ical.Net.Tests/CalDateTimeTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Ical.Net.Tests/CalendarEventTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ public void TestGetEffectiveDuration()

var evt = new CalendarEvent()
{
DtStart = new CalDateTime(now) { HasTime = true },
DtEnd = new CalDateTime(now.AddHours(1)) { HasTime = true },
DtStart = new CalDateTime(DateOnly.FromDateTime(now), TimeOnly.FromDateTime(now)),
DtEnd = new CalDateTime(DateOnly.FromDateTime(now.AddHours(1)), TimeOnly.FromDateTime(now.AddHours(1)))
};

Assert.Multiple(() =>
Expand All @@ -491,8 +491,8 @@ public void TestGetEffectiveDuration()

evt = new CalendarEvent()
{
DtStart = new CalDateTime(now.Date) { HasTime = true },
DtEnd = new CalDateTime(now.Date.AddHours(1)) { HasTime = true },
DtStart = new CalDateTime(DateOnly.FromDateTime(now.Date), TimeOnly.FromDateTime(now.Date)),
DtEnd = new CalDateTime(DateOnly.FromDateTime(now.Date.AddHours(1)), TimeOnly.FromDateTime(now.Date.AddHours(1)))
};

Assert.Multiple(() =>
Expand All @@ -503,7 +503,7 @@ public void TestGetEffectiveDuration()

evt = new CalendarEvent()
{
DtStart = new CalDateTime(now.Date) { HasTime = false },
DtStart = new CalDateTime(DateOnly.FromDateTime(now)),
};

Assert.Multiple(() =>
Expand All @@ -514,7 +514,7 @@ public void TestGetEffectiveDuration()

evt = new CalendarEvent()
{
DtStart = new CalDateTime(now) { HasTime = true },
DtStart = new CalDateTime(DateOnly.FromDateTime(now), TimeOnly.FromDateTime(now)),
Duration = TimeSpan.FromHours(2),
};

Expand All @@ -526,7 +526,7 @@ public void TestGetEffectiveDuration()

evt = new CalendarEvent()
{
DtStart = new CalDateTime(now.Date) { HasTime = true },
DtStart = new CalDateTime(DateOnly.FromDateTime(now.Date), TimeOnly.FromDateTime(now.Date)),
Duration = TimeSpan.FromHours(2),
};

Expand All @@ -537,7 +537,7 @@ public void TestGetEffectiveDuration()

evt = new CalendarEvent()
{
DtStart = new CalDateTime(now.Date) { HasTime = false },
DtStart = new CalDateTime(DateOnly.FromDateTime(now)),
Duration = TimeSpan.FromDays(1),
};

Expand Down
27 changes: 1 addition & 26 deletions Ical.Net.Tests/ComponentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,4 @@ public void UniqueComponent1()
Assert.That(evt.Created, Is.Null); // We don't want this to be set automatically
Assert.That(evt.DtStamp, Is.Not.Null);
}

[Test, Category("Components")]
public void ChangeCalDateTimeValue()
{
var e = new CalendarEvent
{
Start = new CalDateTime(2017, 11, 22, 11, 00, 01),
End = new CalDateTime(2017, 11, 22, 11, 30, 01),
};

var firstStartAsUtc = e.Start.AsUtc;
var firstEndAsUtc = e.End.AsUtc;

e.Start.Value = new DateTime(2017, 11, 22, 11, 30, 01);
e.End.Value = new DateTime(2017, 11, 22, 12, 00, 01);

var secondStartAsUtc = e.Start.AsUtc;
var secondEndAsUtc = e.End.AsUtc;

Assert.Multiple(() =>
{
Assert.That(secondStartAsUtc, Is.Not.EqualTo(firstStartAsUtc));
Assert.That(secondEndAsUtc, Is.Not.EqualTo(firstEndAsUtc));
});
}
}
}
4 changes: 2 additions & 2 deletions Ical.Net.Tests/DeserializationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ public void Google1()
var evt = iCal.Events["[email protected]"];
Assert.That(evt, Is.Not.Null);

IDateTime dtStart = new CalDateTime(2006, 12, 18, tzId);
IDateTime dtEnd = new CalDateTime(2006, 12, 23, tzId);
IDateTime dtStart = new CalDateTime(2006, 12, 18);
IDateTime dtEnd = new CalDateTime(2006, 12, 23);
var occurrences = iCal.GetOccurrences(dtStart, dtEnd).OrderBy(o => o.Period.StartTime).ToList();

var dateTimes = new[]
Expand Down
10 changes: 5 additions & 5 deletions Ical.Net.Tests/ProgramTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public void Merge1()

// Get occurrences for the first event
var occurrences = evt1.GetOccurrences(
new CalDateTime(1996, 1, 1, _tzid),
new CalDateTime(2000, 1, 1, _tzid)).OrderBy(o => o.Period.StartTime).ToList();
new CalDateTime(1996, 1, 1),
new CalDateTime(2000, 1, 1)).OrderBy(o => o.Period.StartTime).ToList();

var dateTimes = new[]
{
Expand Down Expand Up @@ -104,8 +104,8 @@ public void Merge1()

// Get occurrences for the 2nd event
occurrences = evt2.GetOccurrences(
new CalDateTime(1996, 1, 1, _tzid),
new CalDateTime(1998, 4, 1, _tzid)).OrderBy(o => o.Period.StartTime).ToList();
new CalDateTime(1996, 1, 1),
new CalDateTime(1998, 4, 1)).OrderBy(o => o.Period.StartTime).ToList();

var dateTimes1 = new[]
{
Expand Down Expand Up @@ -180,4 +180,4 @@ public void SystemTimeZone3()
}, Throws.Nothing, "Time zone should be found.");
}
}
}
}
Loading
Loading