Skip to content

iCalendar Duration RFC Compliance Fix #108

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

iCalendar Duration RFC Compliance Fix #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions calendar/base/modules/Ical.sys.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,20 @@ class Duration {
let str = "";
if (this.isNegative) str += "-";
str += "P";
if (this.weeks) str += this.weeks + "W";
if (this.days) str += this.days + "D";
console.log(this.weeks)
if(this.weeks){
if (this.days || this.hours || this.minutes || this.seconds){
str += (this.weeks*7 + this.days + "D");
}
else{
str += (this.weeks + "W");
}
}
else{
if(this.days){
str += (this.days + "D");
}
}

if (this.hours || this.minutes || this.seconds) {
str += "T";
Expand Down
141 changes: 141 additions & 0 deletions calendar/test/unit/test_duration_rfc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");

ChromeUtils.defineESModuleGetters(this, {
CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
CalTodo: "resource:///modules/CalTodo.sys.mjs",
CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
});

function run_test() {
// Time break up values
weeks = 604800;
days = 86400;
hours = 3600;
minutes = 60;
seconds = 1;

// Test weeks and hours
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 0 + days * 0 + hours * 170 + minutes * 0 + seconds * 0);
console.log(alarm.mDuration.innerObject)
//console.log(date)
let caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P7DT2H")
delete alarm;
delete caldate;

// Test weeks and minutes
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 1 + days * 0 + hours * 0 + minutes * 1 + seconds * 0);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P7DT1M")
delete alarm;
delete caldate;

// Test weeks and seconds
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 1 + days * 0 + hours * 0 + minutes * 0 + seconds * 30);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P7DT30S")
delete alarm;
delete caldate;

// Test weeks, days, and hours
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 5 + days * 2 + hours * 1 + minutes * 0 + seconds * 0);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P37DT1H")
delete alarm;
delete caldate;

// Test weeks, days, and minutes
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 5 + days * 2 + hours * 0 + minutes * 5 + seconds * 0);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P37DT5M")
delete alarm;
delete caldate;

// Test weeks, days, and seconds
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 5 + days * 2 + hours * 0 + minutes * 0 + seconds * 20);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P37DT20S")
delete alarm;
delete caldate;

// Test days
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 0 + days * 2 + hours * 0 + minutes * 0 + seconds * 0);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "P2D")
delete alarm;
delete caldate;

// Test only time
alarm = new CalAlarm();
alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
alarm.alarmDate = cal.createDateTime();
alarm.repeat = 1;
alarm.repeatOffset = cal.createDuration();
alarm.repeatOffset.inSeconds = (weeks * 0 + days * 0 + hours * 2 + minutes * 3 + seconds * 5);
console.log(alarm.mDuration.innerObject)
//console.log(date)
caldate = new CalDateTime(alarm.mDuration.innerObject.clone())
console.log(caldate.toString())
equal(caldate.toString(), "PT2H3M5S")
delete alarm;
delete caldate;
}
2 changes: 2 additions & 0 deletions calendar/test/unit/xpcshell.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ tags = ["oauth"]

["test_duration.js"]

["test_duration_rfc.js"]

["test_email_utils.js"]

["test_extract.js"]
Expand Down