Changed default StopLocationType to StopOrPlatform

feat: made compatible with c++14

.github/workflows/ccpp.yml

@@ -2,9 +2,9 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ master, add-* ]
+    branches: [ cpp14, add-* ]
   pull_request:
-    branches: [ master ]
+    branches: [ cpp14 ]
 
 jobs:
   build:
@@ -13,6 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+     # install dependencies
+    - name: boost
+      run: sudo apt-get update && sudo apt-get install -yq libboost1.65-dev
     - name: git_actions
       run: git submodule update --init --recursive
     - name: cmake

CMakeLists.txt

@@ -5,10 +5,13 @@ project(just_gtfs LANGUAGES CXX VERSION 0.1)
 include_directories(include)
 include_directories(doctest/doctest)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED on)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
 
+find_package(Boost 1.65 COMPONENTS program_options)
+include_directories( ${Boost_INCLUDE_DIR} )
+
 enable_testing()
 
 add_library(just_gtfs INTERFACE)

include/just_gtfs/just_gtfs.h

@@ -21,29 +21,32 @@
 #include <utility>
 #include <vector>
 
+#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
+
 namespace gtfs
 {
 // File names and other entities defined in GTFS----------------------------------------------------
-inline const std::string file_agency = "agency.txt";
-inline const std::string file_stops = "stops.txt";
-inline const std::string file_routes = "routes.txt";
-inline const std::string file_trips = "trips.txt";
-inline const std::string file_stop_times = "stop_times.txt";
-inline const std::string file_calendar = "calendar.txt";
-inline const std::string file_calendar_dates = "calendar_dates.txt";
-inline const std::string file_fare_attributes = "fare_attributes.txt";
-inline const std::string file_fare_rules = "fare_rules.txt";
-inline const std::string file_shapes = "shapes.txt";
-inline const std::string file_frequencies = "frequencies.txt";
-inline const std::string file_transfers = "transfers.txt";
-inline const std::string file_pathways = "pathways.txt";
-inline const std::string file_levels = "levels.txt";
-inline const std::string file_feed_info = "feed_info.txt";
-inline const std::string file_translations = "translations.txt";
-inline const std::string file_attributions = "attributions.txt";
+const std::string file_agency = "agency.txt";
+const std::string file_stops = "stops.txt";
+ const std::string file_routes = "routes.txt";
+ const std::string file_trips = "trips.txt";
+ const std::string file_stop_times = "stop_times.txt";
+ const std::string file_calendar = "calendar.txt";
+ const std::string file_calendar_dates = "calendar_dates.txt";
+ const std::string file_fare_attributes = "fare_attributes.txt";
+ const std::string file_fare_rules = "fare_rules.txt";
+ const std::string file_shapes = "shapes.txt";
+ const std::string file_frequencies = "frequencies.txt";
+ const std::string file_transfers = "transfers.txt";
+ const std::string file_pathways = "pathways.txt";
+ const std::string file_levels = "levels.txt";
+ const std::string file_feed_info = "feed_info.txt";
+ const std::string file_translations = "translations.txt";
+ const std::string file_attributions = "attributions.txt";
 
-inline constexpr char csv_separator = ',';
-inline constexpr char quote = '"';
+ constexpr char csv_separator = ',';
+ constexpr char quote = '"';
 
 // Helper classes and functions---------------------------------------------------------------------
 struct InvalidFieldFormat : public std::exception
@@ -888,7 +891,7 @@ struct Stop
   Text stop_code;
   Text stop_desc;
   Text stop_url;
-  StopLocationType location_type = StopLocationType::GenericNode;
+  StopLocationType location_type = StopLocationType::StopOrPlatform;
   Text stop_timezone;
   Text wheelchair_boarding;
   Id level_id;
@@ -1181,28 +1184,28 @@ public:
   inline Result write_agencies(const std::string & gtfs_path) const;
 
   inline const Agencies & get_agencies() const;
-  inline std::optional<Agency> get_agency(const Id & agency_id) const;
+  inline boost::optional<Agency> get_agency(const Id & agency_id) const;
   inline void add_agency(const Agency & agency);
 
   inline Result read_stops();
   inline Result write_stops(const std::string & gtfs_path) const;
 
   inline const Stops & get_stops() const;
-  inline std::optional<Stop> get_stop(const Id & stop_id) const;
+  inline boost::optional<Stop> get_stop(const Id & stop_id) const;
   inline void add_stop(const Stop & stop);
 
   inline Result read_routes();
   inline Result write_routes(const std::string & gtfs_path) const;
 
   inline const Routes & get_routes() const;
-  inline std::optional<Route> get_route(const Id & route_id) const;
+  inline boost::optional<Route> get_route(const Id & route_id) const;
   inline void add_route(const Route & route);
 
   inline Result read_trips();
   inline Result write_trips(const std::string & gtfs_path) const;
 
   inline const Trips & get_trips() const;
-  inline std::optional<Trip> get_trip(const Id & trip_id) const;
+  inline boost::optional<Trip> get_trip(const Id & trip_id) const;
   inline void add_trip(const Trip & trip);
 
   inline Result read_stop_times();
@@ -1217,7 +1220,7 @@ public:
   inline Result write_calendar(const std::string & gtfs_path) const;
 
   inline const Calendar & get_calendar() const;
-  inline std::optional<CalendarItem> get_calendar(const Id & service_id) const;
+  inline boost::optional<CalendarItem> get_calendar(const Id & service_id) const;
   inline void add_calendar_item(const CalendarItem & calendar_item);
 
   inline Result read_calendar_dates();
@@ -1259,7 +1262,7 @@ public:
   inline Result write_transfers(const std::string & gtfs_path) const;
 
   inline const Transfers & get_transfers() const;
-  inline std::optional<Transfer> get_transfer(const Id & from_stop_id, const Id & to_stop_id) const;
+  inline boost::optional<Transfer> get_transfer(const Id & from_stop_id, const Id & to_stop_id) const;
   inline void add_transfer(const Transfer & transfer);
 
   inline Result read_pathways();
@@ -1274,7 +1277,7 @@ public:
   inline Result write_levels(const std::string & gtfs_path) const;
 
   inline const Levels & get_levels() const;
-  inline std::optional<Level> get_level(const Id & level_id) const;
+  inline boost::optional<Level> get_level(const Id & level_id) const;
   inline void add_level(const Level & level);
 
   inline Result read_feed_info();
@@ -1372,57 +1375,74 @@ inline bool ErrorParsingOptionalFile(const Result & res)
 inline Result Feed::read_feed()
 {
   // Read required files:
-  if (auto res = read_agencies(); res != ResultCode::OK)
+  auto res = read_agencies();
+  if (res != ResultCode::OK)
+    return res;
+  
+  res = read_stops();
+  if (res != ResultCode::OK)
     return res;
 
-  if (auto res = read_stops(); res != ResultCode::OK)
+  res = read_routes();
+  if (res != ResultCode::OK)
     return res;
 
-  if (auto res = read_routes(); res != ResultCode::OK)
+   res = read_trips();
+  if (res != ResultCode::OK)
     return res;
 
-  if (auto res = read_trips(); res != ResultCode::OK)
-    return res;
-
-  if (auto res = read_stop_times(); res != ResultCode::OK)
+   res = read_stop_times();
+  if (res != ResultCode::OK)
     return res;
 
   // Read conditionally required files:
-  if (auto res = read_calendar(); ErrorParsingOptionalFile(res))
+   res = read_calendar();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_calendar_dates(); ErrorParsingOptionalFile(res))
+   res = read_calendar_dates();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
   // Read optional files:
-  if (auto res = read_shapes(); ErrorParsingOptionalFile(res))
+   res = read_shapes();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_transfers(); ErrorParsingOptionalFile(res))
+   res = read_transfers();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_frequencies(); ErrorParsingOptionalFile(res))
+   res = read_frequencies();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_fare_attributes(); ErrorParsingOptionalFile(res))
+   res = read_fare_attributes();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_fare_rules(); ErrorParsingOptionalFile(res))
+   res = read_fare_rules();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_pathways(); ErrorParsingOptionalFile(res))
+   res = read_pathways();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_levels(); ErrorParsingOptionalFile(res))
+   res = read_levels();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_attributions(); ErrorParsingOptionalFile(res))
+   res = read_attributions();
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_feed_info(); ErrorParsingOptionalFile(res))
+   res = read_feed_info(); 
+  if (ErrorParsingOptionalFile(res))
     return res;
 
-  if (auto res = read_translations(); ErrorParsingOptionalFile(res))
+   res = read_translations(); 
+  if (ErrorParsingOptionalFile(res))
     return res;
 
   return ResultCode::OK;
@@ -2142,7 +2162,7 @@ inline Result Feed::write_agencies(const std::string & gtfs_path) const
 
 inline const Agencies & Feed::get_agencies() const { return agencies; }
 
-inline std::optional<Agency> Feed::get_agency(const Id & agency_id) const
+inline boost::optional<Agency> Feed::get_agency(const Id & agency_id) const
 {
   // agency id is required when the dataset contains data for multiple agencies,
   // otherwise it is optional:
@@ -2154,7 +2174,7 @@ inline std::optional<Agency> Feed::get_agency(const Id & agency_id) const
                    [&agency_id](const Agency & agency) { return agency.agency_id == agency_id; });
 
   if (it == agencies.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2175,13 +2195,13 @@ inline Result Feed::write_stops(const std::string & gtfs_path) const
 
 inline const Stops & Feed::get_stops() const { return stops; }
 
-inline std::optional<Stop> Feed::get_stop(const Id & stop_id) const
+inline boost::optional<Stop> Feed::get_stop(const Id & stop_id) const
 {
   const auto it = std::find_if(stops.begin(), stops.end(),
                                [&stop_id](const Stop & stop) { return stop.stop_id == stop_id; });
 
   if (it == stops.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2202,14 +2222,14 @@ inline Result Feed::write_routes(const std::string & gtfs_path) const
 
 inline const Routes & Feed::get_routes() const { return routes; }
 
-inline std::optional<Route> Feed::get_route(const Id & route_id) const
+inline boost::optional<Route> Feed::get_route(const Id & route_id) const
 {
   const auto it = std::find_if(routes.begin(), routes.end(), [&route_id](const Route & route) {
     return route.route_id == route_id;
   });
 
   if (it == routes.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2230,13 +2250,13 @@ inline Result Feed::write_trips(const std::string & gtfs_path) const
 
 inline const Trips & Feed::get_trips() const { return trips; }
 
-inline std::optional<Trip> Feed::get_trip(const Id & trip_id) const
+inline boost::optional<Trip> Feed::get_trip(const Id & trip_id) const
 {
   const auto it = std::find_if(trips.begin(), trips.end(),
                                [&trip_id](const Trip & trip) { return trip.trip_id == trip_id; });
 
   if (it == trips.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2301,7 +2321,7 @@ inline Result Feed::write_calendar(const std::string & gtfs_path) const
 
 inline const Calendar & Feed::get_calendar() const { return calendar; }
 
-inline std::optional<CalendarItem> Feed::get_calendar(const Id & service_id) const
+inline boost::optional<CalendarItem> Feed::get_calendar(const Id & service_id) const
 {
   const auto it = std::find_if(calendar.begin(), calendar.end(),
                                [&service_id](const CalendarItem & calendar_item) {
@@ -2309,7 +2329,7 @@ inline std::optional<CalendarItem> Feed::get_calendar(const Id & service_id) con
                                });
 
   if (it == calendar.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2490,7 +2510,7 @@ inline Result Feed::write_transfers(const std::string & gtfs_path) const
 
 inline const Transfers & Feed::get_transfers() const { return transfers; }
 
-inline std::optional<Transfer> Feed::get_transfer(const Id & from_stop_id,
+inline boost::optional<Transfer> Feed::get_transfer(const Id & from_stop_id,
                                                   const Id & to_stop_id) const
 {
   const auto it = std::find_if(
@@ -2499,7 +2519,7 @@ inline std::optional<Transfer> Feed::get_transfer(const Id & from_stop_id,
       });
 
   if (it == transfers.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }
@@ -2558,14 +2578,14 @@ inline Result Feed::write_levels(const std::string & gtfs_path) const
 
 inline const Levels & Feed::get_levels() const { return levels; }
 
-inline std::optional<Level> Feed::get_level(const Id & level_id) const
+inline boost::optional<Level> Feed::get_level(const Id & level_id) const
 {
   const auto it = std::find_if(levels.begin(), levels.end(), [&level_id](const Level & level) {
     return level.level_id == level_id;
   });
 
   if (it == levels.end())
-    return std::nullopt;
+    return boost::none;
 
   return *it;
 }

tests/CMakeLists.txt

@@ -5,6 +5,6 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR=" ${CMAKE_CURRENT_BINARY_DIR})
 foreach(TEST_SOURCE ${TESTS})
     string(REPLACE ".cpp" "" TEST_TARGET "${TEST_SOURCE}")
     add_executable(${TEST_TARGET} ${TEST_SOURCE})
-    target_compile_features(${TEST_TARGET} PRIVATE cxx_std_17)
+    target_compile_features(${TEST_TARGET} PRIVATE cxx_std_14)
     add_test("${TEST_TARGET}" "${TEST_TARGET}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} --verbose)
 endforeach()

tests/unit_tests.cpp

@@ -230,10 +230,11 @@ TEST_CASE("Empty container before parsing")
   Feed feed("data/non_existing_dir");
   REQUIRE(feed.get_agencies().empty());
   auto agency = feed.get_agency("agency_10");
-  CHECK(!agency);
+  const bool no_agency = agency == boost::none;
+  CHECK_EQ(no_agency, true);
 }
 
-TEST_CASE("Non existend directory")
+TEST_CASE("Non existing directory")
 {
   Feed feed("data/non_existing_dir");
   REQUIRE_EQ(feed.read_transfers(), ResultCode::ERROR_FILE_ABSENT);
@@ -243,7 +244,8 @@ TEST_CASE("Non existend directory")
 TEST_CASE("Transfers")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_transfers(), ResultCode::OK);
+
+  REQUIRE_EQ(feed.read_transfers().code, ResultCode::OK);
   const auto & transfers = feed.get_transfers();
   CHECK_EQ(transfers.size(), 4);
 
@@ -253,7 +255,8 @@ TEST_CASE("Transfers")
   CHECK_EQ(transfers[0].min_transfer_time, 70);
 
   const auto & transfer = feed.get_transfer("314", "11");
-  REQUIRE(transfer);
+  const bool transfer_exists = transfer != boost::none;
+  REQUIRE_EQ(transfer_exists, true);
   CHECK_EQ(transfer.value().transfer_type, TransferType::Timed);
   CHECK_EQ(transfer.value().min_transfer_time, 0);
 }
@@ -261,12 +264,14 @@ TEST_CASE("Transfers")
 TEST_CASE("Calendar")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_calendar(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_calendar().code, ResultCode::OK);
   const auto & calendar = feed.get_calendar();
   REQUIRE_EQ(calendar.size(), 2);
 
   const auto & calendar_record = feed.get_calendar("WE");
-  REQUIRE(calendar_record);
+
+  const bool calendar_exists = calendar_record != boost::none;
+  REQUIRE_EQ(calendar_exists, true);
 
   CHECK_EQ(calendar_record->start_date, Date(2007, 01, 01));
   CHECK_EQ(calendar_record->end_date, Date(2010, 12, 31));
@@ -283,7 +288,7 @@ TEST_CASE("Calendar")
 TEST_CASE("Calendar dates")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_calendar_dates(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_calendar_dates().code, ResultCode::OK);
   const auto & calendar_dates = feed.get_calendar_dates();
   REQUIRE_EQ(calendar_dates.size(), 1);
 
@@ -297,7 +302,7 @@ TEST_CASE("Calendar dates")
 TEST_CASE("Read GTFS feed")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_feed(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_feed().code, ResultCode::OK);
 
   CHECK_EQ(feed.get_agencies().size(), 1);
   CHECK_EQ(feed.get_routes().size(), 5);
@@ -321,7 +326,7 @@ TEST_CASE("Read GTFS feed")
 TEST_CASE("Agency")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_agencies(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_agencies().code, ResultCode::OK);
 
   const auto & agencies = feed.get_agencies();
   REQUIRE_EQ(agencies.size(), 1);
@@ -332,7 +337,8 @@ TEST_CASE("Agency")
   CHECK_EQ(agencies[0].agency_timezone, "America/Los_Angeles");
 
   const auto agency = feed.get_agency("DTA");
-  CHECK(agency);
+  const bool agency_exists = agency != boost::none;
+  CHECK_EQ(agency_exists, true);
 
   REQUIRE_EQ(feed.write_agencies("data/output_feed"), ResultCode::OK);
   Feed feed_copy("data/output_feed");
@@ -343,7 +349,7 @@ TEST_CASE("Agency")
 TEST_CASE("Routes")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_routes(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_routes().code, ResultCode::OK);
 
   const auto & routes = feed.get_routes();
   REQUIRE_EQ(routes.size(), 5);
@@ -357,13 +363,14 @@ TEST_CASE("Routes")
   CHECK(routes[0].route_desc.empty());
 
   const auto & route = feed.get_route("AB");
-  CHECK(route);
+  const bool route_exists = route != boost::none;
+  CHECK_EQ(route_exists, true);
 }
 
 TEST_CASE("Trips")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_trips(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_trips().code, ResultCode::OK);
 
   const auto & trips = feed.get_trips();
   REQUIRE_EQ(trips.size(), 11);
@@ -377,14 +384,15 @@ TEST_CASE("Trips")
   CHECK_EQ(trips[0].trip_id, "AB1");
 
   const auto & trip = feed.get_trip("AB1");
-  REQUIRE(trip);
+  const bool trip_exists = trip != boost::none;
+  REQUIRE_EQ(trip_exists, true);
   CHECK(trip.value().trip_short_name.empty());
 }
 
 TEST_CASE("Stops")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_stops(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_stops().code, ResultCode::OK);
 
   const auto & stops = feed.get_stops();
   REQUIRE_EQ(stops.size(), 9);
@@ -395,17 +403,18 @@ TEST_CASE("Stops")
   CHECK_EQ(stops[0].stop_id, "FUR_CREEK_RES");
   CHECK(stops[0].stop_desc.empty());
   CHECK_EQ(stops[0].stop_name, "Furnace Creek Resort (Demo)");
-  CHECK_EQ(stops[0].location_type, StopLocationType::GenericNode);
+  CHECK_EQ(stops[0].location_type, StopLocationType::StopOrPlatform);
   CHECK(stops[0].zone_id.empty());
 
   auto const & stop = feed.get_stop("FUR_CREEK_RES");
-  REQUIRE(stop);
+  const bool stop_exists = stop != boost::none;
+  REQUIRE_EQ(stop_exists, true);
 }
 
 TEST_CASE("StopTimes")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_stop_times(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_stop_times().code, ResultCode::OK);
 
   const auto & stop_times = feed.get_stop_times();
   REQUIRE_EQ(stop_times.size(), 28);
@@ -426,7 +435,7 @@ TEST_CASE("StopTimes")
 TEST_CASE("Shapes")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_shapes(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_shapes().code, ResultCode::OK);
 
   const auto & shapes = feed.get_shapes();
   REQUIRE_EQ(shapes.size(), 8);
@@ -443,7 +452,7 @@ TEST_CASE("Shapes")
 TEST_CASE("Calendar")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_calendar(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_calendar().code, ResultCode::OK);
 
   const auto & calendar = feed.get_calendar();
   REQUIRE_EQ(calendar.size(), 2);
@@ -454,13 +463,14 @@ TEST_CASE("Calendar")
   CHECK_EQ(calendar[0].sunday, CalendarAvailability::Available);
 
   const auto & calendar_for_service = feed.get_calendar("FULLW");
-  CHECK(calendar_for_service);
+  const bool calendar_exists = calendar_for_service != boost::none;
+  CHECK_EQ(calendar_exists, true);
 }
 
 TEST_CASE("Calendar dates")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_calendar_dates(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_calendar_dates().code, ResultCode::OK);
 
   const auto & calendar_dates = feed.get_calendar_dates();
   REQUIRE_EQ(calendar_dates.size(), 1);
@@ -475,7 +485,7 @@ TEST_CASE("Calendar dates")
 TEST_CASE("Frequencies")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_frequencies(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_frequencies().code, ResultCode::OK);
 
   const auto & frequencies = feed.get_frequencies();
   REQUIRE_EQ(frequencies.size(), 11);
@@ -491,7 +501,7 @@ TEST_CASE("Frequencies")
 TEST_CASE("Fare attributes")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_fare_attributes(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_fare_attributes().code, ResultCode::OK);
 
   const auto & attributes = feed.get_fare_attributes();
   REQUIRE_EQ(attributes.size(), 2);
@@ -510,7 +520,7 @@ TEST_CASE("Fare attributes")
 TEST_CASE("Fare rules")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_fare_rules(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_fare_rules().code, ResultCode::OK);
 
   const auto & fare_rules = feed.get_fare_rules();
   REQUIRE_EQ(fare_rules.size(), 4);
@@ -525,7 +535,7 @@ TEST_CASE("Fare rules")
 TEST_CASE("Levels")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_levels(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_levels().code, ResultCode::OK);
 
   const auto & levels = feed.get_levels();
   REQUIRE_EQ(levels.size(), 3);
@@ -533,7 +543,8 @@ TEST_CASE("Levels")
   CHECK_EQ(levels[0].level_index, -1.5);
 
   const auto & level = feed.get_level("U321L2");
-  REQUIRE(level);
+  const bool level_exists = level != boost::none;
+  REQUIRE_EQ(level_exists, true);
 
   CHECK_EQ(level.value().level_index, -2);
   CHECK_EQ(level.value().level_name, "Vestibul2");
@@ -542,7 +553,7 @@ TEST_CASE("Levels")
 TEST_CASE("Pathways")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_pathways(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_pathways().code, ResultCode::OK);
 
   const auto & pathways = feed.get_pathways();
   REQUIRE_EQ(pathways.size(), 3);
@@ -563,7 +574,7 @@ TEST_CASE("Pathways")
 TEST_CASE("Translations")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_translations(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_translations().code, ResultCode::OK);
 
   const auto & translations = feed.get_translations();
   REQUIRE_EQ(translations.size(), 1);
@@ -581,7 +592,7 @@ TEST_CASE("Translations")
 TEST_CASE("Attributions")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_attributions(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_attributions().code, ResultCode::OK);
 
   const auto & attributions = feed.get_attributions();
   REQUIRE_EQ(attributions.size(), 1);
@@ -598,7 +609,7 @@ TEST_CASE("Attributions")
 TEST_CASE("Feed info")
 {
   Feed feed("data/sample_feed");
-  REQUIRE_EQ(feed.read_feed_info(), ResultCode::OK);
+  REQUIRE_EQ(feed.read_feed_info().code, ResultCode::OK);
 
   const auto & info = feed.get_feed_info();
 
@@ -632,7 +643,7 @@ TEST_CASE("Agencies create & save")
   feed_for_writing.add_agency(agency1);
   feed_for_writing.add_agency(agency2);
 
-  REQUIRE_EQ(feed_for_writing.write_agencies("data/output_feed"), ResultCode::OK);
+  REQUIRE_EQ(feed_for_writing.write_agencies("data/output_feed").code, ResultCode::OK);
   Feed feed_for_testing("data/output_feed");
 
   REQUIRE_EQ(feed_for_testing.read_agencies(), ResultCode::OK);