diff options
| author | Ulf Jasper | 2014-08-06 20:19:34 +0200 |
|---|---|---|
| committer | Ulf Jasper | 2014-08-06 20:19:34 +0200 |
| commit | 075e911c4577f587e528632b0c7aa2bd7b5416ec (patch) | |
| tree | 1b9ec013ed1a18b6a4e12cc8e622751fdcd902dd /test | |
| parent | 2416ad64a4e47094ad26c254a85addbf28211910 (diff) | |
| download | emacs-075e911c4577f587e528632b0c7aa2bd7b5416ec.tar.gz emacs-075e911c4577f587e528632b0c7aa2bd7b5416ec.zip | |
Fix Bug#15408 (icalendar time zone problem)
2014-07-30 Christophe Deleuze <christophe.deleuze@free.fr>
* calendar/icalendar.el (icalendar--decode-isodatetime): Use
actual current-time-zone when converting to local time. (Bug#15408)
2014-07-30 Ulf Jasper <ulf.jasper@web.de>
* automated/icalendar-tests.el (icalendar--decode-isodatetime): New test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/automated/icalendar-tests.el | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 4339dc56ff3..a8727fbef28 100644 --- a/test/ChangeLog +++ b/test/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-08-06 Ulf Jasper <ulf.jasper@web.de> | ||
| 2 | |||
| 3 | * automated/icalendar-tests.el | ||
| 4 | (icalendar--convert-ordinary-to-ical), | ||
| 5 | (icalendar--diarytime-to-isotime): More testcases (Bug#13750). | ||
| 6 | |||
| 1 | 2014-08-03 Glenn Morris <rgm@gnu.org> | 7 | 2014-08-03 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * automated/Makefile.in (check-tar): New rule. | 9 | * automated/Makefile.in (check-tar): New rule. |
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el index 0f655232e71..a3971989831 100644 --- a/test/automated/icalendar-tests.el +++ b/test/automated/icalendar-tests.el | |||
| @@ -220,6 +220,15 @@ END:VTIMEZONE | |||
| 220 | (car result))) | 220 | (car result))) |
| 221 | (should (string= "subject" (cadr result))) | 221 | (should (string= "subject" (cadr result))) |
| 222 | 222 | ||
| 223 | ;; with start time | ||
| 224 | (setq result (icalendar--convert-ordinary-to-ical | ||
| 225 | "&?" "&2010 2 15 12:34 s")) | ||
| 226 | (should (= 2 (length result))) | ||
| 227 | (should (string= (concat "\nDTSTART;VALUE=DATE-TIME:20100215T123400" | ||
| 228 | "\nDTEND;VALUE=DATE-TIME:20100215T133400") | ||
| 229 | (car result))) | ||
| 230 | (should (string= "s" (cadr result))) | ||
| 231 | |||
| 223 | ;; with time | 232 | ;; with time |
| 224 | (setq result (icalendar--convert-ordinary-to-ical | 233 | (setq result (icalendar--convert-ordinary-to-ical |
| 225 | "&?" "&2010 2 15 12:34-23:45 s")) | 234 | "&?" "&2010 2 15 12:34-23:45 s")) |
| @@ -267,7 +276,9 @@ END:VTIMEZONE | |||
| 267 | (should (string= "T120100" | 276 | (should (string= "T120100" |
| 268 | (icalendar--diarytime-to-isotime "1201" "pm"))) | 277 | (icalendar--diarytime-to-isotime "1201" "pm"))) |
| 269 | (should (string= "T125900" | 278 | (should (string= "T125900" |
| 270 | (icalendar--diarytime-to-isotime "1259" "pm")))) | 279 | (icalendar--diarytime-to-isotime "1259" "pm"))) |
| 280 | (should (string= "T150000" | ||
| 281 | (icalendar--diarytime-to-isotime "3" "pm")))) | ||
| 271 | 282 | ||
| 272 | (ert-deftest icalendar--datetime-to-diary-date () | 283 | (ert-deftest icalendar--datetime-to-diary-date () |
| 273 | "Test method for `icalendar--datetime-to-diary-date'." | 284 | "Test method for `icalendar--datetime-to-diary-date'." |