summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--platform/darwin/scripts/generate-style-code.js87
-rw-r--r--platform/darwin/test/MGLBackgroundStyleLayerTests.m12
-rw-r--r--platform/darwin/test/MGLCircleStyleLayerTests.m20
-rw-r--r--platform/darwin/test/MGLFillStyleLayerTests.m24
-rw-r--r--platform/darwin/test/MGLLineStyleLayerTests.m44
-rw-r--r--platform/darwin/test/MGLRasterStyleLayerTests.m28
-rw-r--r--platform/darwin/test/MGLSymbolStyleLayerTests.m152
7 files changed, 172 insertions, 195 deletions
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
index dbdcb91211..e7037c2c2b 100644
--- a/platform/darwin/scripts/generate-style-code.js
+++ b/platform/darwin/scripts/generate-style-code.js
@@ -26,74 +26,51 @@ global.arrayType = function (property) {
};
global.testImplementation = function (property, layerType) {
- switch (property.type) {
- case 'boolean':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testBool;`;
- case 'number':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testNumber;`;
- case 'string':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testString;`;
- case 'enum':
- let objCType = `${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}`;
- let objCEnum = `${objCType}${camelize(property.values[property.values.length-1])}`;
- return `layer.${objCName(property)} = [MGLRuntimeStylingHelper testEnum:${objCEnum} type:@encode(${objCType})];`;
- case 'color':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testColor;`;
- case 'array':
- return testArrayImplementation(property);
- default: throw new Error(`unknown type for ${property.name}`);
- }
+ let helperMsg = testHelperMessage(property, layerType);
+ return `layer.${objCName(property)} = [MGLRuntimeStylingHelper ${helperMsg}];`;
}
global.testGetterImplementation = function (property, layerType) {
+ let helperMsg = testHelperMessage(property, layerType);
+ let value = `[MGLRuntimeStylingHelper ${helperMsg}]`;
+ if (property.type === 'enum') {
+ let objCType = `${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}`;
+ let objCEnum = `${objCType}${camelize(property.values[property.values.length-1])}`;
+ return `XCTAssert([(NSValue *)gLayer.${objCName(property)} objCType] == [${value} objCType]);`;
+ }
+ return `XCTAssertEqualObjects(gLayer.${objCName(property)}, ${value});`;
+}
+
+global.testHelperMessage = function (property, layerType) {
switch (property.type) {
case 'boolean':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testBool);`;
+ return 'testBool';
case 'number':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testNumber);`;
+ return 'testNumber';
case 'string':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testString);`;
+ return 'testString';
case 'enum':
let objCType = `${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}`;
let objCEnum = `${objCType}${camelize(property.values[property.values.length-1])}`;
- return `XCTAssert([(NSValue *)gLayer.${objCName(property)} objCType] == [[MGLRuntimeStylingHelper testEnum:${objCEnum} type:@encode(${objCType})] objCType]);`;
+ return `testEnum:${objCEnum} type:@encode(${objCType})`;
case 'color':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testColor);`;
+ return 'testColor';
case 'array':
- return testGetterArrayImplementation(property);
- default: throw new Error(`unknown type for ${property.name}`);
- }
-}
-
-global.testGetterArrayImplementation = function (property) {
- switch (arrayType(property)) {
- case 'dasharray':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testDashArray);`;
- case 'font':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testFont);`;
- case 'padding':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testPadding);`;
- case 'offset':
- case 'translate':
- return `XCTAssertEqualObjects(gLayer.${objCName(property)}, MGLRuntimeStylingHelper.testOffset);`; // Default offset (dx, dy)
- default:
- throw new Error(`unknown array type for ${property.name}`);
- }
-};
-
-global.testArrayImplementation = function (property) {
- switch (arrayType(property)) {
- case 'dasharray':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testDashArray;`;
- case 'font':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testFont;`;
- case 'padding':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testPadding;`;
- case 'offset':
- case 'translate':
- return `layer.${objCName(property)} = MGLRuntimeStylingHelper.testOffset;`; // Default offset (dx, dy)
+ switch (arrayType(property)) {
+ case 'dasharray':
+ return `testDashArray`;
+ case 'font':
+ return `testFont`;
+ case 'padding':
+ return `testPadding`;
+ case 'offset':
+ case 'translate':
+ return `testOffset`;
+ default:
+ throw new Error(`unknown array type for ${property.name}`);
+ }
default:
- throw new Error(`unknown array type for ${property.name}`);
+ throw new Error(`unknown type for ${property.name}`);
}
};
diff --git a/platform/darwin/test/MGLBackgroundStyleLayerTests.m b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
index e36ca53022..84f410af1b 100644
--- a/platform/darwin/test/MGLBackgroundStyleLayerTests.m
+++ b/platform/darwin/test/MGLBackgroundStyleLayerTests.m
@@ -16,14 +16,14 @@
[self.mapView.style addSource:source];
[self.mapView.style addLayer:layer];
- layer.backgroundColor = MGLRuntimeStylingHelper.testColor;
- layer.backgroundPattern = MGLRuntimeStylingHelper.testString;
- layer.backgroundOpacity = MGLRuntimeStylingHelper.testNumber;
+ layer.backgroundColor = [MGLRuntimeStylingHelper testColor];
+ layer.backgroundPattern = [MGLRuntimeStylingHelper testString];
+ layer.backgroundOpacity = [MGLRuntimeStylingHelper testNumber];
MGLBackgroundStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
- XCTAssertEqualObjects(gLayer.backgroundColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.backgroundPattern, MGLRuntimeStylingHelper.testString);
- XCTAssertEqualObjects(gLayer.backgroundOpacity, MGLRuntimeStylingHelper.testNumber);
+ XCTAssertEqualObjects(gLayer.backgroundColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.backgroundPattern, [MGLRuntimeStylingHelper testString]);
+ XCTAssertEqualObjects(gLayer.backgroundOpacity, [MGLRuntimeStylingHelper testNumber]);
}
@end
diff --git a/platform/darwin/test/MGLCircleStyleLayerTests.m b/platform/darwin/test/MGLCircleStyleLayerTests.m
index f7ebcf822a..1bd4e0b552 100644
--- a/platform/darwin/test/MGLCircleStyleLayerTests.m
+++ b/platform/darwin/test/MGLCircleStyleLayerTests.m
@@ -16,20 +16,20 @@
[self.mapView.style addSource:source];
[self.mapView.style addLayer:layer];
- layer.circleRadius = MGLRuntimeStylingHelper.testNumber;
- layer.circleColor = MGLRuntimeStylingHelper.testColor;
- layer.circleBlur = MGLRuntimeStylingHelper.testNumber;
- layer.circleOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.circleTranslate = MGLRuntimeStylingHelper.testOffset;
+ layer.circleRadius = [MGLRuntimeStylingHelper testNumber];
+ layer.circleColor = [MGLRuntimeStylingHelper testColor];
+ layer.circleBlur = [MGLRuntimeStylingHelper testNumber];
+ layer.circleOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.circleTranslate = [MGLRuntimeStylingHelper testOffset];
layer.circleTranslateAnchor = [MGLRuntimeStylingHelper testEnum:MGLCircleStyleLayerCircleTranslateAnchorViewport type:@encode(MGLCircleStyleLayerCircleTranslateAnchor)];
layer.circlePitchScale = [MGLRuntimeStylingHelper testEnum:MGLCircleStyleLayerCirclePitchScaleViewport type:@encode(MGLCircleStyleLayerCirclePitchScale)];
MGLCircleStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
- XCTAssertEqualObjects(gLayer.circleRadius, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.circleColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.circleBlur, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.circleOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.circleTranslate, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.circleRadius, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.circleColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.circleBlur, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.circleOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.circleTranslate, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.circleTranslateAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLCircleStyleLayerCircleTranslateAnchorViewport type:@encode(MGLCircleStyleLayerCircleTranslateAnchor)] objCType]);
XCTAssert([(NSValue *)gLayer.circlePitchScale objCType] == [[MGLRuntimeStylingHelper testEnum:MGLCircleStyleLayerCirclePitchScaleViewport type:@encode(MGLCircleStyleLayerCirclePitchScale)] objCType]);
}
diff --git a/platform/darwin/test/MGLFillStyleLayerTests.m b/platform/darwin/test/MGLFillStyleLayerTests.m
index 5a03d96354..ad1f3b4dba 100644
--- a/platform/darwin/test/MGLFillStyleLayerTests.m
+++ b/platform/darwin/test/MGLFillStyleLayerTests.m
@@ -16,22 +16,22 @@
[self.mapView.style addSource:source];
[self.mapView.style addLayer:layer];
- layer.fillAntialias = MGLRuntimeStylingHelper.testBool;
- layer.fillOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.fillColor = MGLRuntimeStylingHelper.testColor;
- layer.fillOutlineColor = MGLRuntimeStylingHelper.testColor;
- layer.fillTranslate = MGLRuntimeStylingHelper.testOffset;
+ layer.fillAntialias = [MGLRuntimeStylingHelper testBool];
+ layer.fillOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.fillColor = [MGLRuntimeStylingHelper testColor];
+ layer.fillOutlineColor = [MGLRuntimeStylingHelper testColor];
+ layer.fillTranslate = [MGLRuntimeStylingHelper testOffset];
layer.fillTranslateAnchor = [MGLRuntimeStylingHelper testEnum:MGLFillStyleLayerFillTranslateAnchorViewport type:@encode(MGLFillStyleLayerFillTranslateAnchor)];
- layer.fillPattern = MGLRuntimeStylingHelper.testString;
+ layer.fillPattern = [MGLRuntimeStylingHelper testString];
MGLFillStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
- XCTAssertEqualObjects(gLayer.fillAntialias, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.fillOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.fillColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.fillOutlineColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.fillTranslate, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.fillAntialias, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.fillOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.fillColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.fillOutlineColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.fillTranslate, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.fillTranslateAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLFillStyleLayerFillTranslateAnchorViewport type:@encode(MGLFillStyleLayerFillTranslateAnchor)] objCType]);
- XCTAssertEqualObjects(gLayer.fillPattern, MGLRuntimeStylingHelper.testString);
+ XCTAssertEqualObjects(gLayer.fillPattern, [MGLRuntimeStylingHelper testString]);
}
@end
diff --git a/platform/darwin/test/MGLLineStyleLayerTests.m b/platform/darwin/test/MGLLineStyleLayerTests.m
index 0864c68ccd..b6acaf4cc3 100644
--- a/platform/darwin/test/MGLLineStyleLayerTests.m
+++ b/platform/darwin/test/MGLLineStyleLayerTests.m
@@ -18,34 +18,34 @@
layer.lineCap = [MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineCapSquare type:@encode(MGLLineStyleLayerLineCap)];
layer.lineJoin = [MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineJoinMiter type:@encode(MGLLineStyleLayerLineJoin)];
- layer.lineMiterLimit = MGLRuntimeStylingHelper.testNumber;
- layer.lineRoundLimit = MGLRuntimeStylingHelper.testNumber;
- layer.lineOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.lineColor = MGLRuntimeStylingHelper.testColor;
- layer.lineTranslate = MGLRuntimeStylingHelper.testOffset;
+ layer.lineMiterLimit = [MGLRuntimeStylingHelper testNumber];
+ layer.lineRoundLimit = [MGLRuntimeStylingHelper testNumber];
+ layer.lineOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.lineColor = [MGLRuntimeStylingHelper testColor];
+ layer.lineTranslate = [MGLRuntimeStylingHelper testOffset];
layer.lineTranslateAnchor = [MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineTranslateAnchorViewport type:@encode(MGLLineStyleLayerLineTranslateAnchor)];
- layer.lineWidth = MGLRuntimeStylingHelper.testNumber;
- layer.lineGapWidth = MGLRuntimeStylingHelper.testNumber;
- layer.lineOffset = MGLRuntimeStylingHelper.testNumber;
- layer.lineBlur = MGLRuntimeStylingHelper.testNumber;
- layer.lineDasharray = MGLRuntimeStylingHelper.testDashArray;
- layer.linePattern = MGLRuntimeStylingHelper.testString;
+ layer.lineWidth = [MGLRuntimeStylingHelper testNumber];
+ layer.lineGapWidth = [MGLRuntimeStylingHelper testNumber];
+ layer.lineOffset = [MGLRuntimeStylingHelper testNumber];
+ layer.lineBlur = [MGLRuntimeStylingHelper testNumber];
+ layer.lineDasharray = [MGLRuntimeStylingHelper testDashArray];
+ layer.linePattern = [MGLRuntimeStylingHelper testString];
MGLLineStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
XCTAssert([(NSValue *)gLayer.lineCap objCType] == [[MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineCapSquare type:@encode(MGLLineStyleLayerLineCap)] objCType]);
XCTAssert([(NSValue *)gLayer.lineJoin objCType] == [[MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineJoinMiter type:@encode(MGLLineStyleLayerLineJoin)] objCType]);
- XCTAssertEqualObjects(gLayer.lineMiterLimit, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineRoundLimit, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.lineTranslate, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.lineMiterLimit, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineRoundLimit, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.lineTranslate, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.lineTranslateAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLLineStyleLayerLineTranslateAnchorViewport type:@encode(MGLLineStyleLayerLineTranslateAnchor)] objCType]);
- XCTAssertEqualObjects(gLayer.lineWidth, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineGapWidth, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineOffset, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineBlur, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.lineDasharray, MGLRuntimeStylingHelper.testDashArray);
- XCTAssertEqualObjects(gLayer.linePattern, MGLRuntimeStylingHelper.testString);
+ XCTAssertEqualObjects(gLayer.lineWidth, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineGapWidth, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineOffset, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineBlur, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.lineDasharray, [MGLRuntimeStylingHelper testDashArray]);
+ XCTAssertEqualObjects(gLayer.linePattern, [MGLRuntimeStylingHelper testString]);
}
@end
diff --git a/platform/darwin/test/MGLRasterStyleLayerTests.m b/platform/darwin/test/MGLRasterStyleLayerTests.m
index 6d5cd6293b..6ce2785009 100644
--- a/platform/darwin/test/MGLRasterStyleLayerTests.m
+++ b/platform/darwin/test/MGLRasterStyleLayerTests.m
@@ -16,22 +16,22 @@
[self.mapView.style addSource:source];
[self.mapView.style addLayer:layer];
- layer.rasterOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.rasterHueRotate = MGLRuntimeStylingHelper.testNumber;
- layer.rasterBrightnessMin = MGLRuntimeStylingHelper.testNumber;
- layer.rasterBrightnessMax = MGLRuntimeStylingHelper.testNumber;
- layer.rasterSaturation = MGLRuntimeStylingHelper.testNumber;
- layer.rasterContrast = MGLRuntimeStylingHelper.testNumber;
- layer.rasterFadeDuration = MGLRuntimeStylingHelper.testNumber;
+ layer.rasterOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterHueRotate = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterBrightnessMin = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterBrightnessMax = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterSaturation = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterContrast = [MGLRuntimeStylingHelper testNumber];
+ layer.rasterFadeDuration = [MGLRuntimeStylingHelper testNumber];
MGLRasterStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
- XCTAssertEqualObjects(gLayer.rasterOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterHueRotate, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterBrightnessMin, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterBrightnessMax, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterSaturation, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterContrast, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.rasterFadeDuration, MGLRuntimeStylingHelper.testNumber);
+ XCTAssertEqualObjects(gLayer.rasterOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterHueRotate, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterBrightnessMin, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterBrightnessMax, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterSaturation, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterContrast, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.rasterFadeDuration, [MGLRuntimeStylingHelper testNumber]);
}
@end
diff --git a/platform/darwin/test/MGLSymbolStyleLayerTests.m b/platform/darwin/test/MGLSymbolStyleLayerTests.m
index b8c3cdd77b..b451ee0832 100644
--- a/platform/darwin/test/MGLSymbolStyleLayerTests.m
+++ b/platform/darwin/test/MGLSymbolStyleLayerTests.m
@@ -17,102 +17,102 @@
[self.mapView.style addLayer:layer];
layer.symbolPlacement = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerSymbolPlacementLine type:@encode(MGLSymbolStyleLayerSymbolPlacement)];
- layer.symbolSpacing = MGLRuntimeStylingHelper.testNumber;
- layer.symbolAvoidEdges = MGLRuntimeStylingHelper.testBool;
- layer.iconAllowOverlap = MGLRuntimeStylingHelper.testBool;
- layer.iconIgnorePlacement = MGLRuntimeStylingHelper.testBool;
- layer.iconOptional = MGLRuntimeStylingHelper.testBool;
+ layer.symbolSpacing = [MGLRuntimeStylingHelper testNumber];
+ layer.symbolAvoidEdges = [MGLRuntimeStylingHelper testBool];
+ layer.iconAllowOverlap = [MGLRuntimeStylingHelper testBool];
+ layer.iconIgnorePlacement = [MGLRuntimeStylingHelper testBool];
+ layer.iconOptional = [MGLRuntimeStylingHelper testBool];
layer.iconRotationAlignment = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconRotationAlignmentViewport type:@encode(MGLSymbolStyleLayerIconRotationAlignment)];
- layer.iconSize = MGLRuntimeStylingHelper.testNumber;
+ layer.iconSize = [MGLRuntimeStylingHelper testNumber];
layer.iconTextFit = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconTextFitHeight type:@encode(MGLSymbolStyleLayerIconTextFit)];
- layer.iconTextFitPadding = MGLRuntimeStylingHelper.testPadding;
- layer.iconImage = MGLRuntimeStylingHelper.testString;
- layer.iconRotate = MGLRuntimeStylingHelper.testNumber;
- layer.iconPadding = MGLRuntimeStylingHelper.testNumber;
- layer.iconKeepUpright = MGLRuntimeStylingHelper.testBool;
- layer.iconOffset = MGLRuntimeStylingHelper.testOffset;
+ layer.iconTextFitPadding = [MGLRuntimeStylingHelper testPadding];
+ layer.iconImage = [MGLRuntimeStylingHelper testString];
+ layer.iconRotate = [MGLRuntimeStylingHelper testNumber];
+ layer.iconPadding = [MGLRuntimeStylingHelper testNumber];
+ layer.iconKeepUpright = [MGLRuntimeStylingHelper testBool];
+ layer.iconOffset = [MGLRuntimeStylingHelper testOffset];
layer.textPitchAlignment = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextPitchAlignmentViewport type:@encode(MGLSymbolStyleLayerTextPitchAlignment)];
layer.textRotationAlignment = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextRotationAlignmentViewport type:@encode(MGLSymbolStyleLayerTextRotationAlignment)];
- layer.textField = MGLRuntimeStylingHelper.testString;
- layer.textFont = MGLRuntimeStylingHelper.testFont;
- layer.textSize = MGLRuntimeStylingHelper.testNumber;
- layer.textMaxWidth = MGLRuntimeStylingHelper.testNumber;
- layer.textLineHeight = MGLRuntimeStylingHelper.testNumber;
- layer.textLetterSpacing = MGLRuntimeStylingHelper.testNumber;
+ layer.textField = [MGLRuntimeStylingHelper testString];
+ layer.textFont = [MGLRuntimeStylingHelper testFont];
+ layer.textSize = [MGLRuntimeStylingHelper testNumber];
+ layer.textMaxWidth = [MGLRuntimeStylingHelper testNumber];
+ layer.textLineHeight = [MGLRuntimeStylingHelper testNumber];
+ layer.textLetterSpacing = [MGLRuntimeStylingHelper testNumber];
layer.textJustify = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextJustifyRight type:@encode(MGLSymbolStyleLayerTextJustify)];
layer.textAnchor = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextAnchorBottomRight type:@encode(MGLSymbolStyleLayerTextAnchor)];
- layer.textMaxAngle = MGLRuntimeStylingHelper.testNumber;
- layer.textRotate = MGLRuntimeStylingHelper.testNumber;
- layer.textPadding = MGLRuntimeStylingHelper.testNumber;
- layer.textKeepUpright = MGLRuntimeStylingHelper.testBool;
+ layer.textMaxAngle = [MGLRuntimeStylingHelper testNumber];
+ layer.textRotate = [MGLRuntimeStylingHelper testNumber];
+ layer.textPadding = [MGLRuntimeStylingHelper testNumber];
+ layer.textKeepUpright = [MGLRuntimeStylingHelper testBool];
layer.textTransform = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextTransformLowercase type:@encode(MGLSymbolStyleLayerTextTransform)];
- layer.textOffset = MGLRuntimeStylingHelper.testOffset;
- layer.textAllowOverlap = MGLRuntimeStylingHelper.testBool;
- layer.textIgnorePlacement = MGLRuntimeStylingHelper.testBool;
- layer.textOptional = MGLRuntimeStylingHelper.testBool;
- layer.iconOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.iconColor = MGLRuntimeStylingHelper.testColor;
- layer.iconHaloColor = MGLRuntimeStylingHelper.testColor;
- layer.iconHaloWidth = MGLRuntimeStylingHelper.testNumber;
- layer.iconHaloBlur = MGLRuntimeStylingHelper.testNumber;
- layer.iconTranslate = MGLRuntimeStylingHelper.testOffset;
+ layer.textOffset = [MGLRuntimeStylingHelper testOffset];
+ layer.textAllowOverlap = [MGLRuntimeStylingHelper testBool];
+ layer.textIgnorePlacement = [MGLRuntimeStylingHelper testBool];
+ layer.textOptional = [MGLRuntimeStylingHelper testBool];
+ layer.iconOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.iconColor = [MGLRuntimeStylingHelper testColor];
+ layer.iconHaloColor = [MGLRuntimeStylingHelper testColor];
+ layer.iconHaloWidth = [MGLRuntimeStylingHelper testNumber];
+ layer.iconHaloBlur = [MGLRuntimeStylingHelper testNumber];
+ layer.iconTranslate = [MGLRuntimeStylingHelper testOffset];
layer.iconTranslateAnchor = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconTranslateAnchorViewport type:@encode(MGLSymbolStyleLayerIconTranslateAnchor)];
- layer.textOpacity = MGLRuntimeStylingHelper.testNumber;
- layer.textColor = MGLRuntimeStylingHelper.testColor;
- layer.textHaloColor = MGLRuntimeStylingHelper.testColor;
- layer.textHaloWidth = MGLRuntimeStylingHelper.testNumber;
- layer.textHaloBlur = MGLRuntimeStylingHelper.testNumber;
- layer.textTranslate = MGLRuntimeStylingHelper.testOffset;
+ layer.textOpacity = [MGLRuntimeStylingHelper testNumber];
+ layer.textColor = [MGLRuntimeStylingHelper testColor];
+ layer.textHaloColor = [MGLRuntimeStylingHelper testColor];
+ layer.textHaloWidth = [MGLRuntimeStylingHelper testNumber];
+ layer.textHaloBlur = [MGLRuntimeStylingHelper testNumber];
+ layer.textTranslate = [MGLRuntimeStylingHelper testOffset];
layer.textTranslateAnchor = [MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextTranslateAnchorViewport type:@encode(MGLSymbolStyleLayerTextTranslateAnchor)];
MGLSymbolStyleLayer *gLayer = [self.mapView.style layerWithIdentifier:@"layerID"];
XCTAssert([(NSValue *)gLayer.symbolPlacement objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerSymbolPlacementLine type:@encode(MGLSymbolStyleLayerSymbolPlacement)] objCType]);
- XCTAssertEqualObjects(gLayer.symbolSpacing, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.symbolAvoidEdges, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.iconAllowOverlap, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.iconIgnorePlacement, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.iconOptional, MGLRuntimeStylingHelper.testBool);
+ XCTAssertEqualObjects(gLayer.symbolSpacing, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.symbolAvoidEdges, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.iconAllowOverlap, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.iconIgnorePlacement, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.iconOptional, [MGLRuntimeStylingHelper testBool]);
XCTAssert([(NSValue *)gLayer.iconRotationAlignment objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconRotationAlignmentViewport type:@encode(MGLSymbolStyleLayerIconRotationAlignment)] objCType]);
- XCTAssertEqualObjects(gLayer.iconSize, MGLRuntimeStylingHelper.testNumber);
+ XCTAssertEqualObjects(gLayer.iconSize, [MGLRuntimeStylingHelper testNumber]);
XCTAssert([(NSValue *)gLayer.iconTextFit objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconTextFitHeight type:@encode(MGLSymbolStyleLayerIconTextFit)] objCType]);
- XCTAssertEqualObjects(gLayer.iconTextFitPadding, MGLRuntimeStylingHelper.testPadding);
- XCTAssertEqualObjects(gLayer.iconImage, MGLRuntimeStylingHelper.testString);
- XCTAssertEqualObjects(gLayer.iconRotate, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.iconPadding, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.iconKeepUpright, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.iconOffset, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.iconTextFitPadding, [MGLRuntimeStylingHelper testPadding]);
+ XCTAssertEqualObjects(gLayer.iconImage, [MGLRuntimeStylingHelper testString]);
+ XCTAssertEqualObjects(gLayer.iconRotate, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.iconPadding, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.iconKeepUpright, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.iconOffset, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.textPitchAlignment objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextPitchAlignmentViewport type:@encode(MGLSymbolStyleLayerTextPitchAlignment)] objCType]);
XCTAssert([(NSValue *)gLayer.textRotationAlignment objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextRotationAlignmentViewport type:@encode(MGLSymbolStyleLayerTextRotationAlignment)] objCType]);
- XCTAssertEqualObjects(gLayer.textField, MGLRuntimeStylingHelper.testString);
- XCTAssertEqualObjects(gLayer.textFont, MGLRuntimeStylingHelper.testFont);
- XCTAssertEqualObjects(gLayer.textSize, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textMaxWidth, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textLineHeight, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textLetterSpacing, MGLRuntimeStylingHelper.testNumber);
+ XCTAssertEqualObjects(gLayer.textField, [MGLRuntimeStylingHelper testString]);
+ XCTAssertEqualObjects(gLayer.textFont, [MGLRuntimeStylingHelper testFont]);
+ XCTAssertEqualObjects(gLayer.textSize, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textMaxWidth, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textLineHeight, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textLetterSpacing, [MGLRuntimeStylingHelper testNumber]);
XCTAssert([(NSValue *)gLayer.textJustify objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextJustifyRight type:@encode(MGLSymbolStyleLayerTextJustify)] objCType]);
XCTAssert([(NSValue *)gLayer.textAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextAnchorBottomRight type:@encode(MGLSymbolStyleLayerTextAnchor)] objCType]);
- XCTAssertEqualObjects(gLayer.textMaxAngle, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textRotate, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textPadding, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textKeepUpright, MGLRuntimeStylingHelper.testBool);
+ XCTAssertEqualObjects(gLayer.textMaxAngle, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textRotate, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textPadding, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textKeepUpright, [MGLRuntimeStylingHelper testBool]);
XCTAssert([(NSValue *)gLayer.textTransform objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextTransformLowercase type:@encode(MGLSymbolStyleLayerTextTransform)] objCType]);
- XCTAssertEqualObjects(gLayer.textOffset, MGLRuntimeStylingHelper.testOffset);
- XCTAssertEqualObjects(gLayer.textAllowOverlap, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.textIgnorePlacement, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.textOptional, MGLRuntimeStylingHelper.testBool);
- XCTAssertEqualObjects(gLayer.iconOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.iconColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.iconHaloColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.iconHaloWidth, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.iconHaloBlur, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.iconTranslate, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.textOffset, [MGLRuntimeStylingHelper testOffset]);
+ XCTAssertEqualObjects(gLayer.textAllowOverlap, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.textIgnorePlacement, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.textOptional, [MGLRuntimeStylingHelper testBool]);
+ XCTAssertEqualObjects(gLayer.iconOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.iconColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.iconHaloColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.iconHaloWidth, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.iconHaloBlur, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.iconTranslate, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.iconTranslateAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerIconTranslateAnchorViewport type:@encode(MGLSymbolStyleLayerIconTranslateAnchor)] objCType]);
- XCTAssertEqualObjects(gLayer.textOpacity, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.textHaloColor, MGLRuntimeStylingHelper.testColor);
- XCTAssertEqualObjects(gLayer.textHaloWidth, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textHaloBlur, MGLRuntimeStylingHelper.testNumber);
- XCTAssertEqualObjects(gLayer.textTranslate, MGLRuntimeStylingHelper.testOffset);
+ XCTAssertEqualObjects(gLayer.textOpacity, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.textHaloColor, [MGLRuntimeStylingHelper testColor]);
+ XCTAssertEqualObjects(gLayer.textHaloWidth, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textHaloBlur, [MGLRuntimeStylingHelper testNumber]);
+ XCTAssertEqualObjects(gLayer.textTranslate, [MGLRuntimeStylingHelper testOffset]);
XCTAssert([(NSValue *)gLayer.textTranslateAnchor objCType] == [[MGLRuntimeStylingHelper testEnum:MGLSymbolStyleLayerTextTranslateAnchorViewport type:@encode(MGLSymbolStyleLayerTextTranslateAnchor)] objCType]);
}
View Lorry Controller Status