summaryrefslogtreecommitdiff
path: root/test/map
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-01-13 17:10:13 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-02-10 15:40:20 -0800
commitdbb8e58aea00a84716aafa6887b50c0186169f9e (patch)
treee981b82badcf800d6d33acac94d44a78f7b57776 /test/map
parentf3d4107d19eef20cc2cf30cd347301128b4f9a86 (diff)
downloadqtlocation-mapboxgl-dbb8e58aea00a84716aafa6887b50c0186169f9e.tar.gz
[core] Moving caching logic to DefaultFileSource
This results in OnlineFileSource containing precisely the logic we want for reuse by OfflineFileSource, and no more.
Diffstat (limited to 'test/map')
-rw-r--r--test/map/map.cpp8
-rw-r--r--test/map/map_context.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/map/map.cpp b/test/map/map.cpp
index ed63bb085c..37caa95e97 100644
--- a/test/map/map.cpp
+++ b/test/map/map.cpp
@@ -12,7 +12,7 @@ TEST(Map, PauseResume) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- OnlineFileSource fileSource(nullptr);
+ OnlineFileSource fileSource;
Map map(view, fileSource, MapMode::Continuous);
@@ -25,7 +25,7 @@ TEST(Map, DoublePause) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- OnlineFileSource fileSource(nullptr);
+ OnlineFileSource fileSource;
Map map(view, fileSource, MapMode::Continuous);
@@ -39,7 +39,7 @@ TEST(Map, ResumeWithoutPause) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- OnlineFileSource fileSource(nullptr);
+ OnlineFileSource fileSource;
Map map(view, fileSource, MapMode::Continuous);
@@ -51,7 +51,7 @@ TEST(Map, DestroyPaused) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- OnlineFileSource fileSource(nullptr);
+ OnlineFileSource fileSource;
Map map(view, fileSource, MapMode::Continuous);
diff --git a/test/map/map_context.cpp b/test/map/map_context.cpp
index 60cb3d6b7f..2f3576a3b5 100644
--- a/test/map/map_context.cpp
+++ b/test/map/map_context.cpp
@@ -12,7 +12,7 @@ using namespace mbgl;
TEST(MapContext, DoubleStyleLoad) {
std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>();
HeadlessView view(display, 1, 512, 512);
- OnlineFileSource fileSource(nullptr);
+ OnlineFileSource fileSource;
util::Thread<MapContext> context({"Map", util::ThreadType::Map, util::ThreadPriority::Regular},
view, fileSource, MapMode::Continuous, GLContextMode::Unique, view.getPixelRatio());