Corrected priority of transliteration.

1 files changed, 26 insertions, 24 deletions

diff --git a/indexer/indexer_tests/feature_names_test.cpp b/indexer/indexer_tests/feature_names_test.cpp
index d11b245d98..a5af27cddb 100644
--- a/indexer/indexer_tests/feature_names_test.cpp
+++ b/indexer/indexer_tests/feature_names_test.cpp
@@ -21,12 +21,13 @@ UNIT_TEST(GetPrefferedNames)
 
   int8_t deviceLang = StrUtf8::GetLangIndex("ru");
   string primary, secondary;
+  bool const allowTranslit = false;
 
   {
     StrUtf8 src;
     src.AddString("fr", "fr name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "", ());
     TEST_EQUAL(secondary, "", ());
@@ -36,7 +37,7 @@ UNIT_TEST(GetPrefferedNames)
     StrUtf8 src;
     src.AddString("default", "default name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "default name", ());
     TEST_EQUAL(secondary, "", ());
@@ -47,7 +48,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("default", "default name");
     src.AddString("en", "en name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "en name", ());
     TEST_EQUAL(secondary, "default name", ());
@@ -59,7 +60,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("en", "en name");
     src.AddString("ru", "ru name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "ru name", ());
     TEST_EQUAL(secondary, "default name", ());
@@ -72,7 +73,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("ru", "same name");
     src.AddString("int_name", "int name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "same name", ());
     TEST_EQUAL(secondary, "", ());
@@ -86,7 +87,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("int_name", "int name");
     src.AddString("de", "de name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "ru name", ());
     TEST_EQUAL(secondary, "default name", ());
@@ -101,7 +102,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("de", "de name");
     src.AddString("ko", "ko name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "ru name", ());
     TEST_EQUAL(secondary, "default name", ());
@@ -115,7 +116,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("de", "de name");
     src.AddString("ko", "ko name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "int name", ());
     TEST_EQUAL(secondary, "default name", ());
@@ -128,7 +129,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("de", "de name");
     src.AddString("ko", "ko name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "int name", ());
     TEST_EQUAL(secondary, "", ());
@@ -140,7 +141,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("de", "de name");
     src.AddString("ko", "ko name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "en name", ());
     TEST_EQUAL(secondary, "de name", ());
@@ -151,7 +152,7 @@ UNIT_TEST(GetPrefferedNames)
     src.AddString("en", "en name");
     src.AddString("ko", "ko name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "en name", ());
     TEST_EQUAL(secondary, "ko name", ());
@@ -161,7 +162,7 @@ UNIT_TEST(GetPrefferedNames)
     StrUtf8 src;
     src.AddString("en", "en name");
 
-    feature::GetPreferredNames(regionData, src, deviceLang, primary, secondary);
+    feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
 
     TEST_EQUAL(primary, "en name", ());
     TEST_EQUAL(secondary, "", ());
@@ -174,13 +175,14 @@ UNIT_TEST(GetReadableName)
   regionData.SetLanguages({"de", "ko"});
 
   int8_t deviceLang = StrUtf8::GetLangIndex("ru");
+  bool const allowTranslit = false;
   string name;
 
   {
     StrUtf8 src;
     src.AddString("fr", "fr name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "", ());
   }
@@ -189,7 +191,7 @@ UNIT_TEST(GetReadableName)
     StrUtf8 src;
     src.AddString("ko", "ko name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "ko name", ());
   }
@@ -199,7 +201,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("ko", "ko name");
     src.AddString("de", "de name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "de name", ());
   }
@@ -210,7 +212,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("de", "de name");
     src.AddString("default", "default name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "default name", ());
   }
@@ -222,7 +224,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("default", "default name");
     src.AddString("en", "en name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "en name", ());
   }
@@ -235,7 +237,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("en", "en name");
     src.AddString("int_name", "int name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "int name", ());
   }
@@ -249,7 +251,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("int_name", "int name");
     src.AddString("ru", "ru name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "ru name", ());
   }
@@ -264,7 +266,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("en", "en name");
     src.AddString("int_name", "int name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "de name", ());
   }
@@ -276,7 +278,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("en", "en name");
     src.AddString("int_name", "int name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "default name", ());
   }
@@ -287,7 +289,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("en", "en name");
     src.AddString("int_name", "int name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "int name", ());
   }
@@ -297,7 +299,7 @@ UNIT_TEST(GetReadableName)
     src.AddString("ko", "ko name");
     src.AddString("en", "en name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "en name", ());
   }
@@ -306,7 +308,7 @@ UNIT_TEST(GetReadableName)
     StrUtf8 src;
     src.AddString("ko", "ko name");
 
-    feature::GetReadableName(regionData, src, deviceLang, name);
+    feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name);
 
     TEST_EQUAL(name, "ko name", ());
   }