fix tests

motis-project · Oct 15, 2024 · 1da3035 · 1da3035
1 parent 85412c0
commit 1da3035
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 47 deletions.
diff --git a/test/loader/merge_duplicates_test.cc b/test/loader/merge_duplicates_test.cc
@@ -12,14 +12,6 @@ using namespace nigiri::loader;
 using namespace nigiri::loader::gtfs;
 using namespace date;
 
-auto resolve(date::sys_days d,
-             timetable const& tt,
-             source_idx_t const src,
-             transit_realtime::TripDescriptor const& td) {
-  rt_timetable rtt;
-  return rt::gtfsrt_resolve_run(d, tt, rtt, src, td);
-}
-
 namespace {
 
 mem_dir rbo500_a_files() {
@@ -182,13 +174,13 @@ TEST(loader, merge_intra_src) {
   auto td = transit_realtime::TripDescriptor();
 
   *td.mutable_trip_id() = "2593445697";
-  auto const [r0, t0] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{0}, td);
+  auto const [r0, t0] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{0}, td);
   ASSERT_TRUE(r0.valid());
 
   *td.mutable_trip_id() = "2593399070";
-  auto const [r1, t1] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{0}, td);
+  auto const [r1, t1] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{0}, td);
   ASSERT_TRUE(r1.valid());
 
   EXPECT_EQ(r0.t_, r1.t_);
@@ -381,13 +373,13 @@ TEST(loader, merge_inter_src) {
   auto td = transit_realtime::TripDescriptor();
 
   *td.mutable_trip_id() = "2593432458";
-  auto const [r0, t0] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{0}, td);
+  auto const [r0, t0] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{0}, td);
   ASSERT_TRUE(r0.valid());
 
   *td.mutable_trip_id() = "2593402613";
-  auto const [r1, t1] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{1}, td);
+  auto const [r1, t1] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{1}, td);
   ASSERT_TRUE(r1.valid());
 
   EXPECT_EQ(r0.t_, r1.t_);
@@ -569,13 +561,13 @@ TEST(loader, merge_reflexive_matching) {
   auto td = transit_realtime::TripDescriptor();
 
   *td.mutable_trip_id() = "2593445670";
-  auto const [r0, t0] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{0}, td);
+  auto const [r0, t0] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{0}, td);
   ASSERT_TRUE(r0.valid());
 
   *td.mutable_trip_id() = "2593399038";
-  auto const [r1, t1] =
-      resolve(date::sys_days{2024_y / September / 3}, tt, source_idx_t{0}, td);
+  auto const [r1, t1] = rt::gtfsrt_resolve_run(
+      date::sys_days{2024_y / September / 3}, tt, nullptr, source_idx_t{0}, td);
   ASSERT_TRUE(r1.valid());
 
   EXPECT_EQ(r0.t_, r1.t_);

diff --git a/test/routing/wheelchair_assistance_test.cc b/test/routing/wheelchair_assistance_test.cc
@@ -120,7 +120,7 @@ TEST(routing, wheelchair_assistance) {
 
   auto rtt = rt::create_rt_timetable(tt, date::sys_days{2024_y / June / 19});
   auto const [r, t] = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4},
-                                             tt, rtt, source_idx_t{0}, td);
+                                             tt, &rtt, source_idx_t{0}, td);
   EXPECT_TRUE(r.valid());
 
   auto const fr = rt::frun{tt, &rtt, r};

diff --git a/test/rt/frun_shape_test.cc b/test/rt/frun_shape_test.cc
@@ -224,7 +224,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_1");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0U}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0U}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -286,7 +286,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_6");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -308,7 +308,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_1");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create sub run containing single trip leg
     auto const r_modified =
@@ -334,7 +334,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_3");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create sub run containing single trip leg
     auto const r_modified =
@@ -525,7 +525,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_5");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -612,7 +612,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_5+");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -643,7 +643,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_11");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -672,7 +672,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_12");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};
@@ -699,7 +699,7 @@ TEST(
     transit_realtime::TripDescriptor td;
     td.set_trip_id("TRIP_13");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / January / 1}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / January / 1}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
     // Create full run
     auto const full_run = rt::frun{tt, &rtt, r};

diff --git a/test/rt/gtfsrt_resolve_trip_test.cc b/test/rt/gtfsrt_resolve_trip_test.cc
@@ -89,7 +89,7 @@ TEST(rt, gtfsrt_resolve_static_trip) {
     *td.mutable_trip_id() = "T_RE1";
 
     auto const [r, t] = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 3},
-                                               tt, rtt, source_idx_t{0}, td);
+                                               tt, &rtt, source_idx_t{0}, td);
     EXPECT_TRUE(r.valid());
   }
 
@@ -100,7 +100,7 @@ TEST(rt, gtfsrt_resolve_static_trip) {
     *td.mutable_trip_id() = "T_RE2";
 
     auto const [r, t] = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4},
-                                               tt, rtt, source_idx_t{0}, td);
+                                               tt, &rtt, source_idx_t{0}, td);
     EXPECT_TRUE(r.valid());
   }
 
@@ -112,7 +112,7 @@ TEST(rt, gtfsrt_resolve_static_trip) {
     // 2019-05-02 21:30 UTC
     // -> we give "today" in UTC (start_day would be local days)
     auto const [r, t] = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4},
-                                               tt, rtt, source_idx_t{0}, td);
+                                               tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
   }
 }
@@ -174,7 +174,7 @@ TEST(rt, resolve_tz) {
     td.set_trip_id("5456914");
 
     auto const r = gtfsrt_resolve_run(date::sys_days{2023_y / August / 3}, tt,
-                                      rtt, source_idx_t{0U}, td);
+                                      &rtt, source_idx_t{0U}, td);
     EXPECT_TRUE(r.first.valid());
   }
 
@@ -189,7 +189,7 @@ TEST(rt, resolve_tz) {
     td.set_trip_id("5456915");
 
     auto const r = gtfsrt_resolve_run(date::sys_days{2023_y / August / 3}, tt,
-                                      rtt, source_idx_t{0U}, td);
+                                      &rtt, source_idx_t{0U}, td);
     EXPECT_TRUE(r.first.valid());
   }
 }
@@ -245,7 +245,7 @@ TEST(rt, gtfs_rt_update) {
   auto i = 0U, j = 0U;
   auto fr = frun{tt, nullptr,
                  rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4}, tt,
-                                        rtt, source_idx_t{0}, *td)
+                                        &rtt, source_idx_t{0}, *td)
                      .first};
   ASSERT_TRUE(fr.valid());
   for (auto const [from, to] : utl::pairwise(fr)) {
@@ -261,7 +261,7 @@ TEST(rt, gtfs_rt_update) {
 
   // Basic checks with rt_timetable!=nullptr.
   fr = frun{tt, &rtt,
-            rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4}, tt, rtt,
+            rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4}, tt, &rtt,
                                    source_idx_t{0}, *td)
                 .first};
   i = j = 0U;
@@ -289,7 +289,7 @@ TEST(rt, gtfs_rt_update) {
 
   auto stats = rt::gtfsrt_update_msg(tt, rtt, source_idx_t{0}, "tag", msg0);
   auto [r, t] = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4}, tt,
-                                       rtt, source_idx_t{0}, *td);
+                                       &rtt, source_idx_t{0}, *td);
   EXPECT_EQ(1U, stats.total_entities_success_);
   if (stats.total_entities_success_ != 1U) {
     std::cout << stats << "\n";
@@ -327,7 +327,7 @@ TEST(rt, gtfs_rt_update) {
   EXPECT_EQ(1U, stats.total_entities_success_);
 
   std::tie(r, t) = rt::gtfsrt_resolve_run(date::sys_days{2019_y / May / 4}, tt,
-                                          rtt, source_idx_t{0}, *td);
+                                          &rtt, source_idx_t{0}, *td);
   ASSERT_TRUE(r.valid());
   ASSERT_TRUE(r.is_rt());
   ASSERT_TRUE(r.t_.is_valid());

diff --git a/test/rt/gtfsrt_rt_test.cc b/test/rt/gtfsrt_rt_test.cc
@@ -383,7 +383,7 @@ TEST(rt, gtfs_rt_update_1) {
   td.set_trip_id("3248651");
   td.set_start_time("05:15:00");
   auto const [r, t] = rt::gtfsrt_resolve_run(date::sys_days{May / 1 / 2019}, tt,
-                                             rtt, source_idx_t{0}, td);
+                                             &rtt, source_idx_t{0}, td);
   ASSERT_TRUE(r.valid());
 
   auto ss = std::stringstream{};

diff --git a/test/rt/ripta_test.cc b/test/rt/ripta_test.cc
@@ -92,7 +92,7 @@ TEST(rt, gtfs_rt_ripta) {
     td.set_trip_id("3774835");
     td.set_start_time("22:15:00");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / May / 11}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / May / 11}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
   }
 
@@ -102,7 +102,7 @@ TEST(rt, gtfs_rt_ripta) {
     td.set_trip_id("3776558");
     td.set_start_time("00:17:00");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / May / 11}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / May / 11}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
   }
 
@@ -112,7 +112,7 @@ TEST(rt, gtfs_rt_ripta) {
     td.set_trip_id("3795513");
     td.set_start_time("22:52:00");
     auto const [r, t] = rt::gtfsrt_resolve_run(
-        date::sys_days{2024_y / May / 16}, tt, rtt, source_idx_t{0}, td);
+        date::sys_days{2024_y / May / 16}, tt, &rtt, source_idx_t{0}, td);
     ASSERT_TRUE(r.valid());
   }
 }

diff --git a/test/rt/rt_block_id_test.cc b/test/rt/rt_block_id_test.cc
@@ -120,17 +120,17 @@ TEST(rt, rt_block_id_test) {
   EXPECT_EQ(3U, stats.total_entities_success_);
 
   auto const [r1, t1] = rt::gtfsrt_resolve_run(
-      date::sys_days{May / 1 / 2019}, tt, rtt, source_idx_t{0},
+      date::sys_days{May / 1 / 2019}, tt, &rtt, source_idx_t{0},
       msg1.entity(0).trip_update().trip());
   ASSERT_TRUE(r1.valid());
 
   auto const [r2, t2] = rt::gtfsrt_resolve_run(
-      date::sys_days{May / 1 / 2019}, tt, rtt, source_idx_t{0},
+      date::sys_days{May / 1 / 2019}, tt, &rtt, source_idx_t{0},
       msg1.entity(1).trip_update().trip());
   ASSERT_TRUE(r2.valid());
 
   auto const [r3, t3] = rt::gtfsrt_resolve_run(
-      date::sys_days{May / 1 / 2019}, tt, rtt, source_idx_t{0},
+      date::sys_days{May / 1 / 2019}, tt, &rtt, source_idx_t{0},
       msg1.entity(2).trip_update().trip());
   ASSERT_TRUE(r3.valid());
 

diff --git a/test/rt/skip_test.cc b/test/rt/skip_test.cc
@@ -134,7 +134,7 @@ TEST(rt, gtfs_rt_skip) {
   td.set_trip_id("TRIP_1");
   td.set_start_time("10:00:00");
   auto const [r, t] = rt::gtfsrt_resolve_run(
-      date::sys_days{2023_y / November / 26}, tt, rtt, source_idx_t{0}, td);
+      date::sys_days{2023_y / November / 26}, tt, &rtt, source_idx_t{0}, td);
   ASSERT_TRUE(r.valid());
 
   auto ss = std::stringstream{};