diff options
author | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
commit | fc45e9cbf6ea74412acd8bb55098cfd15493292b (patch) | |
tree | 27c697035feb1d5d7e6de07e9834d49271b5b1ee /indra/llcommon/tests | |
parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
parent | 1836dd12c9b45e90aeab095dd4cc3e9cdcaf2190 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/tests')
-rw-r--r-- | indra/llcommon/tests/llstring_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp index 304e91ed92..6a1cbf652a 100644 --- a/indra/llcommon/tests/llstring_test.cpp +++ b/indra/llcommon/tests/llstring_test.cpp @@ -624,6 +624,14 @@ namespace tut subcount = LLStringUtil::format(s, fmt_map); ensure_equals("LLStringUtil::format: Assorted Test2 result", s, "?Am I not a long string?short[A]bbbaaaba[A]"); ensure_equals("LLStringUtil::format: Assorted Test2 result count", 9, subcount); + + // Test on nested brackets + std::string srcs6 = "[[TRICK1]][[A]][[B]][[AAA]][[BBB]][[TRICK2]][[KEYLONGER]][[KEYSHORTER]]?[[DELETE]]"; + s = srcs6; + subcount = LLStringUtil::format(s, fmt_map); + ensure_equals("LLStringUtil::format: Assorted Test2 result", s, "[[A]][a][b][aaa][bbb][[A]][short][Am I not a long string?]?[]"); + ensure_equals("LLStringUtil::format: Assorted Test2 result count", 9, subcount); + // Test an assorted substitution std::string srcs8 = "foo[DELETE]bar?"; |