summaryrefslogtreecommitdiff
path: root/test/util
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-06-13 10:50:16 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit57351c068b133ed140ac7b991181672019fe5c24 (patch)
tree2a0be8819c2bc57b1cda7d5c6f98e725a030daa2 /test/util
parente35cbbae55ab01f33690b1bb2e918c5f8393b854 (diff)
downloadqtlocation-mapboxgl-57351c068b133ed140ac7b991181672019fe5c24.tar.gz
[core] split backend from mapobserver
Diffstat (limited to 'test/util')
-rw-r--r--test/util/memory.test.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp
index bca538c6c6..8fd27f2462 100644
--- a/test/util/memory.test.cpp
+++ b/test/util/memory.test.cpp
@@ -74,7 +74,7 @@ private:
TEST(Memory, Vector) {
MemoryTest test;
- Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
+ Map map(test.backend, MapObserver::nullObserver(), { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
map.setZoom(16); // more map features
map.getStyle().loadURL("mapbox://streets");
@@ -84,7 +84,7 @@ TEST(Memory, Vector) {
TEST(Memory, Raster) {
MemoryTest test;
- Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
+ Map map(test.backend, MapObserver::nullObserver(), { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
map.getStyle().loadURL("mapbox://satellite");
test::render(map, test.view);
@@ -125,7 +125,7 @@ TEST(Memory, Footprint) {
// Warm up buffers and cache.
for (unsigned i = 0; i < 10; ++i) {
- Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
+ Map map(test.backend, MapObserver::nullObserver(), { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still);
renderMap(map, "mapbox://streets");
renderMap(map, "mapbox://satellite");
};
@@ -139,8 +139,9 @@ TEST(Memory, Footprint) {
long vectorInitialRSS = mbgl::test::getCurrentRSS();
for (unsigned i = 0; i < runs; ++i) {
- auto vector = std::make_unique<Map>(test.backend, Size{ 256, 256 }, 2, test.fileSource,
- test.threadPool, MapMode::Still);
+ auto vector = std::make_unique<Map>(test.backend, MapObserver::nullObserver(),
+ Size{ 256, 256 }, 2, test.fileSource, test.threadPool,
+ MapMode::Still);
renderMap(*vector, "mapbox://streets");
maps.push_back(std::move(vector));
};
@@ -149,8 +150,9 @@ TEST(Memory, Footprint) {
long rasterInitialRSS = mbgl::test::getCurrentRSS();
for (unsigned i = 0; i < runs; ++i) {
- auto raster = std::make_unique<Map>(test.backend, Size{ 256, 256 }, 2, test.fileSource,
- test.threadPool, MapMode::Still);
+ auto raster = std::make_unique<Map>(test.backend, MapObserver::nullObserver(),
+ Size{ 256, 256 }, 2, test.fileSource, test.threadPool,
+ MapMode::Still);
renderMap(*raster, "mapbox://satellite");
maps.push_back(std::move(raster));
};