summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-27 18:30:35 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-04-17 13:36:50 +0300
commit7751e4be762857b91f7dfa5c10f0f024aebd0079 (patch)
tree0b3aa111a854ec3a0e9eb8362f1efdfbdab22482 /test
parentc92be2965c8c8f36aed1cf86d8e44915855b4806 (diff)
downloadqtlocation-mapboxgl-7751e4be762857b91f7dfa5c10f0f024aebd0079.tar.gz
[core] Fix google-default-arguments errors in header files
As reported by clang-tidy-8.
Diffstat (limited to 'test')
-rw-r--r--test/map/map.test.cpp19
-rw-r--r--test/storage/main_resource_loader.test.cpp4
-rw-r--r--test/util/offscreen_texture.test.cpp2
3 files changed, 13 insertions, 12 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index 4f25000177..7a8078df27 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -350,12 +350,13 @@ TEST(Map, Offline) {
const std::string prefix = "http://127.0.0.1:3000/";
std::shared_ptr<FileSource> dbfs =
FileSourceManager::get()->getFileSource(FileSourceType::Database, ResourceOptions{});
- dbfs->forward(Resource::style(prefix + "style.json"), expiredItem("style.json"));
- dbfs->forward(Resource::source(prefix + "streets.json"), expiredItem("streets.json"));
- dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"));
- dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"));
+ dbfs->forward(Resource::style(prefix + "style.json"), expiredItem("style.json"), [] {});
+ dbfs->forward(Resource::source(prefix + "streets.json"), expiredItem("streets.json"), [] {});
+ dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"), [] {});
+ dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"), [] {});
dbfs->forward(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ),
- expiredItem("0-0-0.vector.pbf"));
+ expiredItem("0-0-0.vector.pbf"),
+ [] {});
dbfs->forward(Resource::glyphs(prefix + "{fontstack}/{range}.pbf", {{"Helvetica"}}, {0, 255}),
expiredItem("glyph.pbf"),
[&] { test.map.getStyle().loadURL(prefix + "style.json"); });
@@ -1337,10 +1338,10 @@ TEST(Map, TEST_REQUIRES_SERVER(ExpiredSpriteSheet)) {
const std::string prefix = "http://127.0.0.1:3000/online/";
std::shared_ptr<FileSource> dbfs =
FileSourceManager::get()->getFileSource(FileSourceType::Database, ResourceOptions{});
- dbfs->forward(Resource::style(prefix + "style.json"), makeResponse("style.json"));
- dbfs->forward(Resource::source(prefix + "streets.json"), makeResponse("streets.json"));
- dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), makeResponse("sprite.json", true));
- dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), makeResponse("sprite.png", true));
+ dbfs->forward(Resource::style(prefix + "style.json"), makeResponse("style.json"), [] {});
+ dbfs->forward(Resource::source(prefix + "streets.json"), makeResponse("streets.json"), [] {});
+ dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), makeResponse("sprite.json", true), [] {});
+ dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), makeResponse("sprite.png", true), [] {});
dbfs->forward(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ),
makeResponse("0-0-0.vector.pbf"),
[&] { test.map.getStyle().loadURL(prefix + "style.json"); });
diff --git a/test/storage/main_resource_loader.test.cpp b/test/storage/main_resource_loader.test.cpp
index 2622d91183..1bab30e1f8 100644
--- a/test/storage/main_resource_loader.test.cpp
+++ b/test/storage/main_resource_loader.test.cpp
@@ -692,11 +692,11 @@ TEST(MainResourceLoader, TEST_REQUIRES_SERVER(CachedResourceLowPriority)) {
// Put existing values into the cache.
Resource resource1{Resource::Unknown, "http://127.0.0.1:3000/load/3", {}, Resource::LoadingMethod::All};
response.data = std::make_shared<std::string>("Cached Request 3");
- dbfs->forward(resource1, response);
+ dbfs->forward(resource1, response, [] {});
Resource resource2{Resource::Unknown, "http://127.0.0.1:3000/load/4", {}, Resource::LoadingMethod::All};
response.data = std::make_shared<std::string>("Cached Request 4");
- dbfs->forward(resource2, response);
+ dbfs->forward(resource2, response, [] {});
onlineFs->setProperty(MAX_CONCURRENT_REQUESTS_KEY, 1u);
fs.pause();
diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp
index 78cf7cef60..7bc687d8ca 100644
--- a/test/util/offscreen_texture.test.cpp
+++ b/test/util/offscreen_texture.test.cpp
@@ -187,7 +187,7 @@ TEST(OffscreenTexture, ClearRenderPassColor) {
gfx::BackendScope scope { *backend->getRendererBackend() };
auto& context = backend->getRendererBackend()->getContext();
auto encoder = context.createCommandEncoder();
- auto offscreenTexture = context.createOffscreenTexture({ 128, 256 });
+ auto offscreenTexture = context.createOffscreenTexture({128, 256}, gfx::TextureChannelDataType::UnsignedByte);
auto renderPass = encoder->createRenderPass(
"offscreen texture", { *offscreenTexture, Color{ 1.0f, 0.0f, 0.0f, 1.0f }, {}, {} });
renderPass.reset();