tests: trip validator ✅

test/bvg.js

@@ -175,7 +175,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/cmta.js

@@ -157,7 +157,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/db.js

@@ -12,7 +12,7 @@ const dbProfile = require('../p/db')
 const products = require('../p/db/products')
 const {
 	station: createValidateStation,
-	journeyLeg: createValidateJourneyLeg
+	trip: createValidateTrip
 } = require('./lib/validators')
 const createValidate = require('./lib/validate-fptf-with')
 const testJourneysStationToStation = require('./lib/journeys-station-to-station')
@@ -235,14 +235,15 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	const validateJourneyLeg = createValidateJourneyLeg(cfg)
+	const validateTrip = createValidateTrip(cfg)
 	const validate = createValidate(cfg, {
-		journeyLeg: (validate, leg, name) => {
+		trip: (validate, trip, name) => {
-			if (!leg.direction) leg.direction = 'foo' // todo, see #49
+			trip = Object.assign({}, trip)
-			validateJourneyLeg(validate, leg, name)
+			if (!trip.direction) trip.direction = 'foo' // todo, see #49
+			validateTrip(validate, trip, name)
 		}
 	})
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 
 	t.end()
 })

test/insa.js

@@ -168,7 +168,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/lib/validators.js

@@ -228,6 +228,9 @@ const createValidateJourneyLeg = (cfg) => {
 				a.ok(leg.distance > 0, msg + '> 0')
 			}
 		} else {
+			a.strictEqual(typeof leg.tripId, 'string', name + '.tripId must be a string')
+			a.ok(leg.tripId, name + '.tripId must not be empty')
+
 			const msg = name + '.direction must be a string'
 			a.strictEqual(typeof leg.direction, 'string', msg)
 			a.ok(leg.direction, name + '.direction must not be empty')
@@ -301,6 +304,10 @@ const validateJourneys = (val, js, name = 'journeys') => {
 	}
 }
 
+const validateTrip = (val, trip, name = 'trip') => {
+	val.journeyLeg(val, trip, name)
+}
+
 const createValidateArrivalOrDeparture = (type, cfg) => {
 	if (type !== 'arrival' && type !== 'departure') throw new Error('invalid type')
 
@@ -447,6 +454,7 @@ module.exports = {
 	journeyLeg: createValidateJourneyLeg,
 	journey: () => validateJourney,
 	journeys: () => validateJourneys,
+	trip: () => validateTrip,
 	arrival: createValidateArrival,
 	departure: createValidateDeparture,
 	departures: () => validateDepartures,

test/nahsh.js

@@ -218,7 +218,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/oebb.js

@@ -241,7 +241,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/sbahn-muenchen.js

@@ -171,7 +171,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/vbb.js

@@ -155,7 +155,7 @@ test('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.id, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })
 

test/vbn.js

@@ -174,7 +174,7 @@ test.skip('trip details', async (t) => {
 	t.ok(p.line.name, 'precondition failed')
 	const trip = await client.trip(p.tripId, p.line.name, {when})
 
-	validate(t, trip, 'journeyLeg', 'trip')
+	validate(t, trip, 'trip', 'trip')
 	t.end()
 })