Skip to content

fix timezone issues in DiningDAOTest #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magical wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix timezone issues in DiningDAOTest #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/test/groovy/edu/oregonstate/mist/locations/DiningDAOTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import edu.oregonstate.mist.locations.core.DayOpenHours
import edu.oregonstate.mist.locations.db.IcalUtil
import net.fortuna.ical4j.data.CalendarBuilder
import net.fortuna.ical4j.model.Calendar
import net.fortuna.ical4j.model.TimeZoneRegistry
import net.fortuna.ical4j.model.TimeZoneRegistryFactory
import org.joda.time.DateTime
import org.joda.time.DateTimeZone
import org.junit.Test
Expand All @@ -23,17 +25,20 @@ class DiningDAOTest {
// the base event (see ECSPCS-311)

// Filter events by day
def tz = DateTimeZone.forID("America/Los_Angeles")
def day = new DateTime(2017, 1, 6, 0, 0, tz) // Midnight, Jan 6th, PST
def jtz = DateTimeZone.forID("America/Los_Angeles")
def day = new DateTime(2017, 1, 6, 0, 0, jtz) // Midnight, Jan 6th, PST
List events = IcalUtil.getEventsForDay(calendar, day)

TimeZoneRegistry registry = TimeZoneRegistryFactory.getInstance().createRegistry()
TimeZone itz = registry.getTimeZone("America/Los_Angeles")

println(events)

// Expected result?
assert events == [
new DayOpenHours(
start: new net.fortuna.ical4j.model.DateTime("20170106T073000"),
end: new net.fortuna.ical4j.model.DateTime("20170106T150000"),
start: new net.fortuna.ical4j.model.DateTime("20170106T073000", itz),
end: new net.fortuna.ical4j.model.DateTime("20170106T150000", itz),
uid: "jvspu68dcau21vdtpj49li6d1o@google.com",
sequence: 0,
recurrenceId: "20170106T073000",
Expand All @@ -45,7 +50,7 @@ class DiningDAOTest {
// the next day (see ECSPCS-311)

// Filter events by day
day = new DateTime(2017, 1, 12, 0, 0, tz) // Midnight, Jan 12th, PST
day = new DateTime(2017, 1, 12, 0, 0, jtz) // Midnight, Jan 12th, PST
events = IcalUtil.getEventsForDay(calendar, day)

println(events)
Expand All @@ -54,8 +59,8 @@ class DiningDAOTest {
assert events.size() == 1
assert events == [
new DayOpenHours(
start: new net.fortuna.ical4j.model.DateTime("20170112T073000"),
end: new net.fortuna.ical4j.model.DateTime("20170112T230000"),
start: new net.fortuna.ical4j.model.DateTime("20170112T073000", itz),
end: new net.fortuna.ical4j.model.DateTime("20170112T230000", itz),
uid: "ruq45d78ag0km1m83i5b5flaoc@google.com",
sequence: 0,
recurrenceId: null,
Expand Down