Skip to content

Commit

Permalink
Adapt tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbruechert
jbruechert committed Jan 7, 2025
1 parent a5edeb7 commit e517c14
Show file tree
Hide file tree
Showing 12 changed files with 201 additions and 201 deletions.
2 changes: 1 addition & 1 deletion test/abi_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ TEST(rt, abi_timetable) {
EXPECT_EQ(596, transport->event_mams[transport->n_event_mams - 2]);
EXPECT_EQ(598, transport->event_mams[transport->n_event_mams - 1]);
auto const t_name = std::string{transport->name, transport->name_len};
EXPECT_EQ("Tram iXpress Fischer-Hallman", t_name);
EXPECT_EQ("iXpress Fischer-Hallman", t_name);

auto const route = nigiri_get_route(t, transport->route_idx);
EXPECT_EQ(28, route->n_stops);
Expand Down
14 changes: 7 additions & 7 deletions test/loader/gtfs/block_id_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ TRANSFERS: 0
FROM: (STOP 1, S1) [2006-07-02 21:00]
TO: (STOP 8, S8) [2006-07-03 04:00]
leg 0: (STOP 1, S1) [2006-07-02 21:00] -> (STOP 8, S8) [2006-07-03 04:00]
0: S1 STOP 1.......................................... d: 02.07 21:00 [02.07 23:00] [{name=17 T1, day=2006-07-02, id=T1, src=0}]
1: S2 STOP 2.......................................... a: 02.07 21:55 [02.07 23:55] d: 02.07 22:00 [03.07 00:00] [{name=17 T3, day=2006-07-02, id=T3, src=0}]
2: S3 STOP 3.......................................... a: 02.07 23:00 [03.07 01:00] d: 02.07 23:00 [03.07 01:00] [{name=17 T3, day=2006-07-02, id=T3, src=0}]
3: S4 STOP 4.......................................... a: 03.07 00:00 [03.07 02:00] d: 03.07 00:00 [03.07 02:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}]
4: S5 STOP 5.......................................... a: 03.07 01:00 [03.07 03:00] d: 03.07 01:00 [03.07 03:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}]
5: S6 STOP 6.......................................... a: 03.07 02:00 [03.07 04:00] d: 03.07 02:00 [03.07 04:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}]
6: S7 STOP 7.......................................... a: 03.07 03:00 [03.07 05:00] d: 03.07 03:00 [03.07 05:00] [{name=17 T6, day=2006-07-02, id=T6, src=0}]
0: S1 STOP 1.......................................... d: 02.07 21:00 [02.07 23:00] [{name=17, day=2006-07-02, id=T1, src=0}]
1: S2 STOP 2.......................................... a: 02.07 21:55 [02.07 23:55] d: 02.07 22:00 [03.07 00:00] [{name=17, day=2006-07-02, id=T3, src=0}]
2: S3 STOP 3.......................................... a: 02.07 23:00 [03.07 01:00] d: 02.07 23:00 [03.07 01:00] [{name=17, day=2006-07-02, id=T3, src=0}]
3: S4 STOP 4.......................................... a: 03.07 00:00 [03.07 02:00] d: 03.07 00:00 [03.07 02:00] [{name=17, day=2006-07-02, id=T6, src=0}]
4: S5 STOP 5.......................................... a: 03.07 01:00 [03.07 03:00] d: 03.07 01:00 [03.07 03:00] [{name=17, day=2006-07-02, id=T6, src=0}]
5: S6 STOP 6.......................................... a: 03.07 02:00 [03.07 04:00] d: 03.07 02:00 [03.07 04:00] [{name=17, day=2006-07-02, id=T6, src=0}]
6: S7 STOP 7.......................................... a: 03.07 03:00 [03.07 05:00] d: 03.07 03:00 [03.07 05:00] [{name=17, day=2006-07-02, id=T6, src=0}]
7: S8 STOP 8.......................................... a: 03.07 04:00 [03.07 06:00]
)"};

Expand Down
84 changes: 42 additions & 42 deletions test/routing/bike_transport_test.cc
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions test/routing/clasz_filter_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TRANSFERS: 0
FROM: (A, A) [2024-03-01 09:00]
TO: (C, C) [2024-03-01 10:00]
leg 0: (A, A) [2024-03-01 09:00] -> (C, C) [2024-03-01 10:00]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X , day=2024-03-01, id=AIR, src=0}]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X, day=2024-03-01, id=AIR, src=0}]
1: C C............................................... a: 01.03 10:00 [01.03 11:00]
Expand All @@ -80,12 +80,12 @@ TRANSFERS: 1
FROM: (A, A) [2024-03-01 09:00]
TO: (C, C) [2024-03-01 11:00]
leg 0: (A, A) [2024-03-01 09:00] -> (B, B) [2024-03-01 09:55]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=Bus 1, day=2024-03-01, id=T1, src=0}]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=1, day=2024-03-01, id=T1, src=0}]
1: B B............................................... a: 01.03 09:55 [01.03 10:55]
leg 1: (B, B) [2024-03-01 09:55] -> (B, B) [2024-03-01 09:57]
FOOTPATH (duration=2)
leg 2: (B, B) [2024-03-01 10:05] -> (C, C) [2024-03-01 11:00]
0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2 , day=2024-03-01, id=T2, src=0}]
0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2, day=2024-03-01, id=T2, src=0}]
1: C C............................................... a: 01.03 11:00 [01.03 12:00]
Expand All @@ -98,7 +98,7 @@ TRANSFERS: 0
FROM: (A, A) [2024-03-01 09:10]
TO: (C, C) [2024-03-01 10:10]
leg 0: (A, A) [2024-03-01 09:10] -> (C, C) [2024-03-01 10:10]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X , day=2024-03-01, id=AIR, src=0}]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=X, day=2024-03-01, id=AIR, src=0}]
1: C C............................................... a: 01.03 10:00 [01.03 11:00]
Expand All @@ -111,12 +111,12 @@ TRANSFERS: 1
FROM: (A, A) [2024-03-01 09:10]
TO: (C, C) [2024-03-01 11:10]
leg 0: (A, A) [2024-03-01 09:10] -> (B, B) [2024-03-01 10:05]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=Bus 1, day=2024-03-01, id=T1, src=0}]
0: A A............................................... d: 01.03 09:00 [01.03 10:00] [{name=1, day=2024-03-01, id=T1, src=0}]
1: B B............................................... a: 01.03 09:55 [01.03 10:55]
leg 1: (B, B) [2024-03-01 10:05] -> (B, B) [2024-03-01 10:07]
FOOTPATH (duration=2)
leg 2: (B, B) [2024-03-01 10:15] -> (C, C) [2024-03-01 11:10]
0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2 , day=2024-03-01, id=T2, src=0}]
0: B B............................................... d: 01.03 10:05 [01.03 11:05] [{name=2, day=2024-03-01, id=T2, src=0}]
1: C C............................................... a: 01.03 11:00 [01.03 12:00]
Expand Down
12 changes: 6 additions & 6 deletions test/routing/rt_routing_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ TRANSFERS: 1
FROM: (A, A) [2019-05-02 23:00]
TO: (D, D) [2019-05-03 01:00]
leg 0: (A, A) [2019-05-02 23:00] -> (B, B) [2019-05-03 00:00]
0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=Bus RE 1, day=2019-05-02, id=T_RE1, src=0}]
0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=RE 1, day=2019-05-02, id=T_RE1, src=0}]
1: B B............................................... a: 03.05 00:00 [03.05 02:00]
leg 1: (B, B) [2019-05-03 00:00] -> (B, B) [2019-05-03 00:02]
FOOTPATH (duration=2)
leg 2: (B, B) [2019-05-03 00:30] -> (D, D) [2019-05-03 01:00]
0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}]
1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}]
0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}]
1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}]
2: D D............................................... a: 02.05 23:00 [03.05 01:00] RT 03.05 01:00 [03.05 03:00]
)";
Expand Down Expand Up @@ -145,13 +145,13 @@ TRANSFERS: 1
FROM: (A, A) [2019-05-02 23:00]
TO: (D, D) [2019-05-03 01:00]
leg 0: (A, A) [2019-05-02 23:00] -> (B, B) [2019-05-03 00:00]
0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=Bus RE 1, day=2019-05-02, id=T_RE1, src=0}]
0: A A............................................... d: 02.05 23:00 [03.05 01:00] [{name=RE 1, day=2019-05-02, id=T_RE1, src=0}]
1: B B............................................... a: 03.05 00:00 [03.05 02:00]
leg 1: (B, B) [2019-05-03 00:00] -> (B, B) [2019-05-03 00:02]
FOOTPATH (duration=2)
leg 2: (B, B) [2019-05-03 00:30] -> (D, D) [2019-05-03 01:00]
0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}]
1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=Bus RE 2, day=2019-05-02, id=T_RE2, src=0}]
0: B B............................................... d: 02.05 22:30 [03.05 00:30] RT 03.05 00:30 [03.05 02:30] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}]
1: C C............................................... a: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] d: 02.05 22:45 [03.05 00:45] RT 03.05 00:45 [03.05 02:45] [{name=RE 2, day=2019-05-02, id=T_RE2, src=0}]
2: D D............................................... a: 02.05 23:00 [03.05 01:00] RT 03.05 01:00 [03.05 03:00]
)";
Expand Down
36 changes: 18 additions & 18 deletions test/routing/shortest_fp_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,23 @@ TRANSFERS: 2
leg 0: (START, START) [2024-06-07 23:57] -> (A0, A0) [2024-06-08 00:00]
MUMO (id=23, duration=3)
leg 1: (A0, A0) [2024-06-08 00:00] -> (A3, A3) [2024-06-08 00:15]
0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=A, day=2024-06-08, id=AWE, src=0}]
1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=A, day=2024-06-08, id=AWE, src=0}]
2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=A, day=2024-06-08, id=AWE, src=0}]
3: A3 A3.............................................. a: 08.06 00:15 [08.06 02:15]
leg 2: (A3, A3) [2024-06-08 00:15] -> (B0, B0) [2024-06-08 00:20]
FOOTPATH (duration=5)
leg 3: (B0, B0) [2024-06-08 01:00] -> (B3, B3) [2024-06-08 01:40]
0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=B, day=2024-06-08, id=BWE, src=0}]
1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=B, day=2024-06-08, id=BWE, src=0}]
2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=B, day=2024-06-08, id=BWE, src=0}]
3: B3 B3.............................................. a: 08.06 01:40 [08.06 03:40]
leg 4: (B3, B3) [2024-06-08 01:40] -> (C2, C2) [2024-06-08 01:45]
FOOTPATH (duration=5)
leg 5: (C2, C2) [2024-06-08 02:20] -> (C5, C5) [2024-06-08 02:50]
2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=C, day=2024-06-08, id=CWE, src=0}]
3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=C, day=2024-06-08, id=CWE, src=0}]
4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=C, day=2024-06-08, id=CWE, src=0}]
5: C5 C5.............................................. a: 08.06 02:50 [08.06 04:50]
leg 6: (C5, C5) [2024-06-08 02:50] -> (END, END) [2024-06-08 03:00]
MUMO (id=42, duration=10)
Expand Down Expand Up @@ -188,23 +188,23 @@ TRANSFERS: 2
leg 0: (END, END) [2024-06-07 23:57] -> (A0, A0) [2024-06-08 00:00]
MUMO (id=23, duration=3)
leg 1: (A0, A0) [2024-06-08 00:00] -> (A3, A3) [2024-06-08 00:15]
0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=Tram A, day=2024-06-08, id=AWE, src=0}]
0: A0 A0.............................................. d: 08.06 00:00 [08.06 02:00] [{name=A, day=2024-06-08, id=AWE, src=0}]
1: A1 A1.............................................. a: 08.06 00:01 [08.06 02:01] d: 08.06 00:02 [08.06 02:02] [{name=A, day=2024-06-08, id=AWE, src=0}]
2: A2 A2.............................................. a: 08.06 00:06 [08.06 02:06] d: 08.06 00:07 [08.06 02:07] [{name=A, day=2024-06-08, id=AWE, src=0}]
3: A3 A3.............................................. a: 08.06 00:15 [08.06 02:15]
leg 2: (A3, A3) [2024-06-08 00:15] -> (B0, B0) [2024-06-08 00:20]
FOOTPATH (duration=5)
leg 3: (B0, B0) [2024-06-08 01:00] -> (B3, B3) [2024-06-08 01:40]
0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=Tram B, day=2024-06-08, id=BWE, src=0}]
0: B0 B0.............................................. d: 08.06 01:00 [08.06 03:00] [{name=B, day=2024-06-08, id=BWE, src=0}]
1: B1 B1.............................................. a: 08.06 01:20 [08.06 03:20] d: 08.06 01:22 [08.06 03:22] [{name=B, day=2024-06-08, id=BWE, src=0}]
2: B2 B2.............................................. a: 08.06 01:30 [08.06 03:30] d: 08.06 01:32 [08.06 03:32] [{name=B, day=2024-06-08, id=BWE, src=0}]
3: B3 B3.............................................. a: 08.06 01:40 [08.06 03:40]
leg 4: (B3, B3) [2024-06-08 01:40] -> (C2, C2) [2024-06-08 01:45]
FOOTPATH (duration=5)
leg 5: (C2, C2) [2024-06-08 02:20] -> (C5, C5) [2024-06-08 02:50]
2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=Tram C, day=2024-06-08, id=CWE, src=0}]
2: C2 C2.............................................. d: 08.06 02:20 [08.06 04:20] [{name=C, day=2024-06-08, id=CWE, src=0}]
3: C3 C3.............................................. a: 08.06 02:30 [08.06 04:30] d: 08.06 02:32 [08.06 04:32] [{name=C, day=2024-06-08, id=CWE, src=0}]
4: C4 C4.............................................. a: 08.06 02:40 [08.06 04:40] d: 08.06 02:42 [08.06 04:42] [{name=C, day=2024-06-08, id=CWE, src=0}]
5: C5 C5.............................................. a: 08.06 02:50 [08.06 04:50]
leg 6: (C5, C5) [2024-06-08 02:50] -> (START, START) [2024-06-08 03:00]
MUMO (id=42, duration=10)
Expand Down
Loading

0 comments on commit e517c14

Please sign in to comment.