summaryrefslogtreecommitdiff
path: root/test/storage/asset_file_source.test.cpp
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-10-04 15:02:01 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2020-01-13 10:57:23 +0200
commit879c44f661c5eb762c93a721b657859a71aabfc7 (patch)
tree3a542777434e0d685811ce1c66b752dc9ca36e92 /test/storage/asset_file_source.test.cpp
parent86a360534994cb37d3dddc53b71a2858d97419c3 (diff)
downloadqtlocation-mapboxgl-879c44f661c5eb762c93a721b657859a71aabfc7.tar.gz
[core] Modularize FileSource codebase (#15768)
* [core] Introduce FileSourceManager and use it for default platform impl - Add `FileSourceManager` interface that provides access to `FileSource` instances and means of registering / unregistering `FileSource` factories - Split `DefaultFileSource` into smaller parts - Add `DatabaseFileSource` interface and it's default implementation - Remove inter-dependencies between concrete `FileSource` classes * [build] Add files to next build system * [core] Add generic property setters / getters * [core] Remove setOnlineStatus from OnlineFileSource interface * [core] Hide threading implementation details from DatabaseFileSource interface * [core] Make DB file source methods virtual * [core] Add documentation for DatabaseFileSource and rename one method * [core] Use simple callback instead of ActorRef * [core] Remove ActorRef from OnlineFileSource public header * [core] Add callback to FileSource::forward async API * [core] Pass OfflineRegionDefinition by value * [core] Update tests to use modular file sources * [core] Update unit tests * [core] Update unit tests after rebase * [core] Backport low prio fix for cached requests * [core] Backport pack database * [core] Return removed factory from unRegisterFileSourceFactory * [core] Rename shadowed args in onlinefilesource * [core] Remove simple std::function callback aliases * [core] Expose online file source property keys in public header file * [test-runner] Add proxy file source test runner * [cache] Update mbgl-cache utility to use new file source * [metrics] Rebaseline binary size metrics * [offline] Update offline utility * [core] Update changelog
Diffstat (limited to 'test/storage/asset_file_source.test.cpp')
-rw-r--r--test/storage/asset_file_source.test.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp
index 978a41a306..ac04bc7dc2 100644
--- a/test/storage/asset_file_source.test.cpp
+++ b/test/storage/asset_file_source.test.cpp
@@ -1,9 +1,10 @@
+#include <mbgl/actor/actor_ref.hpp>
#include <mbgl/storage/asset_file_source.hpp>
-#include <mbgl/util/platform.hpp>
+#include <mbgl/storage/resource.hpp>
#include <mbgl/util/chrono.hpp>
+#include <mbgl/util/platform.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/thread.hpp>
-#include <mbgl/actor/actor_ref.hpp>
#include <gtest/gtest.h>
#include <atomic>
@@ -70,12 +71,13 @@ TEST(AssetFileSource, Load) {
}
TEST(AssetFileSource, AcceptsURL) {
- EXPECT_TRUE(AssetFileSource::acceptsURL("asset://empty"));
- EXPECT_TRUE(AssetFileSource::acceptsURL("asset:///test"));
- EXPECT_FALSE(AssetFileSource::acceptsURL("assds://foo"));
- EXPECT_FALSE(AssetFileSource::acceptsURL("asset:"));
- EXPECT_FALSE(AssetFileSource::acceptsURL("style.json"));
- EXPECT_FALSE(AssetFileSource::acceptsURL(""));
+ AssetFileSource fs("test/fixtures/storage/assets");
+ EXPECT_TRUE(fs.canRequest(Resource::style("asset://empty")));
+ EXPECT_TRUE(fs.canRequest(Resource::style("asset:///test")));
+ EXPECT_FALSE(fs.canRequest(Resource::style("assds://foo")));
+ EXPECT_FALSE(fs.canRequest(Resource::style("asset:")));
+ EXPECT_FALSE(fs.canRequest(Resource::style("style.json")));
+ EXPECT_FALSE(fs.canRequest(Resource::style("")));
}
TEST(AssetFileSource, EmptyFile) {