summaryrefslogtreecommitdiff
path: root/test/api
diff options
context:
space:
mode:
Diffstat (limited to 'test/api')
-rw-r--r--test/api/annotations.cpp24
-rw-r--r--test/api/api_misuse.cpp6
-rw-r--r--test/api/custom_layer.cpp4
-rw-r--r--test/api/repeated_render.cpp6
-rw-r--r--test/api/set_style.cpp4
5 files changed, 22 insertions, 22 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index 104ccd2f26..2c6bfdb679 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -6,7 +6,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/platform/default/headless_display.hpp>
#include <mbgl/platform/default/headless_view.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/online_file_source.hpp>
#include <mbgl/util/io.hpp>
#include <future>
@@ -27,7 +27,7 @@ void checkRendering(Map& map, const char * name) {
TEST(Annotations, PointAnnotation) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -40,7 +40,7 @@ TEST(Annotations, PointAnnotation) {
TEST(Annotations, LineAnnotation) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -59,7 +59,7 @@ TEST(Annotations, LineAnnotation) {
TEST(Annotations, FillAnnotation) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -77,7 +77,7 @@ TEST(Annotations, FillAnnotation) {
TEST(Annotations, StyleSourcedShapeAnnotation) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json"), "");
@@ -92,7 +92,7 @@ TEST(Annotations, StyleSourcedShapeAnnotation) {
TEST(Annotations, AddMultiple) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -109,7 +109,7 @@ TEST(Annotations, AddMultiple) {
TEST(Annotations, NonImmediateAdd) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -129,7 +129,7 @@ TEST(Annotations, NonImmediateAdd) {
TEST(Annotations, UpdatePoint) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -148,7 +148,7 @@ TEST(Annotations, UpdatePoint) {
TEST(Annotations, RemovePoint) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
@@ -165,7 +165,7 @@ TEST(Annotations, RemovePoint) {
TEST(Annotations, RemoveShape) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
AnnotationSegments segments = {{ {{ { 0, 0 }, { 45, 45 } }} }};
@@ -187,7 +187,7 @@ TEST(Annotations, RemoveShape) {
TEST(Annotations, ImmediateRemoveShape) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.removeAnnotation(map.addShapeAnnotation(ShapeAnnotation({}, {})));
@@ -199,7 +199,7 @@ TEST(Annotations, ImmediateRemoveShape) {
TEST(Annotations, SwitchStyle) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
diff --git a/test/api/api_misuse.cpp b/test/api/api_misuse.cpp
index 538f09a040..3ac6939b49 100644
--- a/test/api/api_misuse.cpp
+++ b/test/api/api_misuse.cpp
@@ -4,7 +4,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/platform/default/headless_display.hpp>
#include <mbgl/platform/default/headless_view.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/online_file_source.hpp>
#include <mbgl/util/exception.hpp>
#include <future>
@@ -18,7 +18,7 @@ TEST(API, RenderWithoutCallback) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
view.resize(128, 512);
- DefaultFileSource fileSource(nullptr);
+ OnlineFileSource fileSource(nullptr);
std::unique_ptr<Map> map = std::make_unique<Map>(view, fileSource, MapMode::Still);
map->renderStill(nullptr);
@@ -40,7 +40,7 @@ TEST(API, RenderWithoutStyle) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
view.resize(128, 512);
- DefaultFileSource fileSource(nullptr);
+ OnlineFileSource fileSource(nullptr);
Map map(view, fileSource, MapMode::Still);
diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp
index e98e2cfc0b..efe63d74c9 100644
--- a/test/api/custom_layer.cpp
+++ b/test/api/custom_layer.cpp
@@ -3,7 +3,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/platform/default/headless_display.hpp>
#include <mbgl/platform/default/headless_view.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/online_file_source.hpp>
#include <mbgl/layer/custom_layer.hpp>
#include <mbgl/util/io.hpp>
#include <mbgl/util/mat4.hpp>
@@ -66,7 +66,7 @@ public:
TEST(CustomLayer, Basic) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr, test::getFileSourceRoot());
+ OnlineFileSource fileSource(nullptr, test::getFileSourceRoot());
Map map(view, fileSource, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index d3d3926a49..0b2a87cc33 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -4,7 +4,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/platform/default/headless_view.hpp>
#include <mbgl/platform/default/headless_display.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/online_file_source.hpp>
#include <mbgl/util/image.hpp>
#include <mbgl/util/io.hpp>
@@ -18,9 +18,9 @@ TEST(API, RepeatedRender) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1, 256, 512);
#ifdef MBGL_ASSET_ZIP
- DefaultFileSource fileSource(nullptr, "test/fixtures/api/assets.zip");
+ OnlineFileSource fileSource(nullptr, "test/fixtures/api/assets.zip");
#else
- DefaultFileSource fileSource(nullptr);
+ OnlineFileSource fileSource(nullptr);
#endif
Log::setObserver(std::make_unique<FixtureLogObserver>());
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index 23dff0152c..f5c1592516 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -4,7 +4,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/platform/default/headless_view.hpp>
#include <mbgl/platform/default/headless_display.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/online_file_source.hpp>
TEST(API, SetStyle) {
@@ -12,7 +12,7 @@ TEST(API, SetStyle) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1);
- DefaultFileSource fileSource(nullptr);
+ OnlineFileSource fileSource(nullptr);
Log::setObserver(std::make_unique<FixtureLogObserver>());
View Lorry Controller Status