fallback to CH, when coreCH used

unit_tests/library/algorithm.cpp

@@ -15,14 +15,6 @@ BOOST_AUTO_TEST_CASE(test_incompatible_with_mld)
         osrm::exception);
 }
 
-BOOST_AUTO_TEST_CASE(test_incompatible_with_corech)
-{
-    // Note - CH-only data can't be used with the CoreCH algorithm
-    BOOST_CHECK_THROW(
-        getOSRM(OSRM_TEST_DATA_DIR "/ch/monaco.osrm", osrm::EngineConfig::Algorithm::CoreCH),
-        osrm::exception);
-}
-
 BOOST_AUTO_TEST_CASE(test_incompatible_with_ch)
 {
     // Can't use the CH algorithm with MLD data

unit_tests/library/tile.cpp

@@ -300,14 +300,6 @@ BOOST_AUTO_TEST_CASE(test_tile_ch)
     validate_tile(osrm);
 }
 
-BOOST_AUTO_TEST_CASE(test_tile_corech)
-{
-    using namespace osrm;
-    auto osrm =
-        getOSRM(OSRM_TEST_DATA_DIR "/corech/monaco.osrm", osrm::EngineConfig::Algorithm::CoreCH);
-    validate_tile(osrm);
-}
-
 BOOST_AUTO_TEST_CASE(test_tile_mld)
 {
     using namespace osrm;
@@ -551,15 +543,6 @@ BOOST_AUTO_TEST_CASE(test_tile_turns_ch)
     test_tile_turns(osrm);
 }
 
-BOOST_AUTO_TEST_CASE(test_tile_turns_corech)
-{
-    using namespace osrm;
-    auto osrm =
-        getOSRM(OSRM_TEST_DATA_DIR "/corech/monaco.osrm", osrm::EngineConfig::Algorithm::CoreCH);
-
-    test_tile_turns(osrm);
-}
-
 BOOST_AUTO_TEST_CASE(test_tile_turns_mld)
 {
     using namespace osrm;

unit_tests/mocks/mock_datafacade.hpp

@@ -308,30 +308,11 @@ class MockAlgorithmDataFacade<engine::datafacade::CH>
     }
 };
 
-template <>
-class MockAlgorithmDataFacade<engine::datafacade::CoreCH>
-    : public engine::datafacade::AlgorithmDataFacade<engine::datafacade::CoreCH>
-{
-  private:
-    EdgeData foo;
-
-  public:
-    bool IsCoreNode(const NodeID /* id */) const override { return false; }
-};
-
 template <typename AlgorithmT>
 class MockDataFacade final : public MockBaseDataFacade, public MockAlgorithmDataFacade<AlgorithmT>
 {
 };
 
-template <>
-class MockDataFacade<engine::datafacade::CoreCH> final
-    : public MockBaseDataFacade,
-      public MockAlgorithmDataFacade<engine::datafacade::CH>,
-      public MockAlgorithmDataFacade<engine::datafacade::CoreCH>
-{
-};
-
 } // ns test
 } // ns osrm