From 90427d18137c7db18134457a17b91467450b7afe Mon Sep 17 00:00:00 2001 From: Maksim Andrianov Date: Tue, 29 Dec 2020 12:47:46 +0300 Subject: [PATCH] Uncommented tests. --- .../features_tests.cpp | 64 +++++++++---------- .../routing_benchmarks/car_routing_tests.cpp | 20 +++--- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/generator/generator_integration_tests/features_tests.cpp b/generator/generator_integration_tests/features_tests.cpp index c6e1051239..89b8c54f08 100644 --- a/generator/generator_integration_tests/features_tests.cpp +++ b/generator/generator_integration_tests/features_tests.cpp @@ -519,47 +519,47 @@ private: feature::GenerateInfo m_genInfo; }; -//UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCoasts) -//{ -// FeatureIntegrationTests::BuildCoasts(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCoasts) +{ + FeatureIntegrationTests::BuildCoasts(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, BuildWorldMultithread) -//{ -// FeatureIntegrationTests::BuildWorld(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, BuildWorldMultithread) +{ + FeatureIntegrationTests::BuildWorld(); +} UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCountriesMultithread) { FeatureIntegrationTests::BuildCountries(); } -//UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCountriesWithComplex) -//{ -// FeatureIntegrationTests::BuildCountriesWithComplex(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCountriesWithComplex) +{ + FeatureIntegrationTests::BuildCountriesWithComplex(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, CheckMixedTagsAndNodes) -//{ -// FeatureIntegrationTests::CheckMixedTagsAndNodes(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, CheckMixedTagsAndNodes) +{ + FeatureIntegrationTests::CheckMixedTagsAndNodes(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, CheckGeneratedDataMultithread) -//{ -// FeatureIntegrationTests::CheckGeneratedData(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, CheckGeneratedDataMultithread) +{ + FeatureIntegrationTests::CheckGeneratedData(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, BuildWorldOneThread) -//{ -// FeatureIntegrationTests::BuildWorldOneThread(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, BuildWorldOneThread) +{ + FeatureIntegrationTests::BuildWorldOneThread(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCountriesOneThread) -//{ -// FeatureIntegrationTests::BuildCountriesOneThread(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, BuildCountriesOneThread) +{ + FeatureIntegrationTests::BuildCountriesOneThread(); +} -//UNIT_CLASS_TEST(FeatureIntegrationTests, CheckGeneratedDataOneThread) -//{ -// FeatureIntegrationTests::CheckGeneratedDataOneThread(); -//} +UNIT_CLASS_TEST(FeatureIntegrationTests, CheckGeneratedDataOneThread) +{ + FeatureIntegrationTests::CheckGeneratedDataOneThread(); +} diff --git a/routing/routing_benchmarks/car_routing_tests.cpp b/routing/routing_benchmarks/car_routing_tests.cpp index 297ea28bf8..ec8cd4546b 100644 --- a/routing/routing_benchmarks/car_routing_tests.cpp +++ b/routing/routing_benchmarks/car_routing_tests.cpp @@ -60,15 +60,15 @@ UNIT_CLASS_TEST(CarTest, InCity) TestCarRouter(ms::LatLon(55.75785, 37.58267), ms::LatLon(55.76082, 37.58492), 30); } -//// Start and finish are located near a big road. -//UNIT_CLASS_TEST(CarTest, BigRoad) -//{ -// TestCarRouter(ms::LatLon(55.75826, 37.39476), ms::LatLon(55.7605, 37.39003), 30); -//} +// Start and finish are located near a big road. +UNIT_CLASS_TEST(CarTest, BigRoad) +{ + TestCarRouter(ms::LatLon(55.75826, 37.39476), ms::LatLon(55.7605, 37.39003), 30); +} -//// Start are located near an airport center. It's far from road network. -//UNIT_CLASS_TEST(CarTest, InAirport) -//{ -// TestCarRouter(ms::LatLon(55.97285, 37.41275), ms::LatLon(55.96396, 37.41922), 30); -//} +// Start are located near an airport center. It's far from road network. +UNIT_CLASS_TEST(CarTest, InAirport) +{ + TestCarRouter(ms::LatLon(55.97285, 37.41275), ms::LatLon(55.96396, 37.41922), 30); +} } // namespace