summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-06 12:23:35 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-07 17:56:38 +0200
commit426242fe412057e2a6572e100e652e31917da419 (patch)
tree733ec72518eec9fd63b6ce2f3d616eabb98e45b8 /test
parent8edf9959460f9f7e80b200f0a124b1a839cfd4c8 (diff)
downloadqtlocation-mapboxgl-426242fe412057e2a6572e100e652e31917da419.tar.gz
[core] change bool to enum class bool TileLoadState
Diffstat (limited to 'test')
-rw-r--r--test/src/mbgl/test/stub_style_observer.hpp6
-rw-r--r--test/style/source.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp
index 879b06d6b8..4de3430fcc 100644
--- a/test/src/mbgl/test/stub_style_observer.hpp
+++ b/test/src/mbgl/test/stub_style_observer.hpp
@@ -34,8 +34,8 @@ public:
if (sourceError) sourceError(source, error);
}
- void onTileLoaded(Source& source, const OverscaledTileID& tileID, bool isNewTile) override {
- if (tileLoaded) tileLoaded(source, tileID, isNewTile);
+ void onTileLoaded(Source& source, const OverscaledTileID& tileID, TileLoadState loadState) override {
+ if (tileLoaded) tileLoaded(source, tileID, loadState);
}
void
@@ -57,7 +57,7 @@ public:
std::function<void (std::exception_ptr)> spriteError;
std::function<void (Source&)> sourceLoaded;
std::function<void (Source&, std::exception_ptr)> sourceError;
- std::function<void (Source&, const OverscaledTileID&, bool isNewTile)> tileLoaded;
+ std::function<void (Source&, const OverscaledTileID&, TileLoadState)> tileLoaded;
std::function<void (Source&, const OverscaledTileID&, std::exception_ptr)> tileError;
std::function<void (Source&, const OverscaledTileID&)> tileUpdated;
std::function<void (std::exception_ptr)> resourceError;
diff --git a/test/style/source.cpp b/test/style/source.cpp
index bffe89a8c3..a33467dedb 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -123,7 +123,7 @@ TEST(Source, RasterTileEmpty) {
return response;
};
- test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, bool) {
+ test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, TileLoadState) {
EXPECT_EQ("source", source.getID());
test.end();
};
@@ -152,7 +152,7 @@ TEST(Source, VectorTileEmpty) {
return response;
};
- test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, bool) {
+ test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, TileLoadState) {
EXPECT_EQ("source", source.getID());
test.end();
};
@@ -298,7 +298,7 @@ TEST(Source, RasterTileCancel) {
return optional<Response>();
};
- test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, bool) {
+ test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, TileLoadState) {
FAIL() << "Should never be called";
};
@@ -325,7 +325,7 @@ TEST(Source, VectorTileCancel) {
return optional<Response>();
};
- test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, bool) {
+ test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, TileLoadState) {
FAIL() << "Should never be called";
};