diff options
Diffstat (limited to 'test/style/style.test.cpp')
-rw-r--r-- | test/style/style.test.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp index 9bdab37ac6..91ecbe8d22 100644 --- a/test/style/style.test.cpp +++ b/test/style/style.test.cpp @@ -23,27 +23,27 @@ TEST(Style, Properties) { StubFileSource fileSource; Style::Impl style { threadPool, fileSource, 1.0 }; - style.loadJSON(R"STYLE({"name": "Test"})STYLE"); + style.loadJSON(Blob{ R"STYLE({"name": "Test"})STYLE", false }); ASSERT_EQ("Test", style.getName()); - style.loadJSON(R"STYLE({"center": [10, 20]})STYLE"); + style.loadJSON(Blob{ R"STYLE({"center": [10, 20]})STYLE", false }); ASSERT_EQ("", style.getName()); ASSERT_EQ((LatLng{20, 10}), *style.getDefaultCamera().center); - style.loadJSON(R"STYLE({"bearing": 24})STYLE"); + style.loadJSON(Blob{ R"STYLE({"bearing": 24})STYLE", false }); ASSERT_EQ("", style.getName()); ASSERT_EQ(LatLng {}, *style.getDefaultCamera().center); ASSERT_EQ(24, *style.getDefaultCamera().angle); - style.loadJSON(R"STYLE({"zoom": 13.3})STYLE"); + style.loadJSON(Blob{ R"STYLE({"zoom": 13.3})STYLE", false }); ASSERT_EQ("", style.getName()); ASSERT_EQ(13.3, *style.getDefaultCamera().zoom); - style.loadJSON(R"STYLE({"pitch": 60})STYLE"); + style.loadJSON(Blob{ R"STYLE({"pitch": 60})STYLE", false }); ASSERT_EQ("", style.getName()); ASSERT_EQ(60, *style.getDefaultCamera().pitch); - style.loadJSON(R"STYLE({"name": 23, "center": {}, "bearing": "north", "zoom": null, "pitch": "wide"})STYLE"); + style.loadJSON(Blob{ R"STYLE({"name": 23, "center": {}, "bearing": "north", "zoom": null, "pitch": "wide"})STYLE", false }); ASSERT_EQ("", style.getName()); ASSERT_EQ(LatLng {}, *style.getDefaultCamera().center); ASSERT_EQ(0, *style.getDefaultCamera().zoom); @@ -58,7 +58,7 @@ TEST(Style, DuplicateSource) { StubFileSource fileSource; Style::Impl style { threadPool, fileSource, 1.0 }; - style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); + style.loadJSON(util::readFile("test/fixtures/resources/style-unused-sources.json")); style.addSource(std::make_unique<VectorSource>("sourceId", "mapbox://mapbox.mapbox-terrain-v2")); @@ -80,7 +80,7 @@ TEST(Style, RemoveSourceInUse) { StubFileSource fileSource; Style::Impl style { threadPool, fileSource, 1.0 }; - style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json")); + style.loadJSON(util::readFile("test/fixtures/resources/style-unused-sources.json")); style.addSource(std::make_unique<VectorSource>("sourceId", "mapbox://mapbox.mapbox-terrain-v2")); style.addLayer(std::make_unique<LineLayer>("layerId", "sourceId")); |