From e9296e1f6ae6f46d54ee790b1369762a4e99732e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Fri, 27 Mar 2020 11:42:52 +0300
Subject: [PATCH] [core] Added whitespace in formatted string for altitude and
 speed value and fixed tests for it

---
 platform/measurement_utils.cpp                |  8 +++----
 platform/platform_tests/measurement_tests.cpp | 24 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp
index 9be02c7d2d..492034b2b9 100644
--- a/platform/measurement_utils.cpp
+++ b/platform/measurement_utils.cpp
@@ -196,8 +196,8 @@ string FormatAltitude(double altitudeInMeters)
   /// @todo Put string units resources.
   switch (units)
   {
-  case Units::Imperial: ss << MetersToFeet(altitudeInMeters) << "ft"; break;
-  case Units::Metric: ss << altitudeInMeters << "m"; break;
+  case Units::Imperial: ss << MetersToFeet(altitudeInMeters) << " ft"; break;
+  case Units::Metric: ss << altitudeInMeters << " m"; break;
   }
   return ss.str();
 }
@@ -242,8 +242,8 @@ string FormatSpeedUnits(Units units)
 {
   switch (units)
   {
-  case Units::Imperial: return "mph";
-  case Units::Metric: return "km/h";
+  case Units::Imperial: return " mph";
+  case Units::Metric: return " km/h";
   }
   UNREACHABLE();
 }
diff --git a/platform/platform_tests/measurement_tests.cpp b/platform/platform_tests/measurement_tests.cpp
index 402d42e624..9e4e705514 100644
--- a/platform/platform_tests/measurement_tests.cpp
+++ b/platform/platform_tests/measurement_tests.cpp
@@ -95,33 +95,33 @@ UNIT_TEST(FormatAltitude)
 {
   ScopedSettings guard;
   settings::Set(settings::kMeasurementUnits, Units::Imperial);
-  TEST_EQUAL(FormatAltitude(10000), "32808ft", ());
+  TEST_EQUAL(FormatAltitude(10000), "32808 ft", ());
   settings::Set(settings::kMeasurementUnits, Units::Metric);
-  TEST_EQUAL(FormatAltitude(5), "5m", ());
+  TEST_EQUAL(FormatAltitude(5), "5 m", ());
 }
 
 UNIT_TEST(FormatSpeedWithDeviceUnits)
 {
   {
     ScopedSettings guard(Units::Metric);
-    TEST_EQUAL(FormatSpeedWithDeviceUnits(10), "36km/h", ());
-    TEST_EQUAL(FormatSpeedWithDeviceUnits(1), "3.6km/h", ());
+    TEST_EQUAL(FormatSpeedWithDeviceUnits(10), "36 km/h", ());
+    TEST_EQUAL(FormatSpeedWithDeviceUnits(1), "3.6 km/h", ());
   }
 
   {
     ScopedSettings guard(Units::Imperial);
-    TEST_EQUAL(FormatSpeedWithDeviceUnits(10), "22mph", ());
-    TEST_EQUAL(FormatSpeedWithDeviceUnits(1), "2.2mph", ());
+    TEST_EQUAL(FormatSpeedWithDeviceUnits(10), "22 mph", ());
+    TEST_EQUAL(FormatSpeedWithDeviceUnits(1), "2.2 mph", ());
   }
 }
 
 UNIT_TEST(FormatSpeedWithUnits)
 {
-  TEST_EQUAL(FormatSpeedWithUnits(10, Units::Metric), "36km/h", ());
-  TEST_EQUAL(FormatSpeedWithUnits(1, Units::Metric), "3.6km/h", ());
+  TEST_EQUAL(FormatSpeedWithUnits(10, Units::Metric), "36 km/h", ());
+  TEST_EQUAL(FormatSpeedWithUnits(1, Units::Metric), "3.6 km/h", ());
 
-  TEST_EQUAL(FormatSpeedWithUnits(10, Units::Imperial), "22mph", ());
-  TEST_EQUAL(FormatSpeedWithUnits(1, Units::Imperial), "2.2mph", ());
+  TEST_EQUAL(FormatSpeedWithUnits(10, Units::Imperial), "22 mph", ());
+  TEST_EQUAL(FormatSpeedWithUnits(1, Units::Imperial), "2.2 mph", ());
 }
 
 UNIT_TEST(FormatSpeed)
@@ -135,8 +135,8 @@ UNIT_TEST(FormatSpeed)
 
 UNIT_TEST(FormatSpeedUnits)
 {
-  TEST_EQUAL(FormatSpeedUnits(Units::Metric), "km/h", ());
-  TEST_EQUAL(FormatSpeedUnits(Units::Imperial), "mph", ());
+  TEST_EQUAL(FormatSpeedUnits(Units::Metric), " km/h", ());
+  TEST_EQUAL(FormatSpeedUnits(Units::Imperial), " mph", ());
 }
 
 UNIT_TEST(OSMDistanceToMetersString)