From 91b9d32760e8bf4c799dc79412137c8d42198ea9 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 13 Oct 2015 18:33:41 +0300 Subject: [PATCH] Fixing unit tests. --- .../platform_tests/get_text_by_id_tests.cpp | 90 +++++++++---------- routing/routing_tests/turns_sound_test.cpp | 10 +-- .../routing_tests/turns_tts_text_tests.cpp | 4 +- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/platform/platform_tests/get_text_by_id_tests.cpp b/platform/platform_tests/get_text_by_id_tests.cpp index 32f5fd1b45..b1eff8f3a9 100644 --- a/platform/platform_tests/get_text_by_id_tests.cpp +++ b/platform/platform_tests/get_text_by_id_tests.cpp @@ -15,16 +15,16 @@ UNIT_TEST(GetTextByIdEnglishTest) \"in_1_mile\":\"In one mile.\"\ }"; - platform::GetTextById getEnglish(shortJson); - TEST_EQUAL(getEnglish("make_a_slight_right_turn"), "Make a slight right turn.", ()); - TEST_EQUAL(getEnglish("in_900_meters"), "In nine hundred meters.", ()); - TEST_EQUAL(getEnglish("then"), "Then.", ()); - TEST_EQUAL(getEnglish("in_1_mile"), "In one mile.", ()); + unique_ptr getEnglish = platform::ForTestingGetTextByIdFactory(shortJson, "en"); + TEST_EQUAL((*getEnglish)("make_a_slight_right_turn"), "Make a slight right turn.", ()); + TEST_EQUAL((*getEnglish)("in_900_meters"), "In nine hundred meters.", ()); + TEST_EQUAL((*getEnglish)("then"), "Then.", ()); + TEST_EQUAL((*getEnglish)("in_1_mile"), "In one mile.", ()); - TEST_EQUAL(getEnglish("some_nonexistent_key"), "", ()); - TEST_EQUAL(getEnglish("some_nonexistent_key"), "", ()); - TEST_EQUAL(getEnglish(""), "", ()); - TEST_EQUAL(getEnglish(" "), "", ()); + TEST_EQUAL((*getEnglish)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getEnglish)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getEnglish)(""), "", ()); + TEST_EQUAL((*getEnglish)(" "), "", ()); } UNIT_TEST(GetTextByIdRussianTest) @@ -38,16 +38,16 @@ UNIT_TEST(GetTextByIdRussianTest) \"in_1_mile\":\"Через одну милю.\"\ }"; - platform::GetTextById getRussian(shortJson); - TEST_EQUAL(getRussian("in_800_meters"), "Через восемьсот метров.", ()); - TEST_EQUAL(getRussian("make_a_slight_right_turn"), "Плавный поворот направо.", ()); - TEST_EQUAL(getRussian("take_the_6th_exit"), "Шестой поворот с кольца.", ()); - TEST_EQUAL(getRussian("in_1_mile"), "Через одну милю.", ()); + unique_ptr getRussian = platform::ForTestingGetTextByIdFactory(shortJson, "ru"); + TEST_EQUAL((*getRussian)("in_800_meters"), "Через восемьсот метров.", ()); + TEST_EQUAL((*getRussian)("make_a_slight_right_turn"), "Плавный поворот направо.", ()); + TEST_EQUAL((*getRussian)("take_the_6th_exit"), "Шестой поворот с кольца.", ()); + TEST_EQUAL((*getRussian)("in_1_mile"), "Через одну милю.", ()); - TEST_EQUAL(getRussian("some_nonexistent_key"), "", ()); - TEST_EQUAL(getRussian("some_nonexistent_key"), "", ()); - TEST_EQUAL(getRussian(""), "", ()); - TEST_EQUAL(getRussian(" "), "", ()); + TEST_EQUAL((*getRussian)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getRussian)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getRussian)(""), "", ()); + TEST_EQUAL((*getRussian)(" "), "", ()); } UNIT_TEST(GetTextByIdKoreanTest) @@ -61,16 +61,16 @@ UNIT_TEST(GetTextByIdKoreanTest) \"in_5000_feet\":\"5000피트 앞\"\ }"; - platform::GetTextById getKorean(shortJson); - TEST_EQUAL(getKorean("in_700_meters"), "700 미터 앞", ()); - TEST_EQUAL(getKorean("make_a_right_turn"), "우회전입니다.", ()); - TEST_EQUAL(getKorean("take_the_5th_exit"), "다섯 번째 출구입니다.", ()); - TEST_EQUAL(getKorean("in_5000_feet"), "5000피트 앞", ()); + unique_ptr getKorean = platform::ForTestingGetTextByIdFactory(shortJson, "ko"); + TEST_EQUAL((*getKorean)("in_700_meters"), "700 미터 앞", ()); + TEST_EQUAL((*getKorean)("make_a_right_turn"), "우회전입니다.", ()); + TEST_EQUAL((*getKorean)("take_the_5th_exit"), "다섯 번째 출구입니다.", ()); + TEST_EQUAL((*getKorean)("in_5000_feet"), "5000피트 앞", ()); - TEST_EQUAL(getKorean("some_nonexistent_key"), "", ()); - TEST_EQUAL(getKorean("some_nonexistent_key"), "", ()); - TEST_EQUAL(getKorean(""), "", ()); - TEST_EQUAL(getKorean(" "), "", ()); + TEST_EQUAL((*getKorean)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getKorean)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getKorean)(""), "", ()); + TEST_EQUAL((*getKorean)(" "), "", ()); } UNIT_TEST(GetTextByIdArabicTest) @@ -84,16 +84,16 @@ UNIT_TEST(GetTextByIdArabicTest) \"in_4000_feet\":\"بعد 4000 قدم\"\ }"; - platform::GetTextById getArabic(shortJson); - TEST_EQUAL(getArabic("in_1_kilometer"), "بعد كيلو متر واحدٍ", ()); - TEST_EQUAL(getArabic("leave_the_roundabout"), "اخرج من الطريق الدوار", ()); - TEST_EQUAL(getArabic("take_the_3rd_exit"), "اسلك المخرج الثالث", ()); - TEST_EQUAL(getArabic("in_4000_feet"), "بعد 4000 قدم", ()); + unique_ptr getArabic = platform::ForTestingGetTextByIdFactory(shortJson, "ar"); + TEST_EQUAL((*getArabic)("in_1_kilometer"), "بعد كيلو متر واحدٍ", ()); + TEST_EQUAL((*getArabic)("leave_the_roundabout"), "اخرج من الطريق الدوار", ()); + TEST_EQUAL((*getArabic)("take_the_3rd_exit"), "اسلك المخرج الثالث", ()); + TEST_EQUAL((*getArabic)("in_4000_feet"), "بعد 4000 قدم", ()); - TEST_EQUAL(getArabic("some_nonexistent_key"), "", ()); - TEST_EQUAL(getArabic("some_nonexistent_key"), "", ()); - TEST_EQUAL(getArabic(""), "", ()); - TEST_EQUAL(getArabic(" "), "", ()); + TEST_EQUAL((*getArabic)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getArabic)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getArabic)(""), "", ()); + TEST_EQUAL((*getArabic)(" "), "", ()); } UNIT_TEST(GetTextByIdFrenchTest) @@ -107,14 +107,14 @@ UNIT_TEST(GetTextByIdFrenchTest) \"in_3500_feet\":\"Dans trois mille cinq cents pieds.\"\ }"; - platform::GetTextById getFrench(shortJson); - TEST_EQUAL(getFrench("in_1_5_kilometers"), "Dans un virgule cinq kilomètre.", ()); - TEST_EQUAL(getFrench("enter_the_roundabout"), "Prenez le rond-point.", ()); - TEST_EQUAL(getFrench("take_the_2nd_exit"), "Prenez la deuxième sortie.", ()); - TEST_EQUAL(getFrench("in_3500_feet"), "Dans trois mille cinq cents pieds.", ()); + unique_ptr getFrench = platform::ForTestingGetTextByIdFactory(shortJson, "fr"); + TEST_EQUAL((*getFrench)("in_1_5_kilometers"), "Dans un virgule cinq kilomètre.", ()); + TEST_EQUAL((*getFrench)("enter_the_roundabout"), "Prenez le rond-point.", ()); + TEST_EQUAL((*getFrench)("take_the_2nd_exit"), "Prenez la deuxième sortie.", ()); + TEST_EQUAL((*getFrench)("in_3500_feet"), "Dans trois mille cinq cents pieds.", ()); - TEST_EQUAL(getFrench("some_nonexistent_key"), "", ()); - TEST_EQUAL(getFrench("some_nonexistent_key"), "", ()); - TEST_EQUAL(getFrench(""), "", ()); - TEST_EQUAL(getFrench(" "), "", ()); + TEST_EQUAL((*getFrench)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getFrench)("some_nonexistent_key"), "", ()); + TEST_EQUAL((*getFrench)(""), "", ()); + TEST_EQUAL((*getFrench)(" "), "", ()); } diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp index e8b6d9843d..9d3eee53eb 100644 --- a/routing/routing_tests/turns_sound_test.cpp +++ b/routing/routing_tests/turns_sound_test.cpp @@ -98,7 +98,7 @@ UNIT_TEST(TurnsSoundMetersTest) \"in_600_meters\":\"In 600 meters.\",\ \"make_a_right_turn\":\"Make a right turn.\"\ }"; - turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson); + turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); turnSound.m_settings.ForTestingSetNotificationTimeSecond(20); turnSound.Reset(); @@ -185,7 +185,7 @@ UNIT_TEST(TurnsSoundMetersTwoTurnsTest) \"make_a_sharp_right_turn\":\"Make a sharp right turn.\",\ \"enter_the_roundabout\":\"Enter the roundabout.\"\ }"; - turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson); + turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); turnSound.m_settings.ForTestingSetNotificationTimeSecond(20); turnSound.Reset(); @@ -257,7 +257,7 @@ UNIT_TEST(TurnsSoundFeetTest) \"in_2000_feet\":\"In 2000 feet.\",\ \"enter_the_roundabout\":\"Enter the roundabout.\"\ }"; - turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson); + turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); turnSound.m_settings.ForTestingSetNotificationTimeSecond(20); turnSound.Reset(); @@ -341,7 +341,7 @@ UNIT_TEST(TurnsSoundComposedTurnTest) \"then\":\"Then.\",\ \"you_have_reached_the_destination\":\"You have reached the destination.\"\ }"; - turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson); + turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); turnSound.m_settings.ForTestingSetNotificationTimeSecond(30); turnSound.Reset(); @@ -412,7 +412,7 @@ UNIT_TEST(TurnsSoundRoundaboutTurnTest) \"in_600_meters\":\"In 600 meters.\",\ \"then\":\"Then.\"\ }"; - turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson); + turnSound.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); turnSound.m_settings.ForTestingSetNotificationTimeSecond(30); turnSound.Reset(); diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/routing/routing_tests/turns_tts_text_tests.cpp index b566df4932..e1661a43dc 100644 --- a/routing/routing_tests/turns_tts_text_tests.cpp +++ b/routing/routing_tests/turns_tts_text_tests.cpp @@ -85,13 +85,13 @@ UNIT_TEST(GetTtsTextTest) ::Settings::Metric); Notification const notifiation4(0, 0, true, TurnDirection::TurnLeft, ::Settings::Metric); - getTtsText.ForTestingSetLocaleWithJson(engShortJson); + getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en"); TEST_EQUAL(getTtsText(notifiation1), "In 500 meters. Make a right turn.", ()); TEST_EQUAL(getTtsText(notifiation2), "In 300 meters. Make a left turn.", ()); TEST_EQUAL(getTtsText(notifiation3), "You have reached the destination.", ()); TEST_EQUAL(getTtsText(notifiation4), "Then. Make a left turn.", ()); - getTtsText.ForTestingSetLocaleWithJson(rusShortJson); + getTtsText.ForTestingSetLocaleWithJson(rusShortJson, "ru"); TEST_EQUAL(getTtsText(notifiation1), "Через 500 метров. Поворот направо.", ()); TEST_EQUAL(getTtsText(notifiation2), "Через 300 метров. Поворот налево.", ()); TEST_EQUAL(getTtsText(notifiation3), "Вы достигли конца маршрута.", ());