diff options
| author | Jason Wray <friedbunny@users.noreply.github.com> | 2018-12-07 21:46:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-07 21:46:46 -0500 |
| commit | 7cdbe6664ac27d7734e50ea6659dbcf021f61916 (patch) | |
| tree | 712838bfb8a68f4c729a0e185a6b1cd8cc6e9d40 /platform/darwin/test/MGLExpressionTests.mm | |
| parent | 1b0365429de2175688f496db3b0ac5cdb1439fb6 (diff) | |
| download | qtlocation-mapboxgl-7cdbe6664ac27d7734e50ea6659dbcf021f61916.tar.gz | |
[ios, macos] Update for streets-v8 data and coalesced name fields in v11 styles
Diffstat (limited to 'platform/darwin/test/MGLExpressionTests.mm')
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index 7c853b56d8..f869275dd3 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -1072,11 +1072,20 @@ using namespace std::string_literals; } { NSExpression *original = [NSExpression expressionForKeyPath:@"name_en"]; - NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K, %K, %K})", - @"name_zh-Hans", @"name_zh-CN", @"name_zh", @"name"]; + NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K, %K, %K})", @"name_zh-Hans", @"name_zh-CN", @"name_zh", @"name"]; XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:[NSLocale localeWithLocaleIdentifier:@"zh-Hans"]], expected); } { + NSExpression *original = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_en", @"name"]; + NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce:({mgl_coalesce:({name_en, name}), mgl_coalesce:({name_en, name})})"]; + XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:nil], expected); + } + { + NSExpression *original = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_en", @"name"]; + NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce:({mgl_coalesce:({name_ja, name}), mgl_coalesce:({name_ja, name})})"]; + XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:[NSLocale localeWithLocaleIdentifier:@"ja-JP"]], expected); + } + { NSExpression *original = [NSExpression expressionForKeyPath:@"name_en"]; NSExpression *expected = [NSExpression expressionForKeyPath:@"name"]; XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:[NSLocale localeWithLocaleIdentifier:@"tlh"]], expected); |