summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-08-29 15:43:13 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-08-29 15:43:13 -0400
commita8021e84f876c52b5da7428a019cb062e5f80537 (patch)
treef9b4f8db311c040696c2545ca814df2af53b23e8 /test
parentcffd68f9cabb69491ff8f2c43c680f6b345b25be (diff)
parenteb1fbc542b8d8b90d17e9e76f98d7b021b449c7b (diff)
downloadqtlocation-mapboxgl-a8021e84f876c52b5da7428a019cb062e5f80537.tar.gz
Merge branch 'master' into libuv010
Diffstat (limited to 'test')
-rw-r--r--test/headless.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/headless.cpp b/test/headless.cpp
index 2453f1bb37..4299fd79b9 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -51,10 +51,6 @@ TEST_P(HeadlessTest, render) {
Log::Set<FixtureLogBackend>();
- // Setup OpenGL
- HeadlessView view;
- Map map(view);
-
for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {
const std::string name { it->name.GetString(), it->name.GetStringLength() };
const rapidjson::Value &value = it->value;
@@ -80,6 +76,9 @@ TEST_P(HeadlessTest, render) {
}
}
+ HeadlessView view;
+ Map map(view);
+
map.setStyleJSON(style, base_directory);
map.setAppliedClasses(classes);
@@ -97,7 +96,6 @@ TEST_P(HeadlessTest, render) {
const std::string image = util::compress_png(width, height, pixels.get(), true);
util::write_file(actual_image, image);
}
-
}
INSTANTIATE_TEST_CASE_P(Headless, HeadlessTest, ::testing::ValuesIn([] {