summaryrefslogtreecommitdiff
path: root/test/style/conversion/layer.test.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-10-16 15:40:07 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-10-16 15:53:52 -0700
commit377a0ab9fc804bc4a6f5fe0e783a42bc17114854 (patch)
tree0703a8d338378c4e8e98c7ff7dd4444f1657f6fc /test/style/conversion/layer.test.cpp
parente43e2aa3d700cb086e8de0e1c07a6623a192bfe0 (diff)
downloadqtlocation-mapboxgl-upstream/convertJSON.tar.gz
[core] Use convertJSON instead of RapidJSON directlyupstream/convertJSON
Diffstat (limited to 'test/style/conversion/layer.test.cpp')
-rw-r--r--test/style/conversion/layer.test.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/style/conversion/layer.test.cpp b/test/style/conversion/layer.test.cpp
index d51d7d33e2..33cd329999 100644
--- a/test/style/conversion/layer.test.cpp
+++ b/test/style/conversion/layer.test.cpp
@@ -1,10 +1,8 @@
#include <mbgl/test/util.hpp>
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/rapidjson_conversion.hpp>
+#include <mbgl/style/conversion/json.hpp>
#include <mbgl/style/conversion/layer.hpp>
#include <mbgl/style/layers/background_layer_impl.hpp>
-#include <mbgl/util/rapidjson.hpp>
using namespace mbgl;
using namespace mbgl::style;
@@ -12,10 +10,8 @@ using namespace mbgl::style::conversion;
using namespace std::literals::chrono_literals;
std::unique_ptr<Layer> parseLayer(const std::string& src) {
- JSDocument doc;
- doc.Parse<0>(src);
Error error;
- return std::move(*convert<std::unique_ptr<Layer>, JSValue>(doc, error));
+ return std::move(*convertJSON<std::unique_ptr<Layer>>(src, error));
}
TEST(StyleConversion, LayerTransition) {