Skip to content

Improve recurrence handling, remove restrictions #627

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
axunonb merged 6 commits into from
Nov 4, 2024
Merged

Improve recurrence handling, remove restrictions #627

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ea5662
Modified Constants.cs:
axunonb Oct 28, 2024
110febf
Don't convert dt to `SystsemLocal` in `Calendar.GetOccurrences(IDate…
axunonb Oct 28, 2024
661301b
Remove timeout handling and adjust related recurrence tests
axunonb Oct 28, 2024
47cf86d
Refactor test names and update assertion message
axunonb Oct 28, 2024
d3e90bc
Change tests to check for exact number of occurrences
axunonb Oct 29, 2024
c4c0eb0
Implemented changes from the code review
axunonb Nov 4, 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
Prev Previous commit
Next Next commit
Change tests to check for exact number of occurrences 
* Secondly_DefinedNumberOfOccurrences_ShouldSucceed(), Minutely_DefinedNumberOfOccurrences_ShouldSucceed(), Hourly_DefinedNumberOfOccurrences_ShouldSucceed() assert exact number of occurences.

* Updated test methods to dynamically generate expected occurrences using loops
  • Loading branch information
@axunonb
axunonb committed Oct 29, 2024
commit d3e90bcadb48bcdc6a04d1936b53c10162c4784b
88 changes: 35 additions & 53 deletions Ical.Net.Tests/RecurrenceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ int eventIndex
{
Assert.That(
occurrences,
Has.Count.GreaterThanOrEqualTo(dateTimes.Length),
"There should have been " + dateTimes.Length + " or more occurrences; there were " + occurrences.Count);
Has.Count.EqualTo(dateTimes.Length),
"There should have been " + dateTimes.Length + " occurrences; there were " + occurrences.Count);

if (evt.RecurrenceRules.Count > 0)
{
Expand Down Expand Up @@ -1872,72 +1872,54 @@ public void Bug1741093()
}

[Test, Category("Recurrence")]
public void Secondly_AtLeastDefinedNumberOfOccurrences_ShouldSucceed()
public void Secondly_DefinedNumberOfOccurrences_ShouldSucceed()
{
var iCal = Calendar.Load(IcsFiles.Secondly1);

EventOccurrenceTest(
iCal,
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 1, 1, _tzid), // End period is exclusive, not inclusive.
new[]
{
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 1, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 2, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 3, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 4, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 5, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 6, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 7, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 8, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 9, _tzid),
new CalDateTime(2007, 6, 21, 8, 0, 10, _tzid)
},
null
);
var start = new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid);
var end = new CalDateTime(2007, 6, 21, 8, 1, 0, _tzid); // End period is exclusive, not inclusive.

var dateTimes = new List<IDateTime>();
for (var dt = start; dt.LessThan(end); dt = (CalDateTime) dt.AddSeconds(1))
{
dateTimes.Add(new CalDateTime(dt));
}

EventOccurrenceTest(iCal, start, end, dateTimes.ToArray(), null);
}

[Test, Category("Recurrence")]
public void Minutely_AtLeastDefinedNumberOfOccurrences_ShouldSucceed()
public void Minutely_DefinedNumberOfOccurrences_ShouldSucceed()
{
var iCal = Calendar.Load(IcsFiles.Minutely1);

EventOccurrenceTest(
iCal,
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 12, 0, 1, _tzid), // End period is exclusive, not inclusive.
new[]
{
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 1, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 2, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 3, 0, _tzid),
new CalDateTime(2007, 6, 21, 8, 4, 0, _tzid)
},
null
);
var start = new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid);
var end = new CalDateTime(2007, 6, 21, 12, 0, 1, _tzid); // End period is exclusive, not inclusive.

var dateTimes = new List<IDateTime>();
for (var dt = start; dt.LessThan(end); dt = (CalDateTime)dt.AddMinutes(1))
{
dateTimes.Add(new CalDateTime(dt));
}

EventOccurrenceTest(iCal, start, end, dateTimes.ToArray(), null);
}

[Test, Category("Recurrence")]
public void Hourly_AtLeastDefinedNumberOfOccurrences_ShouldSucceed()
public void Hourly_DefinedNumberOfOccurrences_ShouldSucceed()
{
var iCal = Calendar.Load(IcsFiles.Hourly1);

EventOccurrenceTest(
iCal,
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 25, 8, 0, 1, _tzid), // End period is exclusive, not inclusive.
new[]
{
new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 9, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 10, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 11, 0, 0, _tzid),
new CalDateTime(2007, 6, 21, 12, 0, 0, _tzid)
},
null
);
var start = new CalDateTime(2007, 6, 21, 8, 0, 0, _tzid);
var end = new CalDateTime(2007, 6, 25, 8, 0, 1, _tzid); // End period is exclusive, not inclusive.

var dateTimes = new List<IDateTime>();
for (var dt = start; dt.LessThan(end); dt = (CalDateTime)dt.AddHours(1))
{
dateTimes.Add(new CalDateTime(dt));
}

EventOccurrenceTest(iCal, start, end, dateTimes.ToArray(), null);
}

/// <summary>
Expand Down
Loading