DST tests ✅

test/fixtures/daylight-saving-time/calendar.csv

@@ -0,0 +1,3 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+sA,1,1,1,1,1,1,1,20191027,20191027
+sB,1,1,1,1,1,1,1,20190331,20190331

test/fixtures/daylight-saving-time/calendar_dates.csv

@@ -0,0 +1 @@
+service_id,date,service_id

test/fixtures/daylight-saving-time/expected.json5

@@ -0,0 +1,11 @@
+[
+	{
+		tripId: 'A1',
+		stops: ['1', '2'],
+		arrivals: [7140, 10740],
+		departures: [7260, 10860],
+		headwayBasedStarts: [],
+		headwayBasedEnds: [],
+		headwayBasedHeadways: [],
+	}
+]

test/fixtures/daylight-saving-time/readme.md

@@ -0,0 +1,3 @@
+# test case: DST ↔ standard time
+
+Check my [note about GTFS Time values](https://gist.github.com/derhuerst/574edc94981a21ef0ce90713f1cff7f6) for background information.

test/fixtures/daylight-saving-time/routes.csv

@@ -0,0 +1,3 @@
+route_id
+A
+B

test/fixtures/daylight-saving-time/stop_times.csv

@@ -0,0 +1,5 @@
+trip_id,arrival_time,departure_time,stop_id,stop_sequence
+A1,1:59,2:01,1,3
+A1,2:59,3:01,2,5
+B1,1:59,2:01,2,10
+B1,2:59,3:01,1,11

test/fixtures/daylight-saving-time/trips.csv

@@ -0,0 +1,3 @@
+route_id,service_id,trip_id
+A,sA,A1
+B,sB,B1

test/index.js

@@ -3,7 +3,7 @@
 const {DateTime} = require('luxon')
 const test = require('tape')
 const {createReadStream} = require('fs')
-const {readJSON5Sync} = require('./lib')
+const {readJSON5Sync, readFilesFromFixture} = require('./lib')
 
 const readCsv = require('../read-csv')
 const formatDate = require('../format-date')
@@ -122,7 +122,7 @@ test('lib/days-between', (t) => {
 require('./read-stop-times')
 
 const stopoversFixtures = readJSON5Sync(require.resolve('./fixtures/stopovers.json5'))
-test('compute-stopovers', async (t) => {
+test('compute-stopovers: works', async (t) => {
 	const stopovers = computeStopovers(readFile, 'Europe/Berlin', {
 		trip: t => t.trip_id === 'b-downtown-on-working-days',
 	})
@@ -132,6 +132,47 @@ test('compute-stopovers', async (t) => {
 	t.deepEqual(res, stopoversFixtures)
 })
 
+test('compute-stopovers: handles DST switch properly', async (t) => {
+	const readFile = readFilesFromFixture('daylight-saving-time')
+	const stopovers = computeStopovers(readFile, 'Europe/Berlin')
+
+	const res = []
+	for await (const s of stopovers) res.push(s)
+	t.deepEqual(res, [{
+		stop_id: '1',
+		trip_id: 'A1',
+		service_id: 'sA',
+		route_id: 'A',
+		start_of_trip: 1572127200, // 2019-10-27T00:00:00+02:00
+		arrival: 1572137940, // 2019-10-27T02:59:00+02:00
+		departure: 1572138060, // 2019-10-27T02:01:00+01:00
+	}, {
+		stop_id: '2',
+		trip_id: 'A1',
+		service_id: 'sA',
+		route_id: 'A',
+		start_of_trip: 1572127200, // 2019-10-27T00:00:00+02:00
+		arrival: 1572141540, // 2019-10-27T02:59:00+01:00
+		departure: 1572141660, // 2019-10-27T03:01:00+01:00
+	}, {
+		stop_id: '2',
+		trip_id: 'B1',
+		service_id: 'sB',
+		route_id: 'B',
+		start_of_trip: 1553986800, // 2019-03-31T00:00:00+01:00
+		arrival: 1553990340, // 2019-03-31T00:59:00+01:00
+		departure: 1553990460, // 2019-03-31T01:01:00+01:00
+	}, {
+		stop_id: '1',
+		trip_id: 'B1',
+		service_id: 'sB',
+		route_id: 'B',
+		start_of_trip: 1553986800, // 2019-03-31T00:00:00+01:00
+		arrival: 1553993940, // 2019-03-31T01:59:00+01:00
+		departure: 1553994060,// 2019-03-31T03:01:00+02:00
+	}])
+})
+
 test('compute-sorted-connections', async (t) => {
 	const sortedCons = await computeSortedConnections(readFile, 'Europe/Berlin')
 

test/lib.js

@@ -2,11 +2,18 @@
 
 const JSON5 = require('json5')
 const {readFileSync} = require('fs')
+const {join: pJoin} = require('path')
+const readCsv = require('../read-csv')
 
 const readJSON5Sync = (path) => {
 	return JSON5.parse(readFileSync(path, {encoding: 'utf8'}))
 }
 
+const readFilesFromFixture = (fixture) => (file) => {
+	return readCsv(pJoin(__dirname, 'fixtures', fixture, file + '.csv'))
+}
+
 module.exports = {
 	readJSON5Sync,
+	readFilesFromFixture,
 }

test/read-stop-times.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const test = require('tape')
+const {readFilesFromFixture} = require('./lib')
 
 const readCsv = require('../read-csv')
 const readStopTimes = require('../lib/read-stop-times')
@@ -86,3 +87,30 @@ test('read-stop-times works', async (t) => {
 		},
 	])
 })
+
+test('read-stop-times: handles DST switch properly', async (t) => {
+	const readFile = readFilesFromFixture('daylight-saving-time')
+	const stopTimes = readStopTimes(readFile, noFilter)
+
+	const res = []
+	for await (const st of stopTimes) res.push(st)
+	t.deepEqual(res, [{
+		tripId: 'A1',
+		stops: ['1', '2'],
+		arrivals: [7140, 10740],
+		departures: [7260, 10860],
+		headwayBasedStarts: [],
+		headwayBasedEnds: [],
+		headwayBasedHeadways: [],
+	}, {
+		tripId: 'B1',
+		stops: ['2', '1'],
+		arrivals: [7140, 10740],
+		departures: [7260, 10860],
+		headwayBasedStarts: [],
+		headwayBasedEnds: [],
+		headwayBasedHeadways: [],
+	}])
+
+	t.end()
+})