diff --git a/src/test/groovy/net/fortuna/ical4j/data/CalendarParserImplSpec.groovy b/src/test/groovy/net/fortuna/ical4j/data/CalendarParserImplSpec.groovy index b5b8d708a..6bb20839b 100644 --- a/src/test/groovy/net/fortuna/ical4j/data/CalendarParserImplSpec.groovy +++ b/src/test/groovy/net/fortuna/ical4j/data/CalendarParserImplSpec.groovy @@ -76,7 +76,7 @@ class CalendarParserImplSpec extends Specification { } expect: - Calendar calendar = Calendars.load(filename) + Calendar calendar = Calendars.load(CalendarParserImplSpec.getResource(resource)) cleanup: compatibilityHints.each { @@ -84,8 +84,8 @@ class CalendarParserImplSpec extends Specification { } where: - filename | compatibilityHints - 'etc/samples/valid/bhav23-1.ics' | [] - 'etc/samples/invalid/bhav23-2.ics' | [KEY_RELAXED_UNFOLDING, KEY_RELAXED_PARSING] + resource | compatibilityHints + '/samples/valid/bhav23-1.ics' | [] + '/samples/invalid/bhav23-2.ics' | [KEY_RELAXED_UNFOLDING, KEY_RELAXED_PARSING] } } diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java index f402674a1..03b8c41af 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java @@ -148,19 +148,15 @@ public static Test suite() throws FileNotFoundException { File[] testFiles = null; - // single test.. -// suite.addTest(new CalendarBuilderTest("testBuildValid", -// new File("etc/samples/valid/oracle.ics").getPath())); - // valid tests.. - testFiles = new File("etc/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarBuilderTest("testBuildValid", testFiles[i].getPath())); } // invalid tests.. - testFiles = new File("etc/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarBuilderTest("testBuildInvalid", testFiles[i].getPath())); diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java index bf18199d8..0a902fa85 100755 --- a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java @@ -31,7 +31,7 @@ */ package net.fortuna.ical4j.data; -import java.io.FileInputStream; +import java.io.InputStream; import junit.framework.TestCase; import net.fortuna.ical4j.model.Calendar; @@ -84,12 +84,12 @@ public void testVTimeZoneAfterVEvent() throws Exception { // Evolution includes VTIMEZONE defs after VEVENT defs, // which is allowed by RFC-2445 - FileInputStream fin = new FileInputStream( - "etc/samples/valid/evolution.ics"); + InputStream in = getClass().getResourceAsStream( + "/samples/valid/evolution.ics"); CalendarBuilder builder = new CalendarBuilder(); Calendar calendar = null; - calendar = builder.build(fin); + calendar = builder.build(in); assertNotNull("Calendar is null", calendar); ComponentList comps = calendar.getComponents(Component.VEVENT); assertTrue("VEVENT not found", comps.size() == 1); diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java index b70932b0f..015fb01ba 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java @@ -170,7 +170,7 @@ public final String getName() { public static TestSuite suite() { TestSuite suite = new TestSuite(); - File[] testFiles = new File("etc/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + File[] testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); for (int i = 0; i < testFiles.length; i++) { suite.addTest(new CalendarEqualsTest((File) testFiles[i], true)); } diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java index 98933d0f3..c5157e36c 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java @@ -156,14 +156,14 @@ public static Test suite() { File[] testFiles = null; // valid tests.. - testFiles = new File("etc/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarOutputterTest(testFiles[i].getPath())); } // invalid tests.. - testFiles = new File("etc/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarOutputterTest(testFiles[i].getPath())); diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java index 9ae3f28a1..3eeef6273 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.net.URL; /** * $Id$ @@ -53,17 +54,17 @@ public class CalendarParserImplTest extends TestCase { private static final Logger LOG = LoggerFactory.getLogger(CalendarParserImplTest.class); - private String filename; + private URL resource; private int expectedErrorLineNo; /** - * @param filename + * @param resouces a calendar resource * @param expectedErrorLineNo */ - public CalendarParserImplTest(String filename, int expectedErrorLineNo) { + public CalendarParserImplTest(String resourceString, int expectedErrorLineNo) { super("testParseException"); - this.filename = filename; + this.resource = getClass().getResource(resourceString); this.expectedErrorLineNo = expectedErrorLineNo; } @@ -90,8 +91,8 @@ protected void tearDown() throws Exception { */ public void testParseException() throws IOException { try { - Calendars.load(filename); - fail("Should throw ParserException: [" + filename + "]"); + Calendars.load(resource); + fail("Should throw ParserException: [" + resource + "]"); } catch (ParserException pe) { LOG.info(pe.getMessage()); assertEquals(expectedErrorLineNo, pe.getLineNo()); @@ -106,7 +107,7 @@ public void testParseException() throws IOException { * Overridden to return the current iCalendar file under test. */ public final String getName() { - return super.getName() + " [" + filename + "]"; + return super.getName() + " [" + resource + "]"; } /** @@ -114,20 +115,20 @@ public final String getName() { */ public static TestSuite suite() { TestSuite suite = new TestSuite(); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/google_aus_holidays.ics", 11)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/13-MoonPhase.ics", 215)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/google_aus_holidays.ics", 11)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/13-MoonPhase.ics", 215)); // CalendarParserImpl thinks this error happened on line 24, but you can // see that invalid property "X" starts on line 23, and ends there. -// suite.addTest(new CalendarParserImplTest("etc/samples/invalid/CalendarDataFile.ics", 23)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/CalendarDataFile.ics", 24)); +// suite.addTest(new CalendarParserImplTest("samples/invalid/CalendarDataFile.ics", 23)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/CalendarDataFile.ics", 24)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/overlaps.ics", 1)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/phpicalendar_sample.ics", 93)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/schedule-unstable.ics", 196)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/smallcluster.ics", 2)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/twinkle.ics", 67)); - suite.addTest(new CalendarParserImplTest("etc/samples/invalid/zidestoreical4jbomb.ics", 10)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/overlaps.ics", 1)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/phpicalendar_sample.ics", 93)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/schedule-unstable.ics", 196)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/smallcluster.ics", 2)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/twinkle.ics", 67)); + suite.addTest(new CalendarParserImplTest("/samples/invalid/zidestoreical4jbomb.ics", 10)); return suite; } } diff --git a/src/test/java/net/fortuna/ical4j/data/HCalendarParserTest.java b/src/test/java/net/fortuna/ical4j/data/HCalendarParserTest.java index 9726bf27a..457315454 100755 --- a/src/test/java/net/fortuna/ical4j/data/HCalendarParserTest.java +++ b/src/test/java/net/fortuna/ical4j/data/HCalendarParserTest.java @@ -60,12 +60,12 @@ protected void setUp() throws Exception { * Test method for {@link net.fortuna.ical4j.data.HCalendarParser#parse(java.io.Reader, net.fortuna.ical4j.data.ContentHandler)}. */ public void testParseReaderContentHandler() throws IOException, ParserException { - Calendar icsCalendar = Calendars.load("etc/samples/hcalendar/example1.ics"); + Calendar icsCalendar = Calendars.load(getClass().getResource("/samples/hcalendar/example1.ics")); // remove prod-id which seems to be not handled by hcalendar.. icsCalendar.getProperties().remove(icsCalendar.getProperty(Property.PRODID)); CalendarBuilder builder = new CalendarBuilder(new HCalendarParser()); - Calendar hcalCalendar = builder.build(new FileReader("etc/samples/hcalendar/example1.html")); + Calendar hcalCalendar = builder.build(getClass().getResourceAsStream("/samples/hcalendar/example1.html")); // assertEquals(icsCalendar, hcalCalendar); assertEquals(icsCalendar.getProperties().size(), hcalCalendar.getProperties().size()); diff --git a/src/test/java/net/fortuna/ical4j/filter/FilterTest.java b/src/test/java/net/fortuna/ical4j/filter/FilterTest.java index 1d1344aec..28e4b4e94 100644 --- a/src/test/java/net/fortuna/ical4j/filter/FilterTest.java +++ b/src/test/java/net/fortuna/ical4j/filter/FilterTest.java @@ -115,9 +115,6 @@ public void testFilteredSize() { */ @SuppressWarnings("unchecked") public static TestSuite suite() throws FileNotFoundException, IOException, ParserException, URISyntaxException { -// CalendarBuilder builder = new CalendarBuilder(); -// Calendar calendar = builder.build(new FileReader("etc/samples/valid/incoming.ics")); - Organizer organizer = new Organizer(new URI("Mailto:B@example.com")); Attendee a1 = new Attendee(new URI("Mailto:A@example.com")); Attendee a2 = new Attendee(new URI("Mailto:C@example.com")); diff --git a/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java b/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java index d39ec6541..0dac22bd7 100644 --- a/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java +++ b/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java @@ -120,7 +120,7 @@ public void testRecurrenceRules() throws ParserException, IOException, ParseExce */ public static TestSuite suite() throws FileNotFoundException, IOException, ParserException { CalendarBuilder builder = new CalendarBuilder(); - Calendar calendar = builder.build(new FileReader("etc/samples/valid/Australian_TV_Melbourne.ics")); + Calendar calendar = builder.build(PeriodRuleTest.class.getResourceAsStream("/samples/valid/Australian_TV_Melbourne.ics")); TestSuite suite = new TestSuite(); @@ -170,7 +170,7 @@ public static TestSuite suite() throws FileNotFoundException, IOException, Parse } // Test exclusion of particular dates.. - Calendar exCal = Calendars.load("etc/samples/valid/friday13.ics"); + Calendar exCal = Calendars.load(PeriodRuleTest.class.getResource("/samples/valid/friday13.ics")); cal = java.util.Calendar.getInstance(); cal.set(1997, 8, 2, 9, 0, 0); DateTime startDt = new DateTime(cal.getTime()); @@ -179,7 +179,7 @@ public static TestSuite suite() throws FileNotFoundException, IOException, Parse suite.addTest(new PeriodRuleTest("testFilteredIsEmpty", filter, exCal.getComponents())); // Test exclusion of particular date patterns.. - exCal = Calendars.load("etc/samples/valid/friday13-NOT.ics"); + exCal = Calendars.load(PeriodRuleTest.class.getResource("/samples/valid/friday13-NOT.ics")); cal = java.util.Calendar.getInstance(); cal.set(1997, 8, 2, 9, 0, 0); startDt = new DateTime(cal.getTime()); @@ -189,7 +189,7 @@ public static TestSuite suite() throws FileNotFoundException, IOException, Parse // Asia/Singapore test.. CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING, true); - calendar = Calendars.load("etc/samples/valid/2207678.ics"); + calendar = Calendars.load(PeriodRuleTest.class.getResource("/samples/valid/2207678.ics")); CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING); TimeZone timeZone = TimeZone.getTimeZone("Asia/Singapore"); diff --git a/src/test/java/net/fortuna/ical4j/model/IndexedComponentListTest.java b/src/test/java/net/fortuna/ical4j/model/IndexedComponentListTest.java index 9f780c73b..e02d9240d 100644 --- a/src/test/java/net/fortuna/ical4j/model/IndexedComponentListTest.java +++ b/src/test/java/net/fortuna/ical4j/model/IndexedComponentListTest.java @@ -61,7 +61,7 @@ public class IndexedComponentListTest extends TestCase { */ protected void setUp() throws Exception { CalendarBuilder builder = new CalendarBuilder(); - calendar = builder.build(new FileReader("etc/samples/valid/Australian_TV_Melbourne.ics")); + calendar = builder.build(getClass().getResourceAsStream("/samples/valid/Australian_TV_Melbourne.ics")); } /** diff --git a/src/test/java/net/fortuna/ical4j/model/IndexedPropertyListTest.java b/src/test/java/net/fortuna/ical4j/model/IndexedPropertyListTest.java index b49121fec..637329d32 100644 --- a/src/test/java/net/fortuna/ical4j/model/IndexedPropertyListTest.java +++ b/src/test/java/net/fortuna/ical4j/model/IndexedPropertyListTest.java @@ -59,7 +59,7 @@ public class IndexedPropertyListTest extends TestCase { */ protected void setUp() throws Exception { CalendarBuilder builder = new CalendarBuilder(); - calendar = builder.build(new FileReader("etc/samples/valid/incoming.ics")); + calendar = builder.build(getClass().getResourceAsStream("/samples/valid/incoming.ics")); } /** diff --git a/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java b/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java index 720b5aa65..4e69b90db 100644 --- a/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java +++ b/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java @@ -47,9 +47,10 @@ import org.slf4j.LoggerFactory; import java.io.File; -import java.io.FileInputStream; +import java.io.InputStream; import java.io.IOException; import java.net.URISyntaxException; +import java.net.URL; import java.text.ParseException; import java.util.Calendar; import java.util.Iterator; @@ -144,14 +145,14 @@ private static Calendar getCalendarInstance() { * @param filename * @return */ - private net.fortuna.ical4j.model.Calendar loadCalendar(String filename) + private net.fortuna.ical4j.model.Calendar loadCalendar(String resourceString) throws IOException, ParserException, ValidationException { net.fortuna.ical4j.model.Calendar calendar = Calendars.load( - filename); + getClass().getResource(resourceString)); calendar.validate(); - log.info("File: " + filename); + log.info("Resource: " + resourceString); if (log.isDebugEnabled()) { log.debug("Calendar:\n=========\n" + calendar.toString()); @@ -396,9 +397,9 @@ public final void testGetConsumedTimeMonthly() throws Exception { public final void testGetConsumedTime2() throws Exception { - String filename = "etc/samples/valid/derryn.ics"; + String resource = "/samples/valid/derryn.ics"; - net.fortuna.ical4j.model.Calendar calendar = loadCalendar(filename); + net.fortuna.ical4j.model.Calendar calendar = loadCalendar(resource); Date start = new Date(); Calendar endCal = getCalendarInstance(); @@ -418,9 +419,9 @@ public final void testGetConsumedTime2() throws Exception { } public final void testGetConsumedTime3() throws Exception { - String filename = "etc/samples/valid/calconnect10.ics"; + String resource = "/samples/valid/calconnect10.ics"; - net.fortuna.ical4j.model.Calendar calendar = loadCalendar(filename); + net.fortuna.ical4j.model.Calendar calendar = loadCalendar(resource); VEvent vev = (VEvent) calendar.getComponent(Component.VEVENT); @@ -510,8 +511,8 @@ public void testGetConsumedTimeWithExDate() throws ParseException { * @throws ParseException */ public void testGetConsumedTimeWithExDate2() throws IOException, ParserException { - FileInputStream fin = new FileInputStream("etc/samples/valid/friday13.ics"); - net.fortuna.ical4j.model.Calendar calendar = new CalendarBuilder().build(fin); + InputStream in = getClass().getResourceAsStream("/samples/valid/friday13.ics"); + net.fortuna.ical4j.model.Calendar calendar = new CalendarBuilder().build(in); VEvent event = (VEvent) calendar.getComponent(Component.VEVENT); @@ -756,10 +757,10 @@ public static TestSuite suite() throws ValidationException, ParseException, IOEx // test iTIP validation.. // File[] testFiles = new File("etc/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); - File[] testFiles = new File[]{new File("etc/samples/valid/calconnect.ics"), new File("etc/samples/valid/calconnect10.ics")}; + URL[] testFiles = new URL[]{VEventTest.class.getResource("/samples/valid/calconnect.ics"), VEventTest.class.getResource("/samples/valid/calconnect10.ics")}; for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); - net.fortuna.ical4j.model.Calendar calendar = Calendars.load(testFiles[i].getPath()); + net.fortuna.ical4j.model.Calendar calendar = Calendars.load(testFiles[i]); if (Method.PUBLISH.equals(calendar.getProperty(Property.METHOD))) { for (Iterator it = calendar.getComponents(Component.VEVENT).iterator(); it.hasNext(); ) { VEvent event1 = (VEvent) it.next(); diff --git a/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java b/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java index a549b15f7..3da41bf50 100644 --- a/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java +++ b/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FileInputStream; +import java.io.InputStream; import java.io.IOException; import java.net.URISyntaxException; import java.text.ParseException; @@ -184,10 +184,10 @@ public final void testVFreeBusyComponentList() throws Exception { * Class under test for void VFreeBusy(ComponentList) */ public final void testVFreeBusyComponentList2() throws Exception { - FileInputStream fin = new FileInputStream("etc/samples/invalid/core.ics"); + InputStream in = getClass().getResourceAsStream("/samples/invalid/core.ics"); CalendarBuilder builder = new CalendarBuilder(); - Calendar calendar = builder.build(fin); + Calendar calendar = builder.build(in); DateTime startDate = new DateTime(0); DateTime endDate = new DateTime(); diff --git a/src/test/java/net/fortuna/ical4j/model/parameter/TzIdTest.java b/src/test/java/net/fortuna/ical4j/model/parameter/TzIdTest.java index b058eb8d5..3657617e7 100644 --- a/src/test/java/net/fortuna/ical4j/model/parameter/TzIdTest.java +++ b/src/test/java/net/fortuna/ical4j/model/parameter/TzIdTest.java @@ -58,7 +58,7 @@ public class TzIdTest extends TestCase { public void testTzIdCompatibility() throws IOException, ParserException { CalendarBuilder builder = new CalendarBuilder(); - Calendar calendar = builder.build(new FileInputStream("etc/samples/valid/tmeher.ics")); + Calendar calendar = builder.build(getClass().getResourceAsStream("/samples/valid/tmeher.ics")); // ensure the calendar is loaded properly.. assertNotNull(calendar); diff --git a/src/test/java/net/fortuna/ical4j/model/property/AttendeeTest.java b/src/test/java/net/fortuna/ical4j/model/property/AttendeeTest.java index b02fb8c15..23f018257 100644 --- a/src/test/java/net/fortuna/ical4j/model/property/AttendeeTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/AttendeeTest.java @@ -93,7 +93,7 @@ public void testAttendeeString() throws URISyntaxException { public void testRelaxedParsing() throws IOException, ParserException { try { - Calendars.load("etc/samples/invalid/groupwise.ics"); + Calendars.load(getClass().getResource("/samples/invalid/groupwise.ics")); fail("Should throw URISyntaxException"); } catch (ParserException pe) { @@ -101,7 +101,7 @@ public void testRelaxedParsing() throws IOException, ParserException { } CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true); - Calendar calendar = Calendars.load("etc/samples/invalid/groupwise.ics"); + Calendar calendar = Calendars.load(getClass().getResource("/samples/invalid/groupwise.ics")); Attendee attendee = (Attendee) calendar.getComponent(Component.VEVENT).getProperty(Property.ATTENDEE); assertNotNull(attendee.getCalAddress()); diff --git a/src/test/java/net/fortuna/ical4j/model/property/CategoriesTest.java b/src/test/java/net/fortuna/ical4j/model/property/CategoriesTest.java index 86261d0e4..ad792f048 100644 --- a/src/test/java/net/fortuna/ical4j/model/property/CategoriesTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/CategoriesTest.java @@ -141,7 +141,7 @@ public static TestSuite suite() throws IOException, ValidationException, suite.addTest(new CategoriesTest(categories, list)); // Test escaping of categories string representation.. - Calendar calendar = Calendars.load("etc/samples/valid/categories.ics"); + Calendar calendar = Calendars.load(CategoriesTest.class.getResource("/samples/valid/categories.ics")); Categories orig = (Categories) calendar.getComponent(Component.VEVENT) .getProperty(Property.CATEGORIES); diff --git a/src/test/java/net/fortuna/ical4j/model/property/DescriptionTest.java b/src/test/java/net/fortuna/ical4j/model/property/DescriptionTest.java index c202e9999..d4e266b40 100755 --- a/src/test/java/net/fortuna/ical4j/model/property/DescriptionTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/DescriptionTest.java @@ -64,7 +64,7 @@ public DescriptionTest(Property property, String expectedValue) { public static TestSuite suite() throws IOException, ParserException { TestSuite suite = new TestSuite(); // Test correct parsing of text with tabs. - Calendar calendar = Calendars.load("etc/samples/valid/mansour.ics"); + Calendar calendar = Calendars.load(DescriptionTest.class.getResource("/samples/valid/mansour.ics")); Component event = calendar.getComponent(Component.VEVENT); suite.addTest(new DescriptionTest(event .getProperty(Property.DESCRIPTION), "Test\t\ttabs")); diff --git a/src/test/java/net/fortuna/ical4j/model/property/ExDateTest.java b/src/test/java/net/fortuna/ical4j/model/property/ExDateTest.java index 5d1341cb4..232159a48 100644 --- a/src/test/java/net/fortuna/ical4j/model/property/ExDateTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/ExDateTest.java @@ -76,7 +76,7 @@ protected void tearDown() throws Exception { */ public void testTimeZones() throws Exception { CalendarBuilder builder = new CalendarBuilder(); - Calendar calendar = builder.build(new FileInputStream("etc/samples/valid/EXDATE.ics")); + Calendar calendar = builder.build(getClass().getResourceAsStream("/samples/valid/EXDATE.ics")); Component event = calendar.getComponent(Component.VEVENT); PropertyList exdates = event.getProperties(Property.EXDATE); diff --git a/src/test/java/net/fortuna/ical4j/model/property/LocationTest.java b/src/test/java/net/fortuna/ical4j/model/property/LocationTest.java index f5ffea1c9..e369fc51e 100644 --- a/src/test/java/net/fortuna/ical4j/model/property/LocationTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/LocationTest.java @@ -73,7 +73,7 @@ public LocationTest(String testMethod, Location property) { * @throws ParserException */ public void testQuotedText() throws IOException, ParserException { - Calendar calendar = Calendars.load("etc/samples/valid/mansour.ics"); + Calendar calendar = Calendars.load(getClass().getResource("/samples/valid/mansour.ics")); Component event = calendar.getComponent(Component.VEVENT); assertEquals("At \"The Terrace\" Complex > Melbourne \"\\,", event.getProperty(Property.LOCATION).getValue()); } @@ -86,7 +86,7 @@ public void testQuotedText() throws IOException, ParserException { public static TestSuite suite() throws IOException, ParserException { TestSuite suite = new TestSuite(); //testQuotedText.. - Calendar calendar = Calendars.load("etc/samples/valid/mansour.ics"); + Calendar calendar = Calendars.load(LocationTest.class.getResource("/samples/valid/mansour.ics")); Component event = calendar.getComponent(Component.VEVENT); Location location = (Location) event.getProperty(Property.LOCATION); suite.addTest(new LocationTest(location, "At \"The Terrace\" Complex > Melbourne \"\\,")); diff --git a/src/test/java/net/fortuna/ical4j/model/property/SummaryTest.java b/src/test/java/net/fortuna/ical4j/model/property/SummaryTest.java index 01a8fab2a..f9b9b76fd 100644 --- a/src/test/java/net/fortuna/ical4j/model/property/SummaryTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/SummaryTest.java @@ -75,7 +75,7 @@ public SummaryTest(String testMethod, Summary property) { public static TestSuite suite() throws IOException, ParserException { TestSuite suite = new TestSuite(); // Test correct parsing of quoted text.. - Calendar calendar = Calendars.load("etc/samples/valid/mansour.ics"); + Calendar calendar = Calendars.load(SummaryTest.class.getResource("/samples/valid/mansour.ics")); Component event = calendar.getComponent(Component.VEVENT); Summary summary = (Summary) event.getProperty(Property.SUMMARY); suite.addTest(new SummaryTest(summary, "A colon with spaces on either side : like that")); diff --git a/src/test/java/net/fortuna/ical4j/util/CalendarsTest.java b/src/test/java/net/fortuna/ical4j/util/CalendarsTest.java index 442e12eed..02ec7b190 100644 --- a/src/test/java/net/fortuna/ical4j/util/CalendarsTest.java +++ b/src/test/java/net/fortuna/ical4j/util/CalendarsTest.java @@ -42,6 +42,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; @@ -60,6 +61,8 @@ public class CalendarsTest extends TestCase { private static Logger LOG = LoggerFactory.getLogger(CalendarsTest.class); private String path; + + private URL resource; private Calendar[] calendars; @@ -78,6 +81,7 @@ public class CalendarsTest extends TestCase { public CalendarsTest(String testMethod, String path) { super(testMethod); this.path = path; + this.resource = getClass().getResource(path); } /** @@ -114,7 +118,7 @@ public CalendarsTest(String testMethod, Calendar calendar, Charset charset, Stri * @throws ParserException */ public void testLoad() throws IOException, ParserException { - assertNotNull(Calendars.load(path)); + assertNotNull(Calendars.load(resource)); } /** @@ -139,7 +143,7 @@ public void testLoadFileNotFoundException() throws IOException, ParserException */ public void testLoadParserException() throws IOException { try { - Calendars.load(path); + Calendars.load(resource); fail("Should throw ParserException"); } catch (ParserException pe) { LOG.info("Caught exception: " + pe.getMessage()); @@ -190,21 +194,21 @@ public void testGetContentType() { public static TestSuite suite() throws IOException, ParserException { TestSuite suite = new TestSuite(); - suite.addTest(new CalendarsTest("testLoad", "etc/samples/valid/Australian32Holidays.ics")); - suite.addTest(new CalendarsTest("testLoadFileNotFoundException", "etc/samples/valid/doesnt-exist.ics")); - suite.addTest(new CalendarsTest("testLoadParserException", "etc/samples/invalid/google_aus_holidays.ics")); + suite.addTest(new CalendarsTest("testLoad", "/samples/valid/Australian32Holidays.ics")); + suite.addTest(new CalendarsTest("testLoadFileNotFoundException", "/samples/valid/doesnt-exist.ics")); + suite.addTest(new CalendarsTest("testLoadParserException", "/samples/invalid/google_aus_holidays.ics")); List calendars = new ArrayList(); - calendars.add(Calendars.load("etc/samples/valid/Australian32Holidays.ics")); - calendars.add(Calendars.load("etc/samples/valid/OZMovies.ics")); + calendars.add(Calendars.load(CalendarsTest.class.getResource("/samples/valid/Australian32Holidays.ics"))); + calendars.add(Calendars.load(CalendarsTest.class.getResource("/samples/valid/OZMovies.ics"))); suite.addTest(new CalendarsTest("testMerge", (Calendar[]) calendars.toArray(new Calendar[calendars.size()]))); - Calendar calendar = Calendars.load("etc/samples/valid/Australian32Holidays.ics"); + Calendar calendar = Calendars.load(CalendarsTest.class.getResource("/samples/valid/Australian32Holidays.ics")); suite.addTest(new CalendarsTest("testSplit", calendar, 10)); suite.addTest(new CalendarsTest("testGetContentType", calendar, null, "text/calendar")); - calendar = Calendars.load("etc/samples/valid/OZMovies.ics"); + calendar = Calendars.load(CalendarsTest.class.getResource("/samples/valid/OZMovies.ics")); suite.addTest(new CalendarsTest("testGetContentType", calendar, null, "text/calendar; method=PUBLISH")); suite.addTest(new CalendarsTest("testGetContentType", calendar, Charset.forName("US-ASCII"), "text/calendar; method=PUBLISH; charset=US-ASCII")); diff --git a/etc/samples/hcalendar/example1.html b/src/test/resources/samples/hcalendar/example1.html similarity index 100% rename from etc/samples/hcalendar/example1.html rename to src/test/resources/samples/hcalendar/example1.html diff --git a/etc/samples/hcalendar/example1.ics b/src/test/resources/samples/hcalendar/example1.ics similarity index 100% rename from etc/samples/hcalendar/example1.ics rename to src/test/resources/samples/hcalendar/example1.ics diff --git a/etc/samples/invalid/0.ics b/src/test/resources/samples/invalid/0.ics similarity index 100% rename from etc/samples/invalid/0.ics rename to src/test/resources/samples/invalid/0.ics diff --git a/etc/samples/invalid/13-MoonPhase.ics b/src/test/resources/samples/invalid/13-MoonPhase.ics similarity index 100% rename from etc/samples/invalid/13-MoonPhase.ics rename to src/test/resources/samples/invalid/13-MoonPhase.ics diff --git a/etc/samples/invalid/CalendarDataFile.ics b/src/test/resources/samples/invalid/CalendarDataFile.ics similarity index 100% rename from etc/samples/invalid/CalendarDataFile.ics rename to src/test/resources/samples/invalid/CalendarDataFile.ics diff --git a/etc/samples/invalid/bhav23-2.ics b/src/test/resources/samples/invalid/bhav23-2.ics similarity index 100% rename from etc/samples/invalid/bhav23-2.ics rename to src/test/resources/samples/invalid/bhav23-2.ics diff --git a/etc/samples/invalid/boeing.ics b/src/test/resources/samples/invalid/boeing.ics similarity index 100% rename from etc/samples/invalid/boeing.ics rename to src/test/resources/samples/invalid/boeing.ics diff --git a/etc/samples/invalid/calconnect.ics b/src/test/resources/samples/invalid/calconnect.ics similarity index 100% rename from etc/samples/invalid/calconnect.ics rename to src/test/resources/samples/invalid/calconnect.ics diff --git a/etc/samples/invalid/core.ics b/src/test/resources/samples/invalid/core.ics similarity index 100% rename from etc/samples/invalid/core.ics rename to src/test/resources/samples/invalid/core.ics diff --git a/etc/samples/invalid/eli_courtwright.ics b/src/test/resources/samples/invalid/eli_courtwright.ics similarity index 100% rename from etc/samples/invalid/eli_courtwright.ics rename to src/test/resources/samples/invalid/eli_courtwright.ics diff --git a/etc/samples/invalid/eli_test.ics b/src/test/resources/samples/invalid/eli_test.ics similarity index 100% rename from etc/samples/invalid/eli_test.ics rename to src/test/resources/samples/invalid/eli_test.ics diff --git a/etc/samples/invalid/google_aus_holidays.ics b/src/test/resources/samples/invalid/google_aus_holidays.ics similarity index 100% rename from etc/samples/invalid/google_aus_holidays.ics rename to src/test/resources/samples/invalid/google_aus_holidays.ics diff --git a/etc/samples/invalid/groupwise.ics b/src/test/resources/samples/invalid/groupwise.ics similarity index 100% rename from etc/samples/invalid/groupwise.ics rename to src/test/resources/samples/invalid/groupwise.ics diff --git a/etc/samples/invalid/lastfm.ics b/src/test/resources/samples/invalid/lastfm.ics similarity index 100% rename from etc/samples/invalid/lastfm.ics rename to src/test/resources/samples/invalid/lastfm.ics diff --git a/etc/samples/invalid/multiple_calendars.ics b/src/test/resources/samples/invalid/multiple_calendars.ics similarity index 100% rename from etc/samples/invalid/multiple_calendars.ics rename to src/test/resources/samples/invalid/multiple_calendars.ics diff --git a/etc/samples/invalid/overlaps.ics b/src/test/resources/samples/invalid/overlaps.ics similarity index 100% rename from etc/samples/invalid/overlaps.ics rename to src/test/resources/samples/invalid/overlaps.ics diff --git a/etc/samples/invalid/phpicalendar_sample.ics b/src/test/resources/samples/invalid/phpicalendar_sample.ics similarity index 100% rename from etc/samples/invalid/phpicalendar_sample.ics rename to src/test/resources/samples/invalid/phpicalendar_sample.ics diff --git a/etc/samples/invalid/schedule-unstable.ics b/src/test/resources/samples/invalid/schedule-unstable.ics similarity index 100% rename from etc/samples/invalid/schedule-unstable.ics rename to src/test/resources/samples/invalid/schedule-unstable.ics diff --git a/etc/samples/invalid/smallcluster.ics b/src/test/resources/samples/invalid/smallcluster.ics similarity index 100% rename from etc/samples/invalid/smallcluster.ics rename to src/test/resources/samples/invalid/smallcluster.ics diff --git a/etc/samples/invalid/twinkle.ics b/src/test/resources/samples/invalid/twinkle.ics similarity index 100% rename from etc/samples/invalid/twinkle.ics rename to src/test/resources/samples/invalid/twinkle.ics diff --git a/etc/samples/invalid/twinkle_orig.ics b/src/test/resources/samples/invalid/twinkle_orig.ics similarity index 100% rename from etc/samples/invalid/twinkle_orig.ics rename to src/test/resources/samples/invalid/twinkle_orig.ics diff --git a/etc/samples/invalid/zidestoreical4jbomb.ics b/src/test/resources/samples/invalid/zidestoreical4jbomb.ics similarity index 100% rename from etc/samples/invalid/zidestoreical4jbomb.ics rename to src/test/resources/samples/invalid/zidestoreical4jbomb.ics diff --git a/etc/samples/valid/1106817412.ics b/src/test/resources/samples/valid/1106817412.ics similarity index 100% rename from etc/samples/valid/1106817412.ics rename to src/test/resources/samples/valid/1106817412.ics diff --git a/etc/samples/valid/2207678.ics b/src/test/resources/samples/valid/2207678.ics similarity index 100% rename from etc/samples/valid/2207678.ics rename to src/test/resources/samples/valid/2207678.ics diff --git a/etc/samples/valid/3.ics b/src/test/resources/samples/valid/3.ics similarity index 100% rename from etc/samples/valid/3.ics rename to src/test/resources/samples/valid/3.ics diff --git a/etc/samples/valid/4.ics b/src/test/resources/samples/valid/4.ics similarity index 100% rename from etc/samples/valid/4.ics rename to src/test/resources/samples/valid/4.ics diff --git a/etc/samples/valid/6.ics b/src/test/resources/samples/valid/6.ics similarity index 100% rename from etc/samples/valid/6.ics rename to src/test/resources/samples/valid/6.ics diff --git a/etc/samples/valid/7.ics b/src/test/resources/samples/valid/7.ics similarity index 100% rename from etc/samples/valid/7.ics rename to src/test/resources/samples/valid/7.ics diff --git a/etc/samples/valid/ArgentinaHolidays.ics b/src/test/resources/samples/valid/ArgentinaHolidays.ics similarity index 100% rename from etc/samples/valid/ArgentinaHolidays.ics rename to src/test/resources/samples/valid/ArgentinaHolidays.ics diff --git a/etc/samples/valid/Australian32Holidays.ics b/src/test/resources/samples/valid/Australian32Holidays.ics similarity index 100% rename from etc/samples/valid/Australian32Holidays.ics rename to src/test/resources/samples/valid/Australian32Holidays.ics diff --git a/etc/samples/valid/Australian_TV_Melbourne.ics b/src/test/resources/samples/valid/Australian_TV_Melbourne.ics similarity index 100% rename from etc/samples/valid/Australian_TV_Melbourne.ics rename to src/test/resources/samples/valid/Australian_TV_Melbourne.ics diff --git a/etc/samples/valid/BCP321928.ics b/src/test/resources/samples/valid/BCP321928.ics similarity index 100% rename from etc/samples/valid/BCP321928.ics rename to src/test/resources/samples/valid/BCP321928.ics diff --git a/etc/samples/valid/Belgische32feestdagen.ics b/src/test/resources/samples/valid/Belgische32feestdagen.ics similarity index 100% rename from etc/samples/valid/Belgische32feestdagen.ics rename to src/test/resources/samples/valid/Belgische32feestdagen.ics diff --git a/etc/samples/valid/Buddhist.ics b/src/test/resources/samples/valid/Buddhist.ics similarity index 100% rename from etc/samples/valid/Buddhist.ics rename to src/test/resources/samples/valid/Buddhist.ics diff --git a/etc/samples/valid/Christian32Holidays.ics b/src/test/resources/samples/valid/Christian32Holidays.ics similarity index 100% rename from etc/samples/valid/Christian32Holidays.ics rename to src/test/resources/samples/valid/Christian32Holidays.ics diff --git a/etc/samples/valid/Dryway.ics b/src/test/resources/samples/valid/Dryway.ics similarity index 100% rename from etc/samples/valid/Dryway.ics rename to src/test/resources/samples/valid/Dryway.ics diff --git a/etc/samples/valid/EXDATE.ics b/src/test/resources/samples/valid/EXDATE.ics similarity index 100% rename from etc/samples/valid/EXDATE.ics rename to src/test/resources/samples/valid/EXDATE.ics diff --git a/etc/samples/valid/Earth32Seasons.ics b/src/test/resources/samples/valid/Earth32Seasons.ics similarity index 100% rename from etc/samples/valid/Earth32Seasons.ics rename to src/test/resources/samples/valid/Earth32Seasons.ics diff --git a/etc/samples/valid/EstoniaHolidays.ics b/src/test/resources/samples/valid/EstoniaHolidays.ics similarity index 100% rename from etc/samples/valid/EstoniaHolidays.ics rename to src/test/resources/samples/valid/EstoniaHolidays.ics diff --git a/etc/samples/valid/Misc.History.ics b/src/test/resources/samples/valid/Misc.History.ics similarity index 100% rename from etc/samples/valid/Misc.History.ics rename to src/test/resources/samples/valid/Misc.History.ics diff --git a/etc/samples/valid/New Years Day.ics b/src/test/resources/samples/valid/New Years Day.ics similarity index 100% rename from etc/samples/valid/New Years Day.ics rename to src/test/resources/samples/valid/New Years Day.ics diff --git a/etc/samples/valid/OZMovies.ics b/src/test/resources/samples/valid/OZMovies.ics similarity index 100% rename from etc/samples/valid/OZMovies.ics rename to src/test/resources/samples/valid/OZMovies.ics diff --git a/etc/samples/valid/Packers.ics b/src/test/resources/samples/valid/Packers.ics similarity index 100% rename from etc/samples/valid/Packers.ics rename to src/test/resources/samples/valid/Packers.ics diff --git a/etc/samples/valid/Session6.ics b/src/test/resources/samples/valid/Session6.ics similarity index 100% rename from etc/samples/valid/Session6.ics rename to src/test/resources/samples/valid/Session6.ics diff --git a/etc/samples/valid/Standup.ics b/src/test/resources/samples/valid/Standup.ics similarity index 100% rename from etc/samples/valid/Standup.ics rename to src/test/resources/samples/valid/Standup.ics diff --git a/etc/samples/valid/SwedishHolidays2003-2006.ics b/src/test/resources/samples/valid/SwedishHolidays2003-2006.ics similarity index 100% rename from etc/samples/valid/SwedishHolidays2003-2006.ics rename to src/test/resources/samples/valid/SwedishHolidays2003-2006.ics diff --git a/etc/samples/valid/THFC.ics b/src/test/resources/samples/valid/THFC.ics similarity index 100% rename from etc/samples/valid/THFC.ics rename to src/test/resources/samples/valid/THFC.ics diff --git a/etc/samples/valid/afl2004.ics b/src/test/resources/samples/valid/afl2004.ics similarity index 100% rename from etc/samples/valid/afl2004.ics rename to src/test/resources/samples/valid/afl2004.ics diff --git a/etc/samples/valid/bears.ics b/src/test/resources/samples/valid/bears.ics similarity index 100% rename from etc/samples/valid/bears.ics rename to src/test/resources/samples/valid/bears.ics diff --git a/etc/samples/valid/bhav23-1.ics b/src/test/resources/samples/valid/bhav23-1.ics similarity index 100% rename from etc/samples/valid/bhav23-1.ics rename to src/test/resources/samples/valid/bhav23-1.ics diff --git a/etc/samples/valid/blalor.ics b/src/test/resources/samples/valid/blalor.ics similarity index 100% rename from etc/samples/valid/blalor.ics rename to src/test/resources/samples/valid/blalor.ics diff --git a/etc/samples/valid/calconnect.ics b/src/test/resources/samples/valid/calconnect.ics similarity index 100% rename from etc/samples/valid/calconnect.ics rename to src/test/resources/samples/valid/calconnect.ics diff --git a/etc/samples/valid/calconnect10.ics b/src/test/resources/samples/valid/calconnect10.ics similarity index 100% rename from etc/samples/valid/calconnect10.ics rename to src/test/resources/samples/valid/calconnect10.ics diff --git a/etc/samples/valid/calconnect2.ics b/src/test/resources/samples/valid/calconnect2.ics similarity index 100% rename from etc/samples/valid/calconnect2.ics rename to src/test/resources/samples/valid/calconnect2.ics diff --git a/etc/samples/valid/calconnect3.ics b/src/test/resources/samples/valid/calconnect3.ics similarity index 100% rename from etc/samples/valid/calconnect3.ics rename to src/test/resources/samples/valid/calconnect3.ics diff --git a/etc/samples/valid/calconnect4.ics b/src/test/resources/samples/valid/calconnect4.ics similarity index 100% rename from etc/samples/valid/calconnect4.ics rename to src/test/resources/samples/valid/calconnect4.ics diff --git a/etc/samples/valid/calconnect5.ics b/src/test/resources/samples/valid/calconnect5.ics similarity index 100% rename from etc/samples/valid/calconnect5.ics rename to src/test/resources/samples/valid/calconnect5.ics diff --git a/etc/samples/valid/calconnect6.ics b/src/test/resources/samples/valid/calconnect6.ics similarity index 100% rename from etc/samples/valid/calconnect6.ics rename to src/test/resources/samples/valid/calconnect6.ics diff --git a/etc/samples/valid/calconnect7.ics b/src/test/resources/samples/valid/calconnect7.ics similarity index 100% rename from etc/samples/valid/calconnect7.ics rename to src/test/resources/samples/valid/calconnect7.ics diff --git a/etc/samples/valid/calconnect8.ics b/src/test/resources/samples/valid/calconnect8.ics similarity index 100% rename from etc/samples/valid/calconnect8.ics rename to src/test/resources/samples/valid/calconnect8.ics diff --git a/etc/samples/valid/calconnect9.ics b/src/test/resources/samples/valid/calconnect9.ics similarity index 100% rename from etc/samples/valid/calconnect9.ics rename to src/test/resources/samples/valid/calconnect9.ics diff --git a/etc/samples/valid/canada.ics b/src/test/resources/samples/valid/canada.ics similarity index 100% rename from etc/samples/valid/canada.ics rename to src/test/resources/samples/valid/canada.ics diff --git a/etc/samples/valid/categories.ics b/src/test/resources/samples/valid/categories.ics similarity index 100% rename from etc/samples/valid/categories.ics rename to src/test/resources/samples/valid/categories.ics diff --git a/etc/samples/valid/classify.ics b/src/test/resources/samples/valid/classify.ics similarity index 100% rename from etc/samples/valid/classify.ics rename to src/test/resources/samples/valid/classify.ics diff --git a/etc/samples/valid/custom_component.ics b/src/test/resources/samples/valid/custom_component.ics similarity index 100% rename from etc/samples/valid/custom_component.ics rename to src/test/resources/samples/valid/custom_component.ics diff --git a/etc/samples/valid/derryn.ics b/src/test/resources/samples/valid/derryn.ics similarity index 100% rename from etc/samples/valid/derryn.ics rename to src/test/resources/samples/valid/derryn.ics diff --git a/etc/samples/valid/evolution.ics b/src/test/resources/samples/valid/evolution.ics similarity index 100% rename from etc/samples/valid/evolution.ics rename to src/test/resources/samples/valid/evolution.ics diff --git a/etc/samples/valid/friday13-NOT.ics b/src/test/resources/samples/valid/friday13-NOT.ics similarity index 100% rename from etc/samples/valid/friday13-NOT.ics rename to src/test/resources/samples/valid/friday13-NOT.ics diff --git a/etc/samples/valid/friday13.ics b/src/test/resources/samples/valid/friday13.ics similarity index 100% rename from etc/samples/valid/friday13.ics rename to src/test/resources/samples/valid/friday13.ics diff --git a/etc/samples/valid/incoming.ics b/src/test/resources/samples/valid/incoming.ics similarity index 100% rename from etc/samples/valid/incoming.ics rename to src/test/resources/samples/valid/incoming.ics diff --git a/etc/samples/valid/japan_west.ics b/src/test/resources/samples/valid/japan_west.ics similarity index 100% rename from etc/samples/valid/japan_west.ics rename to src/test/resources/samples/valid/japan_west.ics diff --git a/etc/samples/valid/korganizer-lowercase.ics b/src/test/resources/samples/valid/korganizer-lowercase.ics similarity index 100% rename from etc/samples/valid/korganizer-lowercase.ics rename to src/test/resources/samples/valid/korganizer-lowercase.ics diff --git a/etc/samples/valid/korganizer.ics b/src/test/resources/samples/valid/korganizer.ics similarity index 100% rename from etc/samples/valid/korganizer.ics rename to src/test/resources/samples/valid/korganizer.ics diff --git a/etc/samples/valid/korganizer_sample.ics b/src/test/resources/samples/valid/korganizer_sample.ics similarity index 100% rename from etc/samples/valid/korganizer_sample.ics rename to src/test/resources/samples/valid/korganizer_sample.ics diff --git a/etc/samples/valid/lotr-updated.ics b/src/test/resources/samples/valid/lotr-updated.ics similarity index 100% rename from etc/samples/valid/lotr-updated.ics rename to src/test/resources/samples/valid/lotr-updated.ics diff --git a/etc/samples/valid/lotr.ics b/src/test/resources/samples/valid/lotr.ics similarity index 100% rename from etc/samples/valid/lotr.ics rename to src/test/resources/samples/valid/lotr.ics diff --git a/etc/samples/valid/mansour.ics b/src/test/resources/samples/valid/mansour.ics similarity index 100% rename from etc/samples/valid/mansour.ics rename to src/test/resources/samples/valid/mansour.ics diff --git a/etc/samples/valid/mathBirthdays.ics b/src/test/resources/samples/valid/mathBirthdays.ics similarity index 100% rename from etc/samples/valid/mathBirthdays.ics rename to src/test/resources/samples/valid/mathBirthdays.ics diff --git a/etc/samples/valid/miked.ics b/src/test/resources/samples/valid/miked.ics similarity index 100% rename from etc/samples/valid/miked.ics rename to src/test/resources/samples/valid/miked.ics diff --git a/etc/samples/valid/multiple_calendars.ics b/src/test/resources/samples/valid/multiple_calendars.ics similarity index 100% rename from etc/samples/valid/multiple_calendars.ics rename to src/test/resources/samples/valid/multiple_calendars.ics diff --git a/etc/samples/valid/oracle-personal-notes-test-empty.ics b/src/test/resources/samples/valid/oracle-personal-notes-test-empty.ics similarity index 100% rename from etc/samples/valid/oracle-personal-notes-test-empty.ics rename to src/test/resources/samples/valid/oracle-personal-notes-test-empty.ics diff --git a/etc/samples/valid/oracle-personal-notes-test.ics b/src/test/resources/samples/valid/oracle-personal-notes-test.ics similarity index 100% rename from etc/samples/valid/oracle-personal-notes-test.ics rename to src/test/resources/samples/valid/oracle-personal-notes-test.ics diff --git a/etc/samples/valid/php-flp.ics b/src/test/resources/samples/valid/php-flp.ics similarity index 100% rename from etc/samples/valid/php-flp.ics rename to src/test/resources/samples/valid/php-flp.ics diff --git a/etc/samples/valid/rfc5545-sec3.4.ics b/src/test/resources/samples/valid/rfc5545-sec3.4.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.4.ics rename to src/test/resources/samples/valid/rfc5545-sec3.4.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.1.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.1.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.1.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.1.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.2.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.2.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.2.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.2.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.3.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.3.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.3.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.3.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.4.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.4.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.4.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.4.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.5.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.5.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.5.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.5.ics diff --git a/etc/samples/valid/rfc5545-sec3.6.6.ics b/src/test/resources/samples/valid/rfc5545-sec3.6.6.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec3.6.6.ics rename to src/test/resources/samples/valid/rfc5545-sec3.6.6.ics diff --git a/etc/samples/valid/rfc5545-sec4.1.ics b/src/test/resources/samples/valid/rfc5545-sec4.1.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec4.1.ics rename to src/test/resources/samples/valid/rfc5545-sec4.1.ics diff --git a/etc/samples/valid/rfc5545-sec4.2.ics b/src/test/resources/samples/valid/rfc5545-sec4.2.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec4.2.ics rename to src/test/resources/samples/valid/rfc5545-sec4.2.ics diff --git a/etc/samples/valid/rfc5545-sec4.3.ics b/src/test/resources/samples/valid/rfc5545-sec4.3.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec4.3.ics rename to src/test/resources/samples/valid/rfc5545-sec4.3.ics diff --git a/etc/samples/valid/rfc5545-sec4.4.ics b/src/test/resources/samples/valid/rfc5545-sec4.4.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec4.4.ics rename to src/test/resources/samples/valid/rfc5545-sec4.4.ics diff --git a/etc/samples/valid/rfc5545-sec4.5.ics b/src/test/resources/samples/valid/rfc5545-sec4.5.ics similarity index 100% rename from etc/samples/valid/rfc5545-sec4.5.ics rename to src/test/resources/samples/valid/rfc5545-sec4.5.ics diff --git a/etc/samples/valid/sunbird_sample.ics b/src/test/resources/samples/valid/sunbird_sample.ics similarity index 100% rename from etc/samples/valid/sunbird_sample.ics rename to src/test/resources/samples/valid/sunbird_sample.ics diff --git a/etc/samples/valid/talios.ics b/src/test/resources/samples/valid/talios.ics similarity index 100% rename from etc/samples/valid/talios.ics rename to src/test/resources/samples/valid/talios.ics diff --git a/etc/samples/valid/tmeher.ics b/src/test/resources/samples/valid/tmeher.ics similarity index 100% rename from etc/samples/valid/tmeher.ics rename to src/test/resources/samples/valid/tmeher.ics