diff options
| author | Lloyd Sheng <i@lloydsheng.com> | 2018-07-26 13:53:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 13:53:12 +0800 |
| commit | 9c90509750c9ae4d76f0a902036b30f7c5477ac9 (patch) | |
| tree | 25a315789b67f4f34fb31574ca150697b880427d /platform/darwin/test | |
| parent | 8400355e996a40014f774d443a0d5deab41d705e (diff) | |
| download | qtlocation-mapboxgl-9c90509750c9ae4d76f0a902036b30f7c5477ac9.tar.gz | |
[iOS] Add fallbacks for name fields (#12387)
* Add fallbacks for name fields
* Add a fallback for `name_zh-Hant`
* Update changelog
Diffstat (limited to 'platform/darwin/test')
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index 5ae98e5244..6cb7bfdc3d 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -1013,7 +1013,7 @@ using namespace std::string_literals; } { NSExpression *original = [NSExpression expressionForKeyPath:@"name_en"]; - NSExpression *expected = original; + NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_en", @"name"]; XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:nil], expected); } { @@ -1023,12 +1023,13 @@ using namespace std::string_literals; } { NSExpression *original = [NSExpression expressionForKeyPath:@"name_en"]; - NSExpression *expected = [NSExpression expressionForKeyPath:@"name_fr"]; + NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_fr", @"name"]; XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:[NSLocale localeWithLocaleIdentifier:@"fr-CA"]], expected); } { NSExpression *original = [NSExpression expressionForKeyPath:@"name_en"]; - NSExpression *expected = [NSExpression expressionForKeyPath:@"name_zh-Hans"]; + 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); } { @@ -1045,7 +1046,7 @@ using namespace std::string_literals; NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($zoomLevel, short, %@)", @{ @1: [NSExpression expressionForKeyPath:@"abbr"], @2: @"…", - @3: [NSExpression expressionForKeyPath:@"name_es"], + @3: [NSExpression expressionWithFormat:@"mgl_coalesce({%K, %K})", @"name_es", @"name"] }]; XCTAssertEqualObjects([original mgl_expressionLocalizedIntoLocale:[NSLocale localeWithLocaleIdentifier:@"es-PR"]], expected); } |