diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-13 15:03:19 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-19 14:54:38 -0700 |
| commit | 2e93a9ddcf1f97188250335d991fbd7a2cc283af (patch) | |
| tree | 86289e08e361a90e38c35db12501ea9b056d832d /test | |
| parent | 89b075f592271bc11d58ebb7f854c453e81e3cf1 (diff) | |
| download | qtlocation-mapboxgl-2e93a9ddcf1f97188250335d991fbd7a2cc283af.tar.gz | |
[core] For string-valued properties, do coercion rather than assertion
Diffstat (limited to 'test')
| -rw-r--r-- | test/style/conversion/function.test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp index e63ad722cf..8ebdcdb9bb 100644 --- a/test/style/conversion/function.test.cpp +++ b/test/style/conversion/function.test.cpp @@ -86,9 +86,9 @@ TEST(StyleConversion, TokenStrings) { using namespace mbgl::style::expression::dsl; ASSERT_EQ(*convertTokenStringToExpression("{token}"), *toString(get(literal("token")))); - ASSERT_EQ(*convertTokenStringToExpression("token {token}"), *concat(vec(literal("token "), toString(get(literal("token")))))); - ASSERT_EQ(*convertTokenStringToExpression("{token} token"), *concat(vec(toString(get(literal("token"))), literal(" token")))); - ASSERT_EQ(*convertTokenStringToExpression("{token} {token}"), *concat(vec(toString(get(literal("token"))), literal(" "), toString(get(literal("token")))))); - ASSERT_EQ(*convertTokenStringToExpression("{token} {token"), *concat(vec(toString(get(literal("token"))), literal(" "), literal("{token")))); - ASSERT_EQ(*convertTokenStringToExpression("{token {token}"), *concat(vec(literal("{token "), toString(get(literal("token")))))); + ASSERT_EQ(*convertTokenStringToExpression("token {token}"), *concat(vec(literal("token "), get(literal("token"))))); + ASSERT_EQ(*convertTokenStringToExpression("{token} token"), *concat(vec(get(literal("token")), literal(" token")))); + ASSERT_EQ(*convertTokenStringToExpression("{token} {token}"), *concat(vec(get(literal("token")), literal(" "), get(literal("token"))))); + ASSERT_EQ(*convertTokenStringToExpression("{token} {token"), *concat(vec(get(literal("token")), literal(" "), literal("{token")))); + ASSERT_EQ(*convertTokenStringToExpression("{token {token}"), *concat(vec(literal("{token "), get(literal("token"))))); } |