[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9e4f11a: Move icalendar test data to test/lisp/calendar/icalendar
|
From: |
Ulf Jasper |
|
Subject: |
master 9e4f11a: Move icalendar test data to test/lisp/calendar/icalendar-resources |
|
Date: |
Fri, 23 Oct 2020 08:51:07 -0400 (EDT) |
branch: master
commit 9e4f11a1631f627af49d5854e0f651371c8f1c19
Author: Ulf Jasper <ulf.jasper@web.de>
Commit: Ulf Jasper <ulf.jasper@web.de>
Move icalendar test data to test/lisp/calendar/icalendar-resources
* test/lisp/calendar/icalendar-tests.el (ert-x): Required for
'ert-resource-file'.
(icalendar-tests--data-dir): Removed.
(icalendar-tests--get-file-contents): Use 'ert-resource-file' for
finding test data files.
* test/data/icalendar/*: Moved to test/lisp/calendar/icalendar-resources/.
* test/lisp/calendar/icalendar-resources/*: Moved from test/data/icalendar.
---
.../icalendar-resources}/import-bug-11473.diary-european | 0
.../calendar/icalendar-resources}/import-bug-11473.ics | 0
.../icalendar-resources}/import-bug-22092.diary-american | 0
.../icalendar-resources}/import-bug-22092.diary-european | 0
.../calendar/icalendar-resources}/import-bug-22092.diary-iso | 0
.../calendar/icalendar-resources}/import-bug-22092.ics | 0
.../icalendar-resources}/import-bug-24199.diary-american | 0
.../icalendar-resources}/import-bug-24199.diary-european | 0
.../calendar/icalendar-resources}/import-bug-24199.diary-iso | 0
.../calendar/icalendar-resources}/import-bug-24199.ics | 0
.../icalendar-resources}/import-bug-33277.diary-american | 0
.../icalendar-resources}/import-bug-33277.diary-european | 0
.../calendar/icalendar-resources}/import-bug-33277.diary-iso | 0
.../calendar/icalendar-resources}/import-bug-33277.ics | 0
.../icalendar-resources}/import-bug-6766.diary-american | 0
.../icalendar-resources}/import-bug-6766.diary-european | 0
.../calendar/icalendar-resources}/import-bug-6766.diary-iso | 0
.../calendar/icalendar-resources}/import-bug-6766.ics | 0
.../icalendar-resources}/import-duration-2.diary-american | 0
.../icalendar-resources}/import-duration-2.diary-european | 0
.../calendar/icalendar-resources}/import-duration-2.diary-iso | 0
.../calendar/icalendar-resources}/import-duration-2.ics | 0
.../icalendar-resources}/import-duration.diary-american | 0
.../icalendar-resources}/import-duration.diary-european | 0
.../calendar/icalendar-resources}/import-duration.diary-iso | 0
.../calendar/icalendar-resources}/import-duration.ics | 0
.../import-multiple-vcalendars.diary-american | 0
.../import-multiple-vcalendars.diary-european | 0
.../icalendar-resources}/import-multiple-vcalendars.diary-iso | 0
.../icalendar-resources}/import-multiple-vcalendars.ics | 0
.../icalendar-resources}/import-non-recurring-1.diary-american | 0
.../icalendar-resources}/import-non-recurring-1.diary-european | 0
.../icalendar-resources}/import-non-recurring-1.diary-iso | 0
.../calendar/icalendar-resources}/import-non-recurring-1.ics | 0
.../import-non-recurring-all-day.diary-american | 0
.../import-non-recurring-all-day.diary-european | 0
.../import-non-recurring-all-day.diary-iso | 0
.../icalendar-resources}/import-non-recurring-all-day.ics | 0
.../import-non-recurring-another-example.diary-american | 0
.../import-non-recurring-another-example.diary-european | 0
.../import-non-recurring-another-example.diary-iso | 0
.../import-non-recurring-another-example.ics | 0
.../import-non-recurring-block.diary-american | 0
.../import-non-recurring-block.diary-european | 0
.../icalendar-resources}/import-non-recurring-block.diary-iso | 0
.../icalendar-resources}/import-non-recurring-block.ics | 0
.../import-non-recurring-folded-summary.diary-american | 0
.../import-non-recurring-folded-summary.diary-european | 0
.../import-non-recurring-folded-summary.diary-iso | 0
.../import-non-recurring-folded-summary.ics | 0
.../import-non-recurring-long-summary.diary-american | 0
.../import-non-recurring-long-summary.diary-european | 0
.../import-non-recurring-long-summary.diary-iso | 0
.../icalendar-resources}/import-non-recurring-long-summary.ics | 0
.../import-real-world-2003-05-29.diary-american | 0
.../import-real-world-2003-05-29.diary-european | 0
.../icalendar-resources}/import-real-world-2003-05-29.ics | 0
.../import-real-world-2003-06-18a.diary-american | 0
.../import-real-world-2003-06-18a.diary-european | 0
.../icalendar-resources}/import-real-world-2003-06-18a.ics | 0
.../import-real-world-2003-06-18b.diary-american | 0
.../import-real-world-2003-06-18b.diary-european | 0
.../icalendar-resources}/import-real-world-2003-06-18b.ics | 0
.../import-real-world-2004-11-19.diary-american | 0
.../import-real-world-2004-11-19.diary-european | 0
.../icalendar-resources}/import-real-world-2004-11-19.ics | 0
.../import-real-world-2005-02-07.diary-american | 0
.../import-real-world-2005-02-07.diary-european | 0
.../icalendar-resources}/import-real-world-2005-02-07.ics | 0
.../import-real-world-2005-03-01.diary-american | 0
.../import-real-world-2005-03-01.diary-european | 0
.../icalendar-resources}/import-real-world-2005-03-01.ics | 0
.../import-real-world-no-dst.diary-american | 0
.../import-real-world-no-dst.diary-european | 0
.../calendar/icalendar-resources}/import-real-world-no-dst.ics | 0
.../import-rrule-anniversary.diary-american | 0
.../import-rrule-anniversary.diary-european | 0
.../icalendar-resources}/import-rrule-anniversary.diary-iso | 0
.../calendar/icalendar-resources}/import-rrule-anniversary.ics | 0
.../import-rrule-count-bi-weekly.diary-american | 0
.../import-rrule-count-bi-weekly.diary-european | 0
.../import-rrule-count-bi-weekly.diary-iso | 0
.../icalendar-resources}/import-rrule-count-bi-weekly.ics | 0
.../import-rrule-count-daily-long.diary-american | 0
.../import-rrule-count-daily-long.diary-european | 0
.../import-rrule-count-daily-long.diary-iso | 0
.../icalendar-resources}/import-rrule-count-daily-long.ics | 0
.../import-rrule-count-daily-short.diary-american | 0
.../import-rrule-count-daily-short.diary-european | 0
.../import-rrule-count-daily-short.diary-iso | 0
.../icalendar-resources}/import-rrule-count-daily-short.ics | 0
.../import-rrule-count-every-second-month.diary-american | 0
.../import-rrule-count-every-second-month.diary-european | 0
.../import-rrule-count-every-second-month.diary-iso | 0
.../import-rrule-count-every-second-month.ics | 0
.../import-rrule-count-every-second-year.diary-american | 0
.../import-rrule-count-every-second-year.diary-european | 0
.../import-rrule-count-every-second-year.diary-iso | 0
.../import-rrule-count-every-second-year.ics | 0
.../import-rrule-count-monthly.diary-american | 0
.../import-rrule-count-monthly.diary-european | 0
.../icalendar-resources}/import-rrule-count-monthly.diary-iso | 0
.../icalendar-resources}/import-rrule-count-monthly.ics | 0
.../import-rrule-count-yearly.diary-american | 0
.../import-rrule-count-yearly.diary-european | 0
.../icalendar-resources}/import-rrule-count-yearly.diary-iso | 0
.../icalendar-resources}/import-rrule-count-yearly.ics | 0
.../import-rrule-daily-two-day.diary-american | 0
.../import-rrule-daily-two-day.diary-european | 0
.../icalendar-resources}/import-rrule-daily-two-day.diary-iso | 0
.../icalendar-resources}/import-rrule-daily-two-day.ics | 0
.../import-rrule-daily-with-exceptions.diary-american | 0
.../import-rrule-daily-with-exceptions.diary-european | 0
.../import-rrule-daily-with-exceptions.diary-iso | 0
.../import-rrule-daily-with-exceptions.ics | 0
.../icalendar-resources}/import-rrule-daily.diary-american | 0
.../icalendar-resources}/import-rrule-daily.diary-european | 0
.../calendar/icalendar-resources}/import-rrule-daily.diary-iso | 0
.../calendar/icalendar-resources}/import-rrule-daily.ics | 0
.../import-rrule-monthly-no-end.diary-american | 0
.../import-rrule-monthly-no-end.diary-european | 0
.../icalendar-resources}/import-rrule-monthly-no-end.diary-iso | 0
.../icalendar-resources}/import-rrule-monthly-no-end.ics | 0
.../import-rrule-monthly-with-end.diary-american | 0
.../import-rrule-monthly-with-end.diary-european | 0
.../import-rrule-monthly-with-end.diary-iso | 0
.../icalendar-resources}/import-rrule-monthly-with-end.ics | 0
.../icalendar-resources}/import-rrule-weekly.diary-american | 0
.../icalendar-resources}/import-rrule-weekly.diary-european | 0
.../icalendar-resources}/import-rrule-weekly.diary-iso | 0
.../calendar/icalendar-resources}/import-rrule-weekly.ics | 0
.../icalendar-resources}/import-rrule-yearly.diary-american | 0
.../icalendar-resources}/import-rrule-yearly.diary-european | 0
.../icalendar-resources}/import-rrule-yearly.diary-iso | 0
.../calendar/icalendar-resources}/import-rrule-yearly.ics | 0
.../icalendar-resources}/import-with-timezone.diary-iso | 0
.../calendar/icalendar-resources}/import-with-timezone.ics | 0
.../icalendar-resources}/import-with-uid.diary-american | 0
.../icalendar-resources}/import-with-uid.diary-european | 0
.../calendar/icalendar-resources}/import-with-uid.diary-iso | 0
.../calendar/icalendar-resources}/import-with-uid.ics | 0
test/lisp/calendar/icalendar-tests.el | 10 +++-------
142 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/test/data/icalendar/import-bug-11473.diary-european
b/test/lisp/calendar/icalendar-resources/import-bug-11473.diary-european
similarity index 100%
rename from test/data/icalendar/import-bug-11473.diary-european
rename to test/lisp/calendar/icalendar-resources/import-bug-11473.diary-european
diff --git a/test/data/icalendar/import-bug-11473.ics
b/test/lisp/calendar/icalendar-resources/import-bug-11473.ics
similarity index 100%
rename from test/data/icalendar/import-bug-11473.ics
rename to test/lisp/calendar/icalendar-resources/import-bug-11473.ics
diff --git a/test/data/icalendar/import-bug-22092.diary-american
b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-american
similarity index 100%
rename from test/data/icalendar/import-bug-22092.diary-american
rename to test/lisp/calendar/icalendar-resources/import-bug-22092.diary-american
diff --git a/test/data/icalendar/import-bug-22092.diary-european
b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-european
similarity index 100%
rename from test/data/icalendar/import-bug-22092.diary-european
rename to test/lisp/calendar/icalendar-resources/import-bug-22092.diary-european
diff --git a/test/data/icalendar/import-bug-22092.diary-iso
b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-iso
similarity index 100%
rename from test/data/icalendar/import-bug-22092.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-bug-22092.diary-iso
diff --git a/test/data/icalendar/import-bug-22092.ics
b/test/lisp/calendar/icalendar-resources/import-bug-22092.ics
similarity index 100%
rename from test/data/icalendar/import-bug-22092.ics
rename to test/lisp/calendar/icalendar-resources/import-bug-22092.ics
diff --git a/test/data/icalendar/import-bug-24199.diary-american
b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-american
similarity index 100%
rename from test/data/icalendar/import-bug-24199.diary-american
rename to test/lisp/calendar/icalendar-resources/import-bug-24199.diary-american
diff --git a/test/data/icalendar/import-bug-24199.diary-european
b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-european
similarity index 100%
rename from test/data/icalendar/import-bug-24199.diary-european
rename to test/lisp/calendar/icalendar-resources/import-bug-24199.diary-european
diff --git a/test/data/icalendar/import-bug-24199.diary-iso
b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-iso
similarity index 100%
rename from test/data/icalendar/import-bug-24199.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-bug-24199.diary-iso
diff --git a/test/data/icalendar/import-bug-24199.ics
b/test/lisp/calendar/icalendar-resources/import-bug-24199.ics
similarity index 100%
rename from test/data/icalendar/import-bug-24199.ics
rename to test/lisp/calendar/icalendar-resources/import-bug-24199.ics
diff --git a/test/data/icalendar/import-bug-33277.diary-american
b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-american
similarity index 100%
rename from test/data/icalendar/import-bug-33277.diary-american
rename to test/lisp/calendar/icalendar-resources/import-bug-33277.diary-american
diff --git a/test/data/icalendar/import-bug-33277.diary-european
b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-european
similarity index 100%
rename from test/data/icalendar/import-bug-33277.diary-european
rename to test/lisp/calendar/icalendar-resources/import-bug-33277.diary-european
diff --git a/test/data/icalendar/import-bug-33277.diary-iso
b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-iso
similarity index 100%
rename from test/data/icalendar/import-bug-33277.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-bug-33277.diary-iso
diff --git a/test/data/icalendar/import-bug-33277.ics
b/test/lisp/calendar/icalendar-resources/import-bug-33277.ics
similarity index 100%
rename from test/data/icalendar/import-bug-33277.ics
rename to test/lisp/calendar/icalendar-resources/import-bug-33277.ics
diff --git a/test/data/icalendar/import-bug-6766.diary-american
b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-american
similarity index 100%
rename from test/data/icalendar/import-bug-6766.diary-american
rename to test/lisp/calendar/icalendar-resources/import-bug-6766.diary-american
diff --git a/test/data/icalendar/import-bug-6766.diary-european
b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-european
similarity index 100%
rename from test/data/icalendar/import-bug-6766.diary-european
rename to test/lisp/calendar/icalendar-resources/import-bug-6766.diary-european
diff --git a/test/data/icalendar/import-bug-6766.diary-iso
b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-iso
similarity index 100%
rename from test/data/icalendar/import-bug-6766.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-bug-6766.diary-iso
diff --git a/test/data/icalendar/import-bug-6766.ics
b/test/lisp/calendar/icalendar-resources/import-bug-6766.ics
similarity index 100%
rename from test/data/icalendar/import-bug-6766.ics
rename to test/lisp/calendar/icalendar-resources/import-bug-6766.ics
diff --git a/test/data/icalendar/import-duration-2.diary-american
b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-american
similarity index 100%
rename from test/data/icalendar/import-duration-2.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-duration-2.diary-american
diff --git a/test/data/icalendar/import-duration-2.diary-european
b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-european
similarity index 100%
rename from test/data/icalendar/import-duration-2.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-duration-2.diary-european
diff --git a/test/data/icalendar/import-duration-2.diary-iso
b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-iso
similarity index 100%
rename from test/data/icalendar/import-duration-2.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-duration-2.diary-iso
diff --git a/test/data/icalendar/import-duration-2.ics
b/test/lisp/calendar/icalendar-resources/import-duration-2.ics
similarity index 100%
rename from test/data/icalendar/import-duration-2.ics
rename to test/lisp/calendar/icalendar-resources/import-duration-2.ics
diff --git a/test/data/icalendar/import-duration.diary-american
b/test/lisp/calendar/icalendar-resources/import-duration.diary-american
similarity index 100%
rename from test/data/icalendar/import-duration.diary-american
rename to test/lisp/calendar/icalendar-resources/import-duration.diary-american
diff --git a/test/data/icalendar/import-duration.diary-european
b/test/lisp/calendar/icalendar-resources/import-duration.diary-european
similarity index 100%
rename from test/data/icalendar/import-duration.diary-european
rename to test/lisp/calendar/icalendar-resources/import-duration.diary-european
diff --git a/test/data/icalendar/import-duration.diary-iso
b/test/lisp/calendar/icalendar-resources/import-duration.diary-iso
similarity index 100%
rename from test/data/icalendar/import-duration.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-duration.diary-iso
diff --git a/test/data/icalendar/import-duration.ics
b/test/lisp/calendar/icalendar-resources/import-duration.ics
similarity index 100%
rename from test/data/icalendar/import-duration.ics
rename to test/lisp/calendar/icalendar-resources/import-duration.ics
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-american
b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-american
similarity index 100%
rename from test/data/icalendar/import-multiple-vcalendars.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-american
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-european
b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-european
similarity index 100%
rename from test/data/icalendar/import-multiple-vcalendars.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-european
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-iso
b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-iso
similarity index 100%
rename from test/data/icalendar/import-multiple-vcalendars.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-iso
diff --git a/test/data/icalendar/import-multiple-vcalendars.ics
b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.ics
similarity index 100%
rename from test/data/icalendar/import-multiple-vcalendars.ics
rename to test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.ics
diff --git a/test/data/icalendar/import-non-recurring-1.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-american
similarity index 100%
rename from test/data/icalendar/import-non-recurring-1.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-american
diff --git a/test/data/icalendar/import-non-recurring-1.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-european
similarity index 100%
rename from test/data/icalendar/import-non-recurring-1.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-european
diff --git a/test/data/icalendar/import-non-recurring-1.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-1.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-1.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-1.ics
rename to test/lisp/calendar/icalendar-resources/import-non-recurring-1.ics
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-american
similarity index 100%
rename from test/data/icalendar/import-non-recurring-all-day.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-american
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-european
similarity index 100%
rename from test/data/icalendar/import-non-recurring-all-day.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-european
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-all-day.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-all-day.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-all-day.ics
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
diff --git
a/test/data/icalendar/import-non-recurring-another-example.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-american
similarity index 100%
rename from
test/data/icalendar/import-non-recurring-another-example.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-american
diff --git
a/test/data/icalendar/import-non-recurring-another-example.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-european
similarity index 100%
rename from
test/data/icalendar/import-non-recurring-another-example.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-european
diff --git a/test/data/icalendar/import-non-recurring-another-example.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-another-example.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-another-example.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-another-example.ics
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.ics
diff --git a/test/data/icalendar/import-non-recurring-block.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-american
similarity index 100%
rename from test/data/icalendar/import-non-recurring-block.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-american
diff --git a/test/data/icalendar/import-non-recurring-block.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-european
similarity index 100%
rename from test/data/icalendar/import-non-recurring-block.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-european
diff --git a/test/data/icalendar/import-non-recurring-block.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-block.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-block.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-block.ics
rename to test/lisp/calendar/icalendar-resources/import-non-recurring-block.ics
diff --git
a/test/data/icalendar/import-non-recurring-folded-summary.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-american
similarity index 100%
rename from
test/data/icalendar/import-non-recurring-folded-summary.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-american
diff --git
a/test/data/icalendar/import-non-recurring-folded-summary.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-european
similarity index 100%
rename from
test/data/icalendar/import-non-recurring-folded-summary.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-european
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-folded-summary.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-folded-summary.ics
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.ics
diff --git
a/test/data/icalendar/import-non-recurring-long-summary.diary-american
b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-american
similarity index 100%
rename from test/data/icalendar/import-non-recurring-long-summary.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-american
diff --git
a/test/data/icalendar/import-non-recurring-long-summary.diary-european
b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-european
similarity index 100%
rename from test/data/icalendar/import-non-recurring-long-summary.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-european
diff --git a/test/data/icalendar/import-non-recurring-long-summary.diary-iso
b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-iso
similarity index 100%
rename from test/data/icalendar/import-non-recurring-long-summary.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-long-summary.ics
b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.ics
similarity index 100%
rename from test/data/icalendar/import-non-recurring-long-summary.ics
rename to
test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.ics
diff --git a/test/data/icalendar/import-real-world-2003-05-29.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-05-29.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-05-29.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-05-29.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-05-29.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-05-29.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.ics
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18a.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18a.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18a.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.ics
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18b.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18b.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2003-06-18b.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.ics
diff --git a/test/data/icalendar/import-real-world-2004-11-19.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2004-11-19.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-american
diff --git a/test/data/icalendar/import-real-world-2004-11-19.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2004-11-19.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-european
diff --git a/test/data/icalendar/import-real-world-2004-11-19.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2004-11-19.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.ics
diff --git a/test/data/icalendar/import-real-world-2005-02-07.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-02-07.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-american
diff --git a/test/data/icalendar/import-real-world-2005-02-07.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-02-07.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-european
diff --git a/test/data/icalendar/import-real-world-2005-02-07.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-02-07.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.ics
diff --git a/test/data/icalendar/import-real-world-2005-03-01.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-03-01.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-american
diff --git a/test/data/icalendar/import-real-world-2005-03-01.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-03-01.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-european
diff --git a/test/data/icalendar/import-real-world-2005-03-01.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-2005-03-01.ics
rename to
test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.ics
diff --git a/test/data/icalendar/import-real-world-no-dst.diary-american
b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-american
similarity index 100%
rename from test/data/icalendar/import-real-world-no-dst.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-american
diff --git a/test/data/icalendar/import-real-world-no-dst.diary-european
b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-european
similarity index 100%
rename from test/data/icalendar/import-real-world-no-dst.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-european
diff --git a/test/data/icalendar/import-real-world-no-dst.ics
b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.ics
similarity index 100%
rename from test/data/icalendar/import-real-world-no-dst.ics
rename to test/lisp/calendar/icalendar-resources/import-real-world-no-dst.ics
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-anniversary.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-american
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-anniversary.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-european
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-anniversary.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-iso
diff --git a/test/data/icalendar/import-rrule-anniversary.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-anniversary.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-count-bi-weekly.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-count-bi-weekly.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-bi-weekly.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-bi-weekly.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.ics
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-long.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-american
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-long.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-european
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-long.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-daily-long.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-long.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.ics
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-short.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-american
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-short.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-european
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-short.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-daily-short.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-daily-short.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.ics
diff --git
a/test/data/icalendar/import-rrule-count-every-second-month.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-american
similarity index 100%
rename from
test/data/icalendar/import-rrule-count-every-second-month.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-american
diff --git
a/test/data/icalendar/import-rrule-count-every-second-month.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-european
similarity index 100%
rename from
test/data/icalendar/import-rrule-count-every-second-month.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-european
diff --git
a/test/data/icalendar/import-rrule-count-every-second-month.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-every-second-month.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-every-second-month.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-every-second-month.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.ics
diff --git
a/test/data/icalendar/import-rrule-count-every-second-year.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-american
similarity index 100%
rename from
test/data/icalendar/import-rrule-count-every-second-year.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-american
diff --git
a/test/data/icalendar/import-rrule-count-every-second-year.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-european
similarity index 100%
rename from
test/data/icalendar/import-rrule-count-every-second-year.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-european
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-every-second-year.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-every-second-year.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.ics
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-count-monthly.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-count-monthly.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-monthly.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-monthly.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-monthly.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.ics
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-count-yearly.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-count-yearly.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-count-yearly.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-yearly.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-count-yearly.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.ics
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-two-day.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-american
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-two-day.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-european
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-two-day.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily-two-day.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-two-day.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.ics
diff --git
a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-american
similarity index 100%
rename from
test/data/icalendar/import-rrule-daily-with-exceptions.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-american
diff --git
a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-european
similarity index 100%
rename from
test/data/icalendar/import-rrule-daily-with-exceptions.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-european
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-with-exceptions.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-daily-with-exceptions.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
diff --git a/test/data/icalendar/import-rrule-daily.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-daily.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-american
diff --git a/test/data/icalendar/import-rrule-daily.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-daily.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-european
diff --git a/test/data/icalendar/import-rrule-daily.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-daily.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-daily.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-no-end.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-american
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-no-end.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-european
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-no-end.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-iso
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-no-end.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-with-end.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-american
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-with-end.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-european
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-with-end.diary-iso
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-iso
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-monthly-with-end.ics
rename to
test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
diff --git a/test/data/icalendar/import-rrule-weekly.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-weekly.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-american
diff --git a/test/data/icalendar/import-rrule-weekly.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-weekly.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-european
diff --git a/test/data/icalendar/import-rrule-weekly.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-weekly.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-iso
diff --git a/test/data/icalendar/import-rrule-weekly.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-weekly.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
diff --git a/test/data/icalendar/import-rrule-yearly.diary-american
b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-american
similarity index 100%
rename from test/data/icalendar/import-rrule-yearly.diary-american
rename to
test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-american
diff --git a/test/data/icalendar/import-rrule-yearly.diary-european
b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-european
similarity index 100%
rename from test/data/icalendar/import-rrule-yearly.diary-european
rename to
test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-european
diff --git a/test/data/icalendar/import-rrule-yearly.diary-iso
b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-iso
similarity index 100%
rename from test/data/icalendar/import-rrule-yearly.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-iso
diff --git a/test/data/icalendar/import-rrule-yearly.ics
b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.ics
similarity index 100%
rename from test/data/icalendar/import-rrule-yearly.ics
rename to test/lisp/calendar/icalendar-resources/import-rrule-yearly.ics
diff --git a/test/data/icalendar/import-with-timezone.diary-iso
b/test/lisp/calendar/icalendar-resources/import-with-timezone.diary-iso
similarity index 100%
rename from test/data/icalendar/import-with-timezone.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-with-timezone.diary-iso
diff --git a/test/data/icalendar/import-with-timezone.ics
b/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
similarity index 100%
rename from test/data/icalendar/import-with-timezone.ics
rename to test/lisp/calendar/icalendar-resources/import-with-timezone.ics
diff --git a/test/data/icalendar/import-with-uid.diary-american
b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-american
similarity index 100%
rename from test/data/icalendar/import-with-uid.diary-american
rename to test/lisp/calendar/icalendar-resources/import-with-uid.diary-american
diff --git a/test/data/icalendar/import-with-uid.diary-european
b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-european
similarity index 100%
rename from test/data/icalendar/import-with-uid.diary-european
rename to test/lisp/calendar/icalendar-resources/import-with-uid.diary-european
diff --git a/test/data/icalendar/import-with-uid.diary-iso
b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-iso
similarity index 100%
rename from test/data/icalendar/import-with-uid.diary-iso
rename to test/lisp/calendar/icalendar-resources/import-with-uid.diary-iso
diff --git a/test/data/icalendar/import-with-uid.ics
b/test/lisp/calendar/icalendar-resources/import-with-uid.ics
similarity index 100%
rename from test/data/icalendar/import-with-uid.ics
rename to test/lisp/calendar/icalendar-resources/import-with-uid.ics
diff --git a/test/lisp/calendar/icalendar-tests.el
b/test/lisp/calendar/icalendar-tests.el
index 5143c78..8b44f63 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -32,6 +32,7 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'icalendar)
;; ======================================================================
@@ -51,18 +52,13 @@
(replace-regexp-in-string "[ \t\n]+\\'" ""
(replace-regexp-in-string "\\`[ \t\n]+" ""
string)))
-(defconst icalendar-tests--data-dir
- (expand-file-name "test/data/icalendar" source-directory))
-
(defun icalendar-tests--get-file-contents (filename)
"Return contents of file in test data directory named FILENAME."
(with-temp-buffer
- (let ((f1 (expand-file-name filename icalendar-tests--data-dir))
- (f2 (expand-file-name filename "../../data/icalendar"))
- (coding-system-for-read 'raw-text)
+ (let ((coding-system-for-read 'raw-text)
(inhibit-eol-conversion t))
(insert-file-contents-literally
- (if (file-exists-p f1) f1 f2))
+ (ert-resource-file filename))
(buffer-string))))
;; ======================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 9e4f11a: Move icalendar test data to test/lisp/calendar/icalendar-resources,
Ulf Jasper <=