From fe4348eec34a3a9c23f7a0af2ccfa4eff28416ea Mon Sep 17 00:00:00 2001 From: Fabian Guerra Soto Date: Mon, 16 Apr 2018 13:39:10 -0400 Subject: [ios, macos] Remove mgl_ prefix from built-in expressions variables. (#11689) --- platform/darwin/test/MGLPredicateTests.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/darwin/test/MGLPredicateTests.mm') diff --git a/platform/darwin/test/MGLPredicateTests.mm b/platform/darwin/test/MGLPredicateTests.mm index 5671de3252..18918f1b8f 100644 --- a/platform/darwin/test/MGLPredicateTests.mm +++ b/platform/darwin/test/MGLPredicateTests.mm @@ -615,9 +615,9 @@ namespace mbgl { } { NSArray *expected = @[@"match", @[@"id"], @6, @YES, @5, @YES, @4, @YES, @3, @YES, @NO]; - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"$mgl_featureIdentifier IN { 6, 5, 4, 3}"]; + NSPredicate *predicate = [NSPredicate predicateWithFormat:@"$featureIdentifier IN { 6, 5, 4, 3}"]; XCTAssertEqualObjects(predicate.mgl_jsonExpressionObject, expected); - NSPredicate *predicateAfter = [NSPredicate predicateWithFormat:@"MGL_MATCH($mgl_featureIdentifier, 6, YES, 5, YES, 4, YES, 3, YES, NO) == YES"]; + NSPredicate *predicateAfter = [NSPredicate predicateWithFormat:@"MGL_MATCH($featureIdentifier, 6, YES, 5, YES, 4, YES, 3, YES, NO) == YES"]; XCTAssertEqualObjects([NSPredicate mgl_predicateWithJSONObject:expected], predicateAfter); } { @@ -636,9 +636,9 @@ namespace mbgl { } { NSArray *expected = @[@"match", @[@"id"], @6, @YES, @5, @YES, @4, @YES, @3, @YES, @NO]; - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"{ 6, 5, 4, 3} CONTAINS $mgl_featureIdentifier"]; + NSPredicate *predicate = [NSPredicate predicateWithFormat:@"{ 6, 5, 4, 3} CONTAINS $featureIdentifier"]; XCTAssertEqualObjects(predicate.mgl_jsonExpressionObject, expected); - NSPredicate *predicateAfter = [NSPredicate predicateWithFormat:@"MGL_MATCH($mgl_featureIdentifier, 6, YES, 5, YES, 4, YES, 3, YES, NO) == YES"]; + NSPredicate *predicateAfter = [NSPredicate predicateWithFormat:@"MGL_MATCH($featureIdentifier, 6, YES, 5, YES, 4, YES, 3, YES, NO) == YES"]; XCTAssertEqualObjects([NSPredicate mgl_predicateWithJSONObject:expected], predicateAfter); } } -- cgit v1.2.1