From 2d1d482ddf017eb0085df43baf1b42823b57c3f3 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Tue, 27 Aug 2019 14:52:40 +0200 Subject: [PATCH] adapt tests to 938a6f2 --- test/fixtures/bvg-journey.js | 30 ++++-- test/fixtures/bvg-radar.js | 128 ++++++++++++++++++------- test/fixtures/vbb-departures.js | 165 ++++++++++++++++++++++++-------- test/lib/validators.js | 16 ++-- 4 files changed, 251 insertions(+), 88 deletions(-) diff --git a/test/fixtures/bvg-journey.js b/test/fixtures/bvg-journey.js index d8747005..d66fe6c0 100644 --- a/test/fixtures/bvg-journey.js +++ b/test/fixtures/bvg-journey.js @@ -710,7 +710,9 @@ module.exports = { }, direction: 'S Blankenfelde (TF)', arrivalPlatform: '1', + plannedArrivalPlatform: '1', departurePlatform: '1', + plannedDeparturePlatform: '1', stopovers: [{ stop: { type: 'stop', @@ -736,10 +738,12 @@ module.exports = { plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-18T14:16:00+02:00', plannedDeparture: '2019-08-18T14:16:00+02:00', departureDelay: 0, - departurePlatform: '1' + departurePlatform: '1', + plannedDeparturePlatform: '1' }, { stop: { @@ -766,10 +770,12 @@ module.exports = { plannedArrival: '2019-08-18T14:18:00+02:00', arrivalDelay: 0, arrivalPlatform: '11', + plannedArrivalPlatform: '11', departure: '2019-08-18T14:18:00+02:00', plannedDeparture: '2019-08-18T14:18:00+02:00', departureDelay: 0, - departurePlatform: '11' + departurePlatform: '11', + plannedDeparturePlatform: '11' }, { stop: { @@ -796,10 +802,12 @@ module.exports = { plannedArrival: '2019-08-18T14:19:00+02:00', arrivalDelay: 0, arrivalPlatform: '1', + plannedArrivalPlatform: '1', departure: '2019-08-18T14:20:00+02:00', plannedDeparture: '2019-08-18T14:20:00+02:00', departureDelay: 0, - departurePlatform: '1' + departurePlatform: '1', + plannedDeparturePlatform: '1' }, { stop: { @@ -826,10 +834,12 @@ module.exports = { plannedArrival: '2019-08-18T14:21:00+02:00', arrivalDelay: 0, arrivalPlatform: '11', + plannedArrivalPlatform: '11', departure: '2019-08-18T14:22:00+02:00', plannedDeparture: '2019-08-18T14:22:00+02:00', departureDelay: 0, - departurePlatform: '11' + departurePlatform: '11', + plannedDeparturePlatform: '11' }, { stop: { @@ -856,10 +866,12 @@ module.exports = { plannedArrival: '2019-08-18T14:24:00+02:00', arrivalDelay: 0, arrivalPlatform: '2', + plannedArrivalPlatform: '2', departure: '2019-08-18T14:24:00+02:00', plannedDeparture: '2019-08-18T14:24:00+02:00', departureDelay: 0, - departurePlatform: '2' + departurePlatform: '2', + plannedDeparturePlatform: '2' }, { stop: { @@ -886,10 +898,12 @@ module.exports = { plannedArrival: '2019-08-18T14:26:00+02:00', arrivalDelay: 0, arrivalPlatform: '1', + plannedArrivalPlatform: '1', departure: '2019-08-18T14:27:00+02:00', plannedDeparture: '2019-08-18T14:27:00+02:00', departureDelay: 0, - departurePlatform: '1' + departurePlatform: '1', + plannedDeparturePlatform: '1' }, { stop: { @@ -916,10 +930,12 @@ module.exports = { plannedArrival: '2019-08-18T14:29:00+02:00', arrivalDelay: 0, arrivalPlatform: '1', + plannedArrivalPlatform: '1', departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }], remarks: [ { diff --git a/test/fixtures/bvg-radar.js b/test/fixtures/bvg-radar.js index e646e7d5..d1857e2a 100644 --- a/test/fixtures/bvg-radar.js +++ b/test/fixtures/bvg-radar.js @@ -49,10 +49,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: '2019-08-19T20:26:00+02:00', departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -79,10 +81,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:29:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:30:00+02:00', plannedDeparture: '2019-08-19T20:29:00+02:00', departureDelay: 60, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -109,10 +113,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:31:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:34:00+02:00', plannedDeparture: '2019-08-19T20:31:00+02:00', departureDelay: 180, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -139,10 +145,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:58:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -417,10 +425,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T19:57:00+02:00', plannedDeparture: '2019-08-19T19:57:00+02:00', departureDelay: 0, - departurePlatform: '13' + departurePlatform: '13', + plannedDeparturePlatform: '13' }, { stop: { @@ -447,10 +457,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:32:00+02:00', arrivalDelay: 0, arrivalPlatform: '4', + plannedArrivalPlatform: '4', departure: '2019-08-19T20:33:00+02:00', plannedDeparture: '2019-08-19T20:33:00+02:00', departureDelay: 0, - departurePlatform: '4' + departurePlatform: '4', + plannedDeparturePlatform: '4' }, { stop: { @@ -477,10 +489,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:34:00+02:00', arrivalDelay: 0, arrivalPlatform: '4', + plannedArrivalPlatform: '4', departure: '2019-08-19T20:35:00+02:00', plannedDeparture: '2019-08-19T20:35:00+02:00', departureDelay: 0, - departurePlatform: '4' + departurePlatform: '4', + plannedDeparturePlatform: '4' }, { stop: { @@ -507,10 +521,12 @@ module.exports = [ plannedArrival: '2019-08-19T21:07:00+02:00', arrivalDelay: 0, arrivalPlatform: '2', + plannedArrivalPlatform: '2', departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -785,10 +801,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:17:00+02:00', plannedDeparture: '2019-08-19T20:17:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -815,10 +833,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: 0, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:33:00+02:00', plannedDeparture: '2019-08-19T20:33:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -845,10 +865,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:35:00+02:00', arrivalDelay: 0, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:35:00+02:00', plannedDeparture: '2019-08-19T20:35:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -875,10 +897,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:47:00+02:00', arrivalDelay: 0, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -1153,10 +1177,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:08:00+02:00', plannedDeparture: '2019-08-19T20:08:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1183,10 +1209,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:32:00+02:00', arrivalDelay: -60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:31:00+02:00', plannedDeparture: '2019-08-19T20:32:00+02:00', departureDelay: -60, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1213,10 +1241,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:34:00+02:00', arrivalDelay: 0, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1243,10 +1273,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:34:00+02:00', arrivalDelay: 0, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -1521,10 +1553,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:04:00+02:00', plannedDeparture: '2019-08-19T20:04:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1551,10 +1585,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:31:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:32:00+02:00', plannedDeparture: '2019-08-19T20:31:00+02:00', departureDelay: 60, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1581,10 +1617,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:34:00+02:00', plannedDeparture: '2019-08-19T20:33:00+02:00', departureDelay: 60, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1611,10 +1649,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:45:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -1889,10 +1929,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: '2019-08-19T20:25:00+02:00', departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1919,10 +1961,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:30:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:33:00+02:00', plannedDeparture: '2019-08-19T20:30:00+02:00', departureDelay: 180, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1949,10 +1993,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:36:00+02:00', plannedDeparture: '2019-08-19T20:33:00+02:00', departureDelay: 180, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1979,10 +2025,12 @@ module.exports = [ plannedArrival: '2019-08-19T21:19:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -2257,10 +2305,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T19:39:00+02:00', plannedDeparture: '2019-08-19T19:39:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2287,10 +2337,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:30:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:33:00+02:00', plannedDeparture: '2019-08-19T20:30:00+02:00', departureDelay: 180, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2317,10 +2369,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:32:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:35:00+02:00', plannedDeparture: '2019-08-19T20:32:00+02:00', departureDelay: 180, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2347,10 +2401,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: 180, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ @@ -2625,10 +2681,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T19:59:00+02:00', plannedDeparture: '2019-08-19T19:59:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2655,10 +2713,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:30:00+02:00', arrivalDelay: 120, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:32:00+02:00', plannedDeparture: '2019-08-19T20:30:00+02:00', departureDelay: 120, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2685,10 +2745,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:34:00+02:00', plannedDeparture: '2019-08-19T20:33:00+02:00', departureDelay: 60, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2715,10 +2777,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:54:00+02:00', arrivalDelay: 60, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ], frames: [ diff --git a/test/fixtures/vbb-departures.js b/test/fixtures/vbb-departures.js index 9685abdd..cc1c3047 100644 --- a/test/fixtures/vbb-departures.js +++ b/test/fixtures/vbb-departures.js @@ -182,6 +182,8 @@ module.exports = [ when: '2019-08-19T20:30:00+02:00', plannedWhen: '2019-08-19T20:30:00+02:00', delay: 0, + platform: null, + plannedPlatform: null, direction: 'S+U Hermannstr.', line: { type: 'line', @@ -214,7 +216,6 @@ module.exports = [ text: 'Bicycle conveyance' } ], - platform: null, nextStopovers: [ { stop: { @@ -397,10 +398,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:30:00+02:00', plannedDeparture: '2019-08-19T20:30:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -428,10 +431,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:31:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -458,10 +463,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:33:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -488,10 +495,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:35:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -518,10 +527,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:36:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -548,10 +559,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:38:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -578,10 +591,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:40:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -608,10 +623,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:41:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -638,10 +655,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:42:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ] }, @@ -826,6 +845,8 @@ module.exports = [ when: '2019-08-19T20:30:00+02:00', plannedWhen: '2019-08-19T20:30:00+02:00', delay: 0, + platform: null, + plannedPlatform: null, direction: 'U Paracelsus-Bad', line: { type: 'line', @@ -858,7 +879,6 @@ module.exports = [ text: 'Bicycle conveyance' } ], - platform: null, nextStopovers: [ { stop: { @@ -1041,10 +1061,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:30:00+02:00', plannedDeparture: '2019-08-19T20:30:00+02:00', departureDelay: 0, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1071,10 +1093,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:32:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1101,10 +1125,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:34:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1131,10 +1157,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:35:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1161,10 +1189,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:37:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1191,10 +1221,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:38:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1221,10 +1253,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:40:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1251,10 +1285,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:41:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1281,10 +1317,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:43:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1311,10 +1349,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:45:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1341,10 +1381,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:46:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1371,10 +1413,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:47:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ] }, @@ -1559,6 +1603,8 @@ module.exports = [ when: '2019-08-19T20:31:00+02:00', plannedWhen: '2019-08-19T20:31:00+02:00', delay: 0, + platform: '4', + plannedPlatform: '4', direction: 'S Spandau', line: { type: 'line', @@ -1591,7 +1637,6 @@ module.exports = [ text: 'Bicycle conveyance' } ], - platform: '4', nextStopovers: [ { stop: { @@ -1774,10 +1819,12 @@ module.exports = [ plannedArrival: null, arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: '2019-08-19T20:31:00+02:00', plannedDeparture: '2019-08-19T20:31:00+02:00', departureDelay: 0, - departurePlatform: '4' + departurePlatform: '4', + plannedDeparturePlatform: '4' }, { stop: { @@ -1804,10 +1851,13 @@ module.exports = [ plannedArrival: '2019-08-19T20:32:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1834,10 +1884,13 @@ module.exports = [ plannedArrival: '2019-08-19T20:34:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1864,10 +1917,13 @@ module.exports = [ plannedArrival: '2019-08-19T20:36:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1894,10 +1950,13 @@ module.exports = [ plannedArrival: '2019-08-19T20:39:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1924,10 +1983,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:42:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1954,10 +2015,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:44:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -1984,10 +2047,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:46:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2014,10 +2079,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:48:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2044,10 +2111,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:50:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2074,10 +2143,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:52:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2104,10 +2175,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:54:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2134,10 +2207,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:57:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2164,10 +2239,12 @@ module.exports = [ plannedArrival: '2019-08-19T20:59:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2194,10 +2271,12 @@ module.exports = [ plannedArrival: '2019-08-19T21:01:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2224,10 +2303,12 @@ module.exports = [ plannedArrival: '2019-08-19T21:05:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null }, { stop: { @@ -2254,10 +2335,12 @@ module.exports = [ plannedArrival: '2019-08-19T21:07:00+02:00', arrivalDelay: null, arrivalPlatform: null, + plannedArrivalPlatform: null, departure: null, plannedDeparture: null, departureDelay: null, - departurePlatform: null + departurePlatform: null, + plannedDeparturePlatform: null } ] } diff --git a/test/lib/validators.js b/test/lib/validators.js index 71ab4ff3..d867b7fc 100644 --- a/test/lib/validators.js +++ b/test/lib/validators.js @@ -142,20 +142,20 @@ const createValidateStopover = (cfg) => { a.strictEqual(typeof s.arrivalPlatform, 'string', msg + 'be a string') a.ok(s.arrivalPlatform, msg + 'not be empty') } - if (is(s.scheduledArrivalPlatform)) { - const msg = name + '.scheduledArrivalPlatform must ' - a.strictEqual(typeof s.scheduledArrivalPlatform, 'string', msg + 'be a string') - a.ok(s.scheduledArrivalPlatform, msg + 'not be empty') + if (is(s.plannedArrivalPlatform)) { + const msg = name + '.plannedArrivalPlatform must ' + a.strictEqual(typeof s.plannedArrivalPlatform, 'string', msg + 'be a string') + a.ok(s.plannedArrivalPlatform, msg + 'not be empty') } if (is(s.departurePlatform)) { const msg = name + '.departurePlatform must ' a.strictEqual(typeof s.departurePlatform, 'string', msg + 'be a string') a.ok(s.departurePlatform, msg + 'not be empty') } - if (is(s.scheduledDeparturePlatform)) { - const msg = name + '.scheduledDeparturePlatform must ' - a.strictEqual(typeof s.scheduledDeparturePlatform, 'string', msg + 'be a string') - a.ok(s.scheduledDeparturePlatform, msg + 'not be empty') + if (is(s.plannedDeparturePlatform)) { + const msg = name + '.plannedDeparturePlatform must ' + a.strictEqual(typeof s.plannedDeparturePlatform, 'string', msg + 'be a string') + a.ok(s.plannedDeparturePlatform, msg + 'not be empty') } anyOf(['stop', 'station'], val, s.stop, name + '.stop')