[Template Expressions] changing ${ leader to $i18n{

ui/base/template_expressions_unittest.cc

Index: ui/base/template_expressions_unittest.cc
diff --git a/ui/base/template_expressions_unittest.cc b/ui/base/template_expressions_unittest.cc
index b56a5e7424c25e80a4cfc10e4d853de564608a11..a52962f01b056e847dfecee2b74c86e6a13d084f 100644
--- a/ui/base/template_expressions_unittest.cc
+++ b/ui/base/template_expressions_unittest.cc
@@ -9,27 +9,28 @@
 namespace ui {
 
 TEST(TemplateExpressionsTest, ReplaceTemplateExpressionsPieces) {
-  std::map<base::StringPiece, std::string> substitutions;
+  ReplaceTemplateMap substitutions;
   substitutions["test"] = "word";
   substitutions["5"] = "number";
+  substitutions[""] = "blank";
 
-  EXPECT_EQ("${}", ReplaceTemplateExpressions("${}", substitutions));
+  EXPECT_EQ("blank", ReplaceTemplateExpressions("$i18n{}", substitutions));

[Dan Beam, 2016/01/20 22:34:38]

i still think this should never happen

[dschuyler, 2016/01/21 18:43:53]

I think that is reasonable - that it would/should never happen. 
At the moment the empty string is a valid string, so I want to test that case.
This is also undoing that other change where ${} was special and not translated.
Now $i18n{} is not special, it's just matching the empty string.


Acknowledged.

   EXPECT_EQ("", ReplaceTemplateExpressions("", substitutions));
-  EXPECT_EQ("word", ReplaceTemplateExpressions("${test}", substitutions));
-  EXPECT_EQ("number ", ReplaceTemplateExpressions("${5} ", substitutions));
-  EXPECT_EQ(
-      "multiple: word, number.",
-      ReplaceTemplateExpressions("multiple: ${test}, ${5}.", substitutions));
+  EXPECT_EQ("word", ReplaceTemplateExpressions("$i18n{test}", substitutions));
+  EXPECT_EQ("number ", ReplaceTemplateExpressions("$i18n{5} ", substitutions));
+  EXPECT_EQ("multiple: word, number.",
+            ReplaceTemplateExpressions("multiple: $i18n{test}, $i18n{5}.",
+                                       substitutions));
 }
 
 TEST(TemplateExpressionsTest,
      ReplaceTemplateExpressionsConsecutiveDollarSignsPieces) {
-  std::map<base::StringPiece, std::string> substitutions;
+  ReplaceTemplateMap substitutions;
   substitutions["a"] = "x";
   EXPECT_EQ("$ $$ $$$", ReplaceTemplateExpressions("$ $$ $$$", substitutions));
-  EXPECT_EQ("$x", ReplaceTemplateExpressions("$${a}", substitutions));
-  EXPECT_EQ("$$x", ReplaceTemplateExpressions("$$${a}", substitutions));
-  EXPECT_EQ("$12", ReplaceTemplateExpressions("$12", substitutions));
+  EXPECT_EQ("$x", ReplaceTemplateExpressions("$$i18n{a}", substitutions));
+  EXPECT_EQ("$$x", ReplaceTemplateExpressions("$$$i18n{a}", substitutions));
+  EXPECT_EQ("$i18n12", ReplaceTemplateExpressions("$i18n12", substitutions));
 }
 
 }  // namespace ui