From 027aa3b389378d7cb5f2913a8c3b3ab7d3744b25 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 16 Dec 2018 09:08:33 +0100
Subject: Rename mode=marudor to mode=json as it is no longer used by
marudor.de
mode=marudor requests will be silently handled as mode=json so as not to break
other clients
---
t/22-json.t | 46 ++++++++++++++++++++++++++++++++++++++++++++++
t/22-marudor.t | 46 ----------------------------------------------
2 files changed, 46 insertions(+), 46 deletions(-)
create mode 100644 t/22-json.t
delete mode 100644 t/22-marudor.t
(limited to 't')
diff --git a/t/22-json.t b/t/22-json.t
new file mode 100644
index 0000000..9db67b8
--- /dev/null
+++ b/t/22-json.t
@@ -0,0 +1,46 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use 5.014;
+use Test::More;
+use Test::Mojo;
+
+use FindBin;
+require "$FindBin::Bin/../index.pl";
+
+my $t = Test::Mojo->new;
+
+# Note: These tests depends on IRIS live data. If it fails, it -might- also
+# be because of IRIS problems or unanticipated schedule changes.
+# TODO: Support mock XML from hard disk.
+
+$t->get_ok('/EDUV?mode=json&version=1')
+ ->status_is(200)
+ ->json_has('/departures', 'has departures')
+ ->json_has('/departures/0', 'has a departure')
+ ->json_has('/departures/0/route', '.route')
+ ->json_has('/departures/0/delay', '.delay')
+ ->json_like('/departures/0/destination',
+ qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
+ '.destination')
+ ->json_like('/departures/0/isCancelled', qr{ ^ 0 | 1 $ }x, '.is_cancelled')
+ ->json_has('/departures/0/messages', '.messages')
+ ->json_has('/departures/0/messages/delay', '.messages.delay')
+ ->json_has('/departures/0/messages/qos', '.messages.qos')
+ ->json_like('/departures/0/time', qr{ ^ \d \d? : \d\d $ }x, '.time')
+ ->json_is('/departures/0/train', 'S 1', '.train')
+ ->json_like('/departures/0/platform', qr{ ^ 1 | 2 $}x, '.platform')
+ ->json_like('/departures/0/route/0/name',
+ qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
+ '.route[0]')
+ ->json_like('/departures/0/via/0',
+ qr{ ^ Dortmund-Dorstfeld \s S.d | Dortmund-Oespel $}x,
+ '.via[0]')
+ ;
+
+$t->get_ok('/EDUV?mode=json&version=1&callback=my_callback')
+ ->status_is(200)
+ ->content_like(qr{ ^ my_callback \( }x, 'json callback works');
+# ) <- just here to fix bracket grouping in vim
+
+done_testing();
diff --git a/t/22-marudor.t b/t/22-marudor.t
deleted file mode 100644
index 7038ca6..0000000
--- a/t/22-marudor.t
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.014;
-use Test::More;
-use Test::Mojo;
-
-use FindBin;
-require "$FindBin::Bin/../index.pl";
-
-my $t = Test::Mojo->new;
-
-# Note: These tests depends on IRIS live data. If it fails, it -might- also
-# be because of IRIS problems or unanticipated schedule changes.
-# TODO: Support mock XML from hard disk.
-
-$t->get_ok('/EDUV?mode=marudor&version=1')
- ->status_is(200)
- ->json_has('/departures', 'has departures')
- ->json_has('/departures/0', 'has a departure')
- ->json_has('/departures/0/route', '.route')
- ->json_has('/departures/0/delay', '.delay')
- ->json_like('/departures/0/destination',
- qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
- '.destination')
- ->json_like('/departures/0/isCancelled', qr{ ^ 0 | 1 $ }x, '.is_cancelled')
- ->json_has('/departures/0/messages', '.messages')
- ->json_has('/departures/0/messages/delay', '.messages.delay')
- ->json_has('/departures/0/messages/qos', '.messages.qos')
- ->json_like('/departures/0/time', qr{ ^ \d \d? : \d\d $ }x, '.time')
- ->json_is('/departures/0/train', 'S 1', '.train')
- ->json_like('/departures/0/platform', qr{ ^ 1 | 2 $}x, '.platform')
- ->json_like('/departures/0/route/0/name',
- qr{ ^ (Dortmund|Bochum|Essen|D.sseldorf|Solingen) \s Hbf $}x,
- '.route[0]')
- ->json_like('/departures/0/via/0',
- qr{ ^ Dortmund-Dorstfeld \s S.d | Dortmund-Oespel $}x,
- '.via[0]')
- ;
-
-$t->get_ok('/EDUV?mode=marudor&version=1&callback=my_callback')
- ->status_is(200)
- ->content_like(qr{ ^ my_callback \( }x, 'json callback works');
-# ) <- just here to fix bracket grouping in vim
-
-done_testing();
--
cgit v1.2.3