diff options
Diffstat (limited to 'platform/darwin/test/MGLExpressionTests.mm')
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index ec51f2bf6c..255374b829 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -995,16 +995,16 @@ using namespace std::string_literals; { MGLAttributedExpression *attribute1 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"foo"] fontNames:nil - fontSize:@(1.2)]; + fontScale:@(1.2)]; MGLAttributedExpression *attribute2 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"biz"] fontNames:nil - fontSize:@(1.0)]; + fontScale:@(1.0)]; MGLAttributedExpression *attribute3 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"bar"] fontNames:nil - fontSize:@(0.8)]; + fontScale:@(0.8)]; MGLAttributedExpression *attribute4 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"\r"] fontNames:@[] - fontSize:nil]; + fontScale:nil]; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@, %@, %@, %@)", MGLConstantExpression(attribute1), MGLConstantExpression(attribute4), @@ -1017,16 +1017,16 @@ using namespace std::string_literals; { MGLAttributedExpression *attribute1 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"foo"] fontNames:nil - fontSize:@(1.2)]; + fontScale:@(1.2)]; MGLAttributedExpression *attribute2 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"biz"] fontNames:nil - fontSize:@(1.0)]; + fontScale:@(1.0)]; MGLAttributedExpression *attribute3 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"bar"] fontNames:nil - fontSize:@(0.8)]; + fontScale:@(0.8)]; MGLAttributedExpression *attribute4 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"\n"] fontNames:@[] - fontSize:nil]; + fontScale:nil]; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@, %@, %@, %@)", MGLConstantExpression(attribute1), MGLConstantExpression(attribute4), @@ -1039,7 +1039,7 @@ using namespace std::string_literals; { MGLAttributedExpression *attribute1 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"foo"] fontNames:nil - fontSize:@(1.2)]; + fontScale:@(1.2)]; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@)", MGLConstantExpression(attribute1)]; NSExpression *compatibilityExpression = [NSExpression expressionForFunction:@"mgl_attributed:" arguments:@[MGLConstantExpression(attribute1)]]; @@ -1051,8 +1051,8 @@ using namespace std::string_literals; } { MGLAttributedExpression *attribute1 = [[MGLAttributedExpression alloc] initWithExpression:[NSExpression expressionForConstantValue:@"foo"] - attributes:@{ MGLFontSizeAttribute: @(1.2), - MGLFontColorAttribute: @"yellow"}] ; + attributes:@{ MGLFontScaleAttribute: MGLConstantExpression(@(1.2)), + MGLFontColorAttribute: MGLConstantExpression(@"yellow") }] ; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@)", MGLConstantExpression(attribute1)]; NSExpression *compatibilityExpression = [NSExpression expressionForFunction:@"mgl_attributed:" arguments:@[MGLConstantExpression(attribute1)]]; @@ -1071,22 +1071,25 @@ using namespace std::string_literals; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { + NSExpression *fontNames = [NSExpression expressionForAggregate:@[ MGLConstantExpression(@"DIN Offc Pro Bold"), MGLConstantExpression(@"Arial Unicode MS Bold") ]]; MGLAttributedExpression *attribute1 = [[MGLAttributedExpression alloc] initWithExpression:[NSExpression expressionForConstantValue:@"foo"] - attributes:@{ MGLFontSizeAttribute: @(1.2), - MGLFontColorAttribute: @"yellow", - MGLFontNamesAttribute: @[ @"DIN Offc Pro Bold", @"Arial Unicode MS Bold" ] + attributes:@{ MGLFontScaleAttribute: MGLConstantExpression(@(1.2)), + MGLFontColorAttribute: MGLConstantExpression(@"yellow"), + MGLFontNamesAttribute: fontNames }] ; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@)", MGLConstantExpression(attribute1)]; NSArray *jsonExpression = @[ @"format", @"foo", @{ @"font-scale": @1.2, @"text-color": @"yellow" , @"text-font" : @[ @"literal", @[ @"DIN Offc Pro Bold", @"Arial Unicode MS Bold" ]]} ]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + NSExpression *exp = [NSExpression expressionWithMGLJSONObject:jsonExpression]; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { + NSExpression *fontNames = [NSExpression expressionForAggregate:@[ MGLConstantExpression(@"DIN Offc Pro Bold"), MGLConstantExpression(@"Arial Unicode MS Bold") ]]; MGLAttributedExpression *attribute1 = [[MGLAttributedExpression alloc] initWithExpression:[NSExpression expressionForConstantValue:@"foo"] - attributes:@{ MGLFontSizeAttribute: @(1.2), - MGLFontColorAttribute: [MGLColor redColor], - MGLFontNamesAttribute: @[ @"DIN Offc Pro Bold", @"Arial Unicode MS Bold" ] + attributes:@{ MGLFontScaleAttribute: MGLConstantExpression(@(1.2)), + MGLFontColorAttribute: MGLConstantExpression([MGLColor redColor]), + MGLFontNamesAttribute: fontNames }] ; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@)", MGLConstantExpression(attribute1)]; @@ -1095,10 +1098,11 @@ using namespace std::string_literals; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { + NSExpression *fontNames = [NSExpression expressionForAggregate:@[ MGLConstantExpression(@"DIN Offc Pro Bold"), MGLConstantExpression(@"Arial Unicode MS Bold") ]]; MGLAttributedExpression *attribute1 = [[MGLAttributedExpression alloc] initWithExpression:[NSExpression expressionWithFormat:@"CAST(x, 'NSString')"] - attributes:@{ MGLFontSizeAttribute: @(1.2), - MGLFontColorAttribute: [MGLColor redColor], - MGLFontNamesAttribute: @[ @"DIN Offc Pro Bold", @"Arial Unicode MS Bold" ] + attributes:@{ MGLFontScaleAttribute: MGLConstantExpression(@(1.2)), + MGLFontColorAttribute: MGLConstantExpression([MGLColor redColor]), + MGLFontNamesAttribute: fontNames }] ; NSExpression *expression = [NSExpression expressionWithFormat:@"mgl_attributed:(%@)", MGLConstantExpression(attribute1)]; @@ -1109,16 +1113,16 @@ using namespace std::string_literals; { MGLAttributedExpression *attribute1 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"foo"] fontNames:nil - fontSize:@(1.2)]; + fontScale:@(1.2)]; MGLAttributedExpression *attribute2 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"biz"] fontNames:nil - fontSize:@(1.0)]; + fontScale:@(1.0)]; MGLAttributedExpression *attribute3 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"bar"] fontNames:nil - fontSize:@(0.8)]; + fontScale:@(0.8)]; MGLAttributedExpression *attribute4 = [MGLAttributedExpression attributedExpression:[NSExpression expressionForConstantValue:@"\n"] fontNames:@[] - fontSize:nil]; + fontScale:nil]; NSExpression *expression = [NSExpression mgl_expressionForAttributedExpressions:@[MGLConstantExpression(attribute1), MGLConstantExpression(attribute4), MGLConstantExpression(attribute2), |