diff options
Diffstat (limited to 'render-test/runner.cpp')
| -rw-r--r-- | render-test/runner.cpp | 143 |
1 files changed, 141 insertions, 2 deletions
diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 54660979cf..5c8f53759f 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -1,5 +1,6 @@ #include <mbgl/map/camera.hpp> #include <mbgl/map/map_observer.hpp> +#include <mbgl/renderer/renderer.hpp> #include <mbgl/style/conversion/filter.hpp> #include <mbgl/style/conversion/layer.hpp> #include <mbgl/style/conversion/light.hpp> @@ -7,11 +8,11 @@ #include <mbgl/style/image.hpp> #include <mbgl/style/layer.hpp> #include <mbgl/style/light.hpp> -#include <mbgl/style/style.hpp> #include <mbgl/style/rapidjson_conversion.hpp> +#include <mbgl/style/style.hpp> #include <mbgl/util/chrono.hpp> -#include <mbgl/util/io.hpp> #include <mbgl/util/image.hpp> +#include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/timer.hpp> @@ -197,6 +198,9 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) { static const std::string memoryProbeOp("probeMemory"); static const std::string memoryProbeStartOp("probeMemoryStart"); static const std::string memoryProbeEndOp("probeMemoryEnd"); + static const std::string setFeatureStateOp("setFeatureState"); + static const std::string getFeatureStateOp("getFeatureState"); + static const std::string removeFeatureStateOp("removeFeatureState"); // wait if (operationArray[0].GetString() == waitOp) { @@ -453,6 +457,141 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) { assert(AllocationIndex::isActive()); AllocationIndex::setActive(false); AllocationIndex::reset(); + + // setFeatureState + } else if (operationArray[0].GetString() == setFeatureStateOp) { + assert(operationArray.Size() >= 3u); + assert(operationArray[1].IsObject()); + assert(operationArray[2].IsObject()); + + using namespace mbgl; + using namespace mbgl::style::conversion; + + std::string sourceID; + mbgl::optional<std::string> sourceLayer; + std::string featureID; + std::string stateKey; + Value stateValue; + bool valueParsed = false; + FeatureState parsedState; + + const auto& featureOptions = operationArray[1].GetObject(); + if (featureOptions.HasMember("source")) { + sourceID = featureOptions["source"].GetString(); + } + if (featureOptions.HasMember("sourceLayer")) { + sourceLayer = {featureOptions["sourceLayer"].GetString()}; + } + if (featureOptions.HasMember("id")) { + featureID = featureOptions["id"].GetString(); + } + const JSValue* state = &operationArray[2]; + + const std::function<optional<Error>(const std::string&, const Convertible&)> convertFn = + [&](const std::string& k, const Convertible& v) -> optional<Error> { + optional<Value> value = toValue(v); + if (value) { + stateValue = std::move(*value); + valueParsed = true; + } else if (isArray(v)) { + std::vector<Value> array; + std::size_t length = arrayLength(v); + array.reserve(length); + for (size_t i = 0; i < length; ++i) { + optional<Value> arrayVal = toValue(arrayMember(v, i)); + if (arrayVal) { + array.emplace_back(*arrayVal); + } + } + std::unordered_map<std::string, Value> result; + result[k] = std::move(array); + stateValue = std::move(result); + valueParsed = true; + return {}; + + } else if (isObject(v)) { + eachMember(v, convertFn); + } + + if (!valueParsed) { + metadata.errorMessage = std::string("Could not get feature state value, state key: ") + k; + return nullopt; + } + stateKey = k; + parsedState[stateKey] = stateValue; + return nullopt; + }; + + eachMember(state, convertFn); + + try { + frontend.render(map); + } catch (const std::exception&) { + return false; + } + frontend.getRenderer()->setFeatureState(sourceID, sourceLayer, featureID, parsedState); + + // getFeatureState + } else if (operationArray[0].GetString() == getFeatureStateOp) { + assert(operationArray.Size() >= 2u); + assert(operationArray[1].IsObject()); + + std::string sourceID; + mbgl::optional<std::string> sourceLayer; + std::string featureID; + + const auto& featureOptions = operationArray[1].GetObject(); + if (featureOptions.HasMember("source")) { + sourceID = featureOptions["source"].GetString(); + } + if (featureOptions.HasMember("sourceLayer")) { + sourceLayer = {featureOptions["sourceLayer"].GetString()}; + } + if (featureOptions.HasMember("id")) { + featureID = featureOptions["id"].GetString(); + } + + try { + frontend.render(map); + } catch (const std::exception&) { + return false; + } + mbgl::FeatureState state; + frontend.getRenderer()->getFeatureState(state, sourceID, sourceLayer, featureID); + + // removeFeatureState + } else if (operationArray[0].GetString() == removeFeatureStateOp) { + assert(operationArray.Size() >= 2u); + assert(operationArray[1].IsObject()); + + std::string sourceID; + mbgl::optional<std::string> sourceLayer; + std::string featureID; + mbgl::optional<std::string> stateKey; + + const auto& featureOptions = operationArray[1].GetObject(); + if (featureOptions.HasMember("source")) { + sourceID = featureOptions["source"].GetString(); + } + if (featureOptions.HasMember("sourceLayer")) { + sourceLayer = {featureOptions["sourceLayer"].GetString()}; + } + if (featureOptions.HasMember("id")) { + featureID = featureOptions["id"].GetString(); + } + + if (operationArray.Size() >= 3u) { + assert(operationArray[2].IsString()); + stateKey = {operationArray[2].GetString()}; + } + + try { + frontend.render(map); + } catch (const std::exception&) { + return false; + } + frontend.getRenderer()->removeFeatureState(sourceID, sourceLayer, featureID, stateKey); + } else { metadata.errorMessage = std::string("Unsupported operation: ") + operationArray[0].GetString(); return false; |