diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:16:53 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:56:29 +0300 |
commit | 1a71d0ca03f6bd6c7e3fa14fd9fedc037c0585a4 (patch) | |
tree | dc3a9cbc42de7f9f50b74a212646634161546af1 /test/style/style_parser.test.cpp | |
parent | dbe0f706c34852cd18637ba28167731e72712de6 (diff) | |
download | qtlocation-mapboxgl-1a71d0ca03f6bd6c7e3fa14fd9fedc037c0585a4.tar.gz |
test
Diffstat (limited to 'test/style/style_parser.test.cpp')
-rw-r--r-- | test/style/style_parser.test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/style/style_parser.test.cpp b/test/style/style_parser.test.cpp index a18a9bbf57..3236be5caf 100644 --- a/test/style/style_parser.test.cpp +++ b/test/style/style_parser.test.cpp @@ -2,7 +2,7 @@ #include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/style/parser.hpp> -#include <mbgl/util/io.hpp> +#include <mapbox/io.hpp> #include <mbgl/util/enum.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/tileset.hpp> @@ -26,7 +26,7 @@ TEST_P(StyleParserTest, ParseStyle) { const std::string base = std::string("test/fixtures/style_parser/") + GetParam(); rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> infoDoc; - infoDoc.Parse<0>(util::read_file(base + ".info.json").c_str()); + infoDoc.Parse<0>(mapbox::base::io::readFile(base + ".info.json")->c_str()); ASSERT_FALSE(infoDoc.HasParseError()); ASSERT_TRUE(infoDoc.IsObject()); @@ -34,7 +34,7 @@ TEST_P(StyleParserTest, ParseStyle) { Log::setObserver(std::unique_ptr<Log::Observer>(observer)); style::Parser parser; - auto error = parser.parse(util::read_file(base + ".style.json")); + auto error = parser.parse(*mapbox::base::io::readFile(base + ".style.json")); if (error) { Log::Error(Event::ParseStyle, "Failed to parse style: %s", util::toString(error).c_str()); @@ -96,7 +96,7 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] { TEST(StyleParser, FontStacks) { style::Parser parser; - parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json")); + parser.parse(*mapbox::base::io::readFile("test/fixtures/style_parser/font_stacks.json")); std::set<mbgl::FontStack> expected; expected.insert(FontStack({"a"})); expected.insert(FontStack({"a", "b"})); |