BVG/VBB integration/E2E tests: don' try to identify stations

This commit is contained in:
Jannis R 2021-05-20 16:40:36 +01:00
parent 3412a66f6a
commit 40ec157869
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5
3 changed files with 5 additions and 39 deletions

View file

@ -69,8 +69,7 @@
"replayer": "^2.2.3",
"tap-spec": "^5.0.0",
"tape": "^5.0.0",
"validate-fptf": "^3.0.0",
"vbb-stations-autocomplete": "^4.1.0"
"validate-fptf": "^3.0.0"
},
"scripts": {
"lint": "eslint .",

View file

@ -2,8 +2,6 @@
// todo: DRY with vbb tests
const stations = require('vbb-stations-autocomplete')
const shorten = require('vbb-short-station-name')
const isRoughlyEqual = require('is-roughly-equal')
const {DateTime} = require('luxon')
const flatMap = require('lodash/flatMap')
@ -37,12 +35,6 @@ const testReachableFrom = require('./lib/reachable-from')
const when = cfg.when
const validateDirection = (dir, name) => {
if (!stations(dir, true, false)[0]) {
console.error(name + `: station "${dir}" is unknown`)
}
}
const validate = createValidate(cfg, {
station: validateStation,
line: validateLine,

View file

@ -1,8 +1,6 @@
'use strict'
const stations = require('vbb-stations-autocomplete')
const a = require('assert')
const shorten = require('vbb-short-station-name')
const products = require('../../../p/bvg/products')
const {createWhen} = require('./util')
@ -22,19 +20,8 @@ const cfg = {
products
}
const validateDirection = (dir, name) => {
if (!stations(dir, true, false)[0]) {
console.error(name + `: station "${dir}" is unknown`)
}
}
// todo: coordsOptional = false
const _validateStation = createValidateStation(cfg)
const validateStation = (validate, s, name) => {
_validateStation(validate, s, name)
// todo: find station by ID
a.equal(s.name, shorten(s.name), name + '.name must be shortened')
}
const validateStation = createValidateStation(cfg)
const _validateLine = createValidateLine(cfg)
const validateLine = (validate, l, name) => {
@ -58,23 +45,11 @@ const validateLine = (validate, l, name) => {
}
}
const _validateJourneyLeg = createValidateJourneyLeg(cfg)
const validateJourneyLeg = (validate, l, name) => {
_validateJourneyLeg(validate, l, name)
if (!l.walking) validateDirection(l.direction, name + '.direction')
}
const validateJourneyLeg = createValidateJourneyLeg(cfg)
const _validateDeparture = createValidateDeparture(cfg)
const validateDeparture = (validate, dep, name) => {
_validateDeparture(validate, dep, name)
validateDirection(dep.direction, name + '.direction')
}
const validateDeparture = createValidateDeparture(cfg)
const _validateMovement = createValidateMovement(cfg)
const validateMovement = (validate, m, name) => {
_validateMovement(validate, m, name)
validateDirection(m.direction, name + '.direction')
}
const validateMovement = createValidateMovement(cfg)
module.exports = {
cfg,