Skip to content

Commit

Permalink
Relocated test calendars to src/test/resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfortuna
benfortuna committed Nov 9, 2016
1 parent a4bad01 commit 873cc33
Show file tree
Hide file tree
Showing 119 changed files with 77 additions and 78 deletions.
8 changes: 4 additions & 4 deletions src/test/groovy/net/fortuna/ical4j/data/CalendarParserImplSpec.groovy
View file
Expand Up @@ -76,16 +76,16 @@ class CalendarParserImplSpec extends Specification {
}

expect:
Calendar calendar = Calendars.load(filename)
Calendar calendar = Calendars.load(CalendarParserImplSpec.getResource(resource))

cleanup:
compatibilityHints.each {
CompatibilityHints.clearHintEnabled(it)
}

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]
}
}
8 changes: 2 additions & 6 deletions src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java
View file
Expand Up @@ -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()));
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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<CalendarComponent> comps = calendar.getComponents(Component.VEVENT);
assertTrue("VEVENT not found", comps.size() == 1);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java
View file
Expand Up @@ -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));
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java
View file
Expand Up @@ -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()));
Expand Down
35 changes: 18 additions & 17 deletions src/test/java/net/fortuna/ical4j/data/CalendarParserImplTest.java
View file
Expand Up @@ -39,6 +39,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.net.URL;

/**
* $Id$
Expand All @@ -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;
}

Expand All @@ -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());
Expand All @@ -106,28 +107,28 @@ 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 + "]";
}

/**
* @return
*/
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;
}
}
4 changes: 2 additions & 2 deletions src/test/java/net/fortuna/ical4j/data/HCalendarParserTest.java
View file
Expand Up @@ -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());
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/net/fortuna/ical4j/filter/FilterTest.java
View file
Expand Up @@ -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"));
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java
View file
Expand Up @@ -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();

Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/fortuna/ical4j/model/IndexedComponentListTest.java
View file
Expand Up @@ -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"));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/fortuna/ical4j/model/IndexedPropertyListTest.java
View file
Expand Up @@ -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"));
}

/**
Expand Down
25 changes: 13 additions & 12 deletions src/test/java/net/fortuna/ical4j/model/component/VEventTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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();
Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/fortuna/ical4j/model/parameter/TzIdTest.java
View file
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/net/fortuna/ical4j/model/property/AttendeeTest.java
View file
Expand Up @@ -93,15 +93,15 @@ 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) {
LOG.info("Caught exception: " + pe.getMessage());
}

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());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/fortuna/ical4j/model/property/CategoriesTest.java
View file
Expand Up @@ -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);

Expand Down

0 comments on commit 873cc33

Please sign in to comment.