From fff8f0c792606daff151624479d9ae9dc54187d5 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 14 Dec 2016 17:34:34 +0500 Subject: Calendars implementation --- test/org/traccar/calendar/CalendarTest.java | 54 +++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 test/org/traccar/calendar/CalendarTest.java (limited to 'test/org') diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java new file mode 100644 index 000000000..44fc9539b --- /dev/null +++ b/test/org/traccar/calendar/CalendarTest.java @@ -0,0 +1,54 @@ +package org.traccar.calendar; + +import java.io.IOException; +import java.sql.SQLException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.model.Calendar; + +import net.fortuna.ical4j.data.ParserException; + +public class CalendarTest { + + @Test + public void testCalendar() throws IOException, ParserException, ParseException, SQLException { + String calendarString = "BEGIN:VCALENDAR\n" + + "PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN\n" + + "VERSION:2.0\n" + + "BEGIN:VTIMEZONE\n" + + "TZID:Asia/Yekaterinburg\n" + + "BEGIN:STANDARD\n" + + "TZOFFSETFROM:+0500\n" + + "TZOFFSETTO:+0500\n" + + "TZNAME:YEKT\n" + + "DTSTART:19700101T000000\n" + + "END:STANDARD\n" + + "END:VTIMEZONE\n" + + "BEGIN:VEVENT\n" + + "CREATED:20161213T045151Z\n" + + "LAST-MODIFIED:20161213T045242Z\n" + + "DTSTAMP:20161213T045242Z\n" + + "UID:9d000df0-6354-479d-a407-218dac62c7c9\n" + + "SUMMARY:Every night\n" + + "RRULE:FREQ=DAILY\n" + + "DTSTART;TZID=Asia/Yekaterinburg:20161130T230000\n" + + "DTEND;TZID=Asia/Yekaterinburg:20161201T070000\n" + + "TRANSP:OPAQUE\n" + + "END:VEVENT\n" + + "END:VCALENDAR"; + Calendar calendar = new Calendar(); + calendar.setCalendar(calendarString.getBytes()); + DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ssX"); + + Date date = format.parse("2016-12-13 23:01:00+05"); + Assert.assertTrue(calendar.checkMoment(date)); + + date = format.parse("2016-12-13 07:01:00+05"); + Assert.assertTrue(!calendar.checkMoment(date)); + } +} -- cgit v1.2.3 From ef9148eea8dd404aba5707898f244a4b7bc26feb Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 15 Dec 2016 09:45:29 +0500 Subject: - Set period duration to 0 - Remove setter - Added test cases - Style fix --- pom.xml | 6 +++--- src/org/traccar/model/Calendar.java | 12 ++++-------- test/org/traccar/calendar/CalendarTest.java | 14 +++++++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'test/org') diff --git a/pom.xml b/pom.xml index b93ff8e44..3d142b7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -144,9 +144,9 @@ 1.7 - org.mnode.ical4j - ical4j - 2.0.0 + org.mnode.ical4j + ical4j + 2.0.0 diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java index e1ae5a93d..19b5fde16 100644 --- a/src/org/traccar/model/Calendar.java +++ b/src/org/traccar/model/Calendar.java @@ -55,7 +55,9 @@ public class Calendar extends Extensible { } public void setCalendarData(byte[] calendarData) throws IOException, ParserException, SQLException { - setCalendar(calendarData); + CalendarBuilder builder = new CalendarBuilder(); + calendar = builder.build(new ByteArrayInputStream(calendarData)); + this.calendarData = calendarData.clone(); } private net.fortuna.ical4j.model.Calendar calendar; @@ -65,15 +67,9 @@ public class Calendar extends Extensible { return calendar; } - public void setCalendar(byte[] calendarData) throws IOException, ParserException, SQLException { - CalendarBuilder builder = new CalendarBuilder(); - calendar = builder.build(new ByteArrayInputStream(calendarData)); - this.calendarData = calendarData.clone(); - } - public boolean checkMoment(Date date) { if (calendar != null) { - Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 1)); + Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 0)); Rule periodRule = new PeriodRule(period); Filter filter = new Filter(new Rule[] {periodRule}, Filter.MATCH_ANY); Collection events = filter.filter(calendar.getComponents(Component.VEVENT)); diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java index 44fc9539b..7f5bd7d29 100644 --- a/test/org/traccar/calendar/CalendarTest.java +++ b/test/org/traccar/calendar/CalendarTest.java @@ -42,13 +42,17 @@ public class CalendarTest { "END:VEVENT\n" + "END:VCALENDAR"; Calendar calendar = new Calendar(); - calendar.setCalendar(calendarString.getBytes()); + calendar.setCalendarData(calendarString.getBytes()); DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ssX"); - - Date date = format.parse("2016-12-13 23:01:00+05"); + + Date date = format.parse("2016-12-13 22:59:59+05"); + Assert.assertTrue(!calendar.checkMoment(date)); + date = format.parse("2016-12-13 23:00:01+05"); + Assert.assertTrue(calendar.checkMoment(date)); + + date = format.parse("2016-12-13 06:59:59+05"); Assert.assertTrue(calendar.checkMoment(date)); - - date = format.parse("2016-12-13 07:01:00+05"); + date = format.parse("2016-12-13 07:00:01+05"); Assert.assertTrue(!calendar.checkMoment(date)); } } -- cgit v1.2.3