summaryrefslogtreecommitdiff
path: root/platform/darwin/test/MGLExpressionTests.mm
diff options
context:
space:
mode:
authorFabian Guerra Soto <fabian.guerra@mapbox.com>2018-05-23 13:21:31 -0400
committerGitHub <noreply@github.com>2018-05-23 13:21:31 -0400
commit3ea1a7062ffcfd05c6e5e6fe2a9a96537ba8630a (patch)
tree7ec3dbf958bf998e03c0c1099889f5e0e52f4462 /platform/darwin/test/MGLExpressionTests.mm
parent464fefab18822fff692cdcd97524100f81a200df (diff)
downloadqtlocation-mapboxgl-3ea1a7062ffcfd05c6e5e6fe2a9a96537ba8630a.tar.gz
[ios, macos] Fix keypath expressions, json object is parsed incorrectly for nested keypaths. (#11959)
* [ios, macos] Fix keypath expressions, a json object is parsed incorrectly for nested keypaths. * [ios, macos] Update changelogs.
Diffstat (limited to 'platform/darwin/test/MGLExpressionTests.mm')
-rw-r--r--platform/darwin/test/MGLExpressionTests.mm12
1 files changed, 12 insertions, 0 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm
index dbdad2ed13..8870618cef 100644
--- a/platform/darwin/test/MGLExpressionTests.mm
+++ b/platform/darwin/test/MGLExpressionTests.mm
@@ -306,6 +306,18 @@ using namespace std::string_literals;
XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression);
}
+ {
+ NSExpression *expression = [NSExpression expressionForKeyPath:@"lineStyle.color"];
+ NSArray *jsonExpression = @[@"get", @"color", @[@"get", @"lineStyle"]];
+ XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
+ XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression);
+ }
+ {
+ NSExpression *expression = [NSExpression expressionForKeyPath:@"map.box.gl"];
+ NSArray *jsonExpression = @[@"get", @"gl", @[@"get", @"box", @[@"get", @"map"]]];
+ XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
+ XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression);
+ }
}
- (void)testStatisticalExpressionObject {