diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-16 15:40:07 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-16 17:14:19 -0700 |
| commit | 12f78fc8747332a3d54763c9b0cc2e794eefb4f8 (patch) | |
| tree | fb10590f6605226a16dc528965ba541ff9371ec4 /test/style/conversion/light.test.cpp | |
| parent | b8654b3b04599988f1f7a519853e98d4ca54cfd0 (diff) | |
| download | qtlocation-mapboxgl-12f78fc8747332a3d54763c9b0cc2e794eefb4f8.tar.gz | |
[core] Use convertJSON instead of RapidJSON directly
Diffstat (limited to 'test/style/conversion/light.test.cpp')
| -rw-r--r-- | test/style/conversion/light.test.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/style/conversion/light.test.cpp b/test/style/conversion/light.test.cpp index 28e22b3550..67e48c942e 100644 --- a/test/style/conversion/light.test.cpp +++ b/test/style/conversion/light.test.cpp @@ -1,11 +1,10 @@ #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/constant.hpp> #include <mbgl/style/conversion/light.hpp> #include <mbgl/style/position.hpp> -#include <mbgl/util/rapidjson.hpp> #include <mbgl/util/color.hpp> #include <mbgl/util/chrono.hpp> @@ -19,9 +18,7 @@ TEST(StyleConversion, Light) { Error error; auto parseLight = [&](const std::string& src) { - JSDocument doc; - doc.Parse<0>(src); - return convert<Light>(doc, error); + return convertJSON<Light>(src, error); }; { |