Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'routing/routing_tests/turns_sound_test.cpp')
-rw-r--r--routing/routing_tests/turns_sound_test.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp
index f362c9e5cf..b0f7519095 100644
--- a/routing/routing_tests/turns_sound_test.cpp
+++ b/routing/routing_tests/turns_sound_test.cpp
@@ -26,7 +26,7 @@ UNIT_TEST(TurnNotificationSettingsMetersTest)
25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
170 /* m_minDistToSayNotificationMeters */,
{100, 200, 300, 400, 500, 600, 700} /* soundedDistancesUnits */,
- ::settings::Metric /* lengthUnits */);
+ measurement_utils::Units::Metric /* lengthUnits */);
TEST(settings.IsValid(), ());
TEST(my::AlmostEqualAbs(
@@ -57,7 +57,7 @@ UNIT_TEST(TurnNotificationSettingsFeetTest)
25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
170 /* m_minDistToSayNotificationMeters */,
{200, 400, 600, 800, 1000, 1500, 2000} /* soundedDistancesUnits */,
- ::settings::Foot /* lengthUnits */);
+ measurement_utils::Units::Imperial /* lengthUnits */);
TEST(settings.IsValid(), ());
TEST(my::AlmostEqualAbs(
@@ -76,7 +76,7 @@ UNIT_TEST(TurnNotificationSettingsNotValidTest)
25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
170 /* m_minDistToSayNotificationMeters */,
{200, 400, 800, 600, 1000, 1500, 2000} /* soundedDistancesUnits */,
- ::settings::Foot /* lengthUnits */);
+ measurement_utils::Units::Imperial /* lengthUnits */);
TEST(!settings1.IsValid(), ());
Settings settings2(20 /* notificationTimeSeconds */, 5000 /* minNotificationDistanceUnits */,
@@ -84,7 +84,7 @@ UNIT_TEST(TurnNotificationSettingsNotValidTest)
25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
170 /* m_minDistToSayNotificationMeters */,
{200, 400, 600, 800, 1000, 1500, 2000} /* soundedDistancesUnits */,
- ::settings::Metric /* lengthUnits */);
+ measurement_utils::Units::Metric /* lengthUnits */);
TEST(!settings2.IsValid(), ());
}
@@ -94,7 +94,7 @@ UNIT_TEST(TurnsSoundMetersTest)
100 /* maxStartBeforeMeters */,
100 /* minDistToSayNotificationMeters */);
notificationManager.Enable(true);
- notificationManager.SetLengthUnits(::settings::Metric);
+ notificationManager.SetLengthUnits(measurement_utils::Units::Metric);
string const engShortJson =
"\
{\
@@ -192,7 +192,7 @@ UNIT_TEST(TurnsSoundMetersTwoTurnsTest)
100 /* maxStartBeforeMeters */,
100 /* minDistToSayNotificationMeters */);
notificationManager.Enable(true);
- notificationManager.SetLengthUnits(::settings::Metric);
+ notificationManager.SetLengthUnits(measurement_utils::Units::Metric);
string const engShortJson =
"\
{\
@@ -269,7 +269,7 @@ UNIT_TEST(TurnsSoundFeetTest)
100 /* maxStartBeforeMeters */,
100 /* minDistToSayNotificationMeters */);
notificationManager.Enable(true);
- notificationManager.SetLengthUnits(::settings::Foot);
+ notificationManager.SetLengthUnits(measurement_utils::Units::Imperial);
string const engShortJson =
"\
{\
@@ -352,7 +352,7 @@ UNIT_TEST(TurnsSoundComposedTurnTest)
100 /* maxStartBeforeMeters */,
100 /* minDistToSayNotificationMeters */);
notificationManager.Enable(true);
- notificationManager.SetLengthUnits(::settings::Metric);
+ notificationManager.SetLengthUnits(measurement_utils::Units::Metric);
string const engShortJson =
"\
{\
@@ -429,7 +429,7 @@ UNIT_TEST(TurnsSoundRoundaboutTurnTest)
100 /* maxStartBeforeMeters */,
100 /* minDistToSayNotificationMeters */);
notificationManager.Enable(true);
- notificationManager.SetLengthUnits(::settings::Metric);
+ notificationManager.SetLengthUnits(measurement_utils::Units::Metric);
string const engShortJson =
"\
{\