tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[test runner] Update test commands for Layer::setProperty()

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-12-02 18:14:16 +02:00
parent 5d46cd662f
commit 75f8530ed1
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
render-test/runner.cpp
View File

@@ -793,8 +793,9 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata, R
assert(operationArray.Size() >= 2u);
assert(operationArray[1].IsString());
map.getStyle().removeSource(operationArray[1].GetString());
} else if (operationArray[0].GetString() == setPaintPropertyOp) {
// setPaintProperty
} else if (operationArray[0].GetString() == setLayoutPropertyOp ||
operationArray[0].GetString() == setPaintPropertyOp) {
// set{Paint|Layout}Property
assert(operationArray.Size() >= 4u);
assert(operationArray[1].IsString());
assert(operationArray[2].IsString());
@@ -808,24 +809,7 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata, R
return false;
} else {
const mbgl::JSValue* propertyValue = &operationArray[3];
layer->setPaintProperty(propertyName, propertyValue);
}
} else if (operationArray[0].GetString() == setLayoutPropertyOp) {
// setLayoutProperty
assert(operationArray.Size() >= 4u);
assert(operationArray[1].IsString());
assert(operationArray[2].IsString());
const std::string layerName { operationArray[1].GetString(), operationArray[1].GetStringLength() };
const std::string propertyName { operationArray[2].GetString(), operationArray[2].GetStringLength() };
auto layer = map.getStyle().getLayer(layerName);
if (!layer) {
metadata.errorMessage = std::string("Layer not found: ") + layerName;
return false;
} else {
const mbgl::JSValue* propertyValue = &operationArray[3];
layer->setLayoutProperty(propertyName, propertyValue);
layer->setProperty(propertyName, propertyValue);
}
} else if (operationArray[0].GetString() == fileSizeProbeOp) {
// probeFileSize