From 9aa56a7b794aa4f190fc63ffefd7c077219c1e50 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Mon, 14 Jan 2013 18:43:33 +0300 Subject: [PATCH] [api] Enabled & fixed tests --- map/map_tests/map_tests.pro | 1 + map/map_tests/mwm_url_tests.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 97f4085319..e9c06a3f1e 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -29,3 +29,4 @@ SOURCES += \ bookmarks_test.cpp \ geourl_test.cpp \ measurement_tests.cpp \ + mwm_url_tests.cpp \ diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index 8d37b6e277..197999c276 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -33,8 +33,8 @@ UNIT_TEST(MapApiLatLonLimits) { TEST(!ParsedMapApi(Uri("mapswithme://map?ll=-91,10")).IsValid(), ("Invalid latitude")); TEST(!ParsedMapApi(Uri("mapswithme://map?ll=523.55,10")).IsValid(), ("Invalid latitude")); - TEST(ParsedMapApi(Uri("mapswithme://map?ll=23.55,450")).IsValid(), ("But valid longtitude")); - TEST(ParsedMapApi(Uri("mapswithme://map?ll=23.55,-450")).IsValid(), ("But valid longtitude")); + TEST(!ParsedMapApi(Uri("mapswithme://map?ll=23.55,450")).IsValid(), ("Invalid longtitude")); + TEST(!ParsedMapApi(Uri("mapswithme://map?ll=23.55,-450")).IsValid(), ("Invalid longtitude")); } UNIT_TEST(MapApiPointNameBeforeLatLon) @@ -78,3 +78,11 @@ UNIT_TEST(MapApiInvalidPointLatLonButValidOtherParts) TEST_EQUAL(api.GetPoints()[0].m_lon, 2, ()); TEST_EQUAL(api.GetPoints()[0].m_title, "B", ()); } + +UNIT_TEST(MapApiPointNameUTF8) +{ + ParsedMapApi api(Uri("mapswithme://map?ll=1,2&n=%D0%9C%D0%B8%D0%BD%D1%81%D0%BA&u=someurl")); + TEST(api.IsValid(), ()); + TEST_EQUAL(api.GetPoints().size(), 1, ()); + TEST_EQUAL(api.GetPoints()[0].m_title, "\xd0\x9c\xd0\xb8\xd0\xbd\xd1\x81\xd0\xba", ()); +}