* Refactoring online file source so that tile server configuration is not hardcoded - part 1 * Added default templates * Update from master * Renaming MGLAccountManager to MGLSettings. Passing ResourceOptions and TileServerOptions to relevant classes and method in order to remove mapbox hardocded configuration * Fixing build * Addedm missing theme * Unit tests fixes * Fixing unit tests, adding factory methods for creating predefined configuration. * Fixing mapbox unit tests * Additional unit test fixes * Making MapboxConfiguration default * Making get/set resource options available in all classes that inherits from FileSource * Making get/set resource options available in all classes that inherits from FileSource - part 2 * Fixes for Android * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Removing hardcoded configuration in iOS project - part 1 * Fixing wrong file extension, making use of tile server options. * Use apiKey and MGL_API_KEY everywhere * Just a rename * Re-enabling tests and improving MGLSettings init * Removing mapbox hardcoded configuration, using api key everywhere, implementing JNI conversion for TileServerOptions * Lint issues. * Integrating configurable tile server properties into Android SDK - part 2 * Removing mabox accounts * Exposing multiple configurations to Android SDK - bug fixes * Removing TileServerOptions from public interface - native methods dont work before mapbox-gl library is loaded * Adding support for configurable predefined styles * Migrating predefined styles in test app + cleanup * Parameter fix * Bug fixes * Fixing render test build * Fixing offline tester * Fixing benchmark tool * Fix: typo in method name * Adding code for public access to TileServerOptions * Bug fixes and debug code removal * Fixes for macOS, adding unit tests from MapLibre, removing redundant members from OnlineFileSource * Unit test fixes * MacOS test app - migrating to configurable tile server options, part 1 * Fixing offline maps * Migrating macOS test app to MapTiler * Minor improvements * Putting back apiKey test * Added unit tests for MapTiler configuration * Migrating test resources to MapTiler * minor fix * A few fixes * Fixing macOS tests, removing feedback functionality * Migrating ios test app to MapTiler * Migrating ui tests * UI tests fix * Benchmarking app fix * Cleanup and strings updates * Migrating benchmark app to maptiler * API key injection in benchmark app * Putting back release configuration * Additional tests and fixing issues identified by thread sanitizer. * Removing test filters * Fixes and addressing lint issues * More Maptiler tests + minro fix * Android instrumentation test migration to MapTiler. Exposing missing TileServerOptions in Android SDK. Minor fixes. * No requirements on API key format. * Fixing offline cache test tool * Adding configurable domain name for sources, adding source domain int MapTiler configuration, cleanup * Migrating tests to MapTiler, adding code for canonicalizing URLs, removing mapbox stuff from comments, cleanup * More tests * Updated database size * Lint issues * Fixed test * Updating developer config API key * Fixes for Android, propagaing updated tileServerOptions to native file sources, more tests * Just a few more fixes * Propagating updated settings to file sources + additional unit test * Lint issues * Removing test filter and fixing incorrect uri * Release preparation * macos release notes
183 lines
5.6 KiB
C++
183 lines
5.6 KiB
C++
#include <mbgl/actor/actor_ref.hpp>
|
|
#include <mbgl/storage/asset_file_source.hpp>
|
|
#include <mbgl/storage/resource_options.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 <gtest/gtest.h>
|
|
#include <atomic>
|
|
|
|
using namespace mbgl;
|
|
|
|
#if !ANDROID
|
|
TEST(AssetFileSource, Load) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
// iOS seems to run out of file descriptors...
|
|
#if TARGET_OS_IPHONE
|
|
unsigned numThreads = 30;
|
|
#else
|
|
unsigned numThreads = 50;
|
|
#endif
|
|
std::atomic_uint completed(numThreads);
|
|
|
|
class TestWorker {
|
|
public:
|
|
TestWorker(ActorRef<TestWorker>, mbgl::AssetFileSource* fs_) : fs(fs_) {}
|
|
|
|
void run(std::function<void()> endCallback) {
|
|
const std::string asset("asset://nonempty");
|
|
|
|
requestCallback = [this, asset, endCallback](mbgl::Response res) {
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("content is here\n", *res.data);
|
|
|
|
if (!--numRequests) {
|
|
endCallback();
|
|
request.reset();
|
|
} else {
|
|
request = fs->request({ mbgl::Resource::Unknown, asset }, requestCallback);
|
|
}
|
|
};
|
|
|
|
request = fs->request({ mbgl::Resource::Unknown, asset }, requestCallback);
|
|
}
|
|
|
|
private:
|
|
unsigned numRequests = 1000;
|
|
|
|
mbgl::AssetFileSource* fs;
|
|
std::unique_ptr<mbgl::AsyncRequest> request;
|
|
|
|
std::function<void(mbgl::Response)> requestCallback;
|
|
};
|
|
|
|
std::vector<std::unique_ptr<util::Thread<TestWorker>>> threads;
|
|
|
|
for (unsigned i = 0; i < numThreads; ++i) {
|
|
std::unique_ptr<util::Thread<TestWorker>> thread =
|
|
std::make_unique<util::Thread<TestWorker>>("Test", &fs);
|
|
|
|
thread->actor().invoke(&TestWorker::run, [&] { if (!--completed) loop.stop(); });
|
|
threads.push_back(std::move(thread));
|
|
}
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, AcceptsURL) {
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("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) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://empty" }, [&](Response res) {
|
|
req.reset();
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("", *res.data);
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, NonEmptyFile) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://nonempty" }, [&](Response res) {
|
|
req.reset();
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("content is here\n", *res.data);
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, NonExistentFile) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://does_not_exist" }, [&](Response res) {
|
|
req.reset();
|
|
ASSERT_NE(nullptr, res.error);
|
|
EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
|
|
ASSERT_FALSE(res.data.get());
|
|
// Do not assert on platform-specific error message.
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, InvalidURL) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "test://wrong-scheme" }, [&](Response res) {
|
|
req.reset();
|
|
ASSERT_NE(nullptr, res.error);
|
|
EXPECT_EQ(Response::Error::Reason::Other, res.error->reason);
|
|
EXPECT_EQ("Invalid asset URL", res.error->message);
|
|
ASSERT_FALSE(res.data.get());
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, ReadDirectory) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://directory" }, [&](Response res) {
|
|
req.reset();
|
|
ASSERT_NE(nullptr, res.error);
|
|
EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
|
|
ASSERT_FALSE(res.data.get());
|
|
// Do not assert on platform-specific error message.
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(AssetFileSource, URLEncoding) {
|
|
util::RunLoop loop;
|
|
|
|
AssetFileSource fs(ResourceOptions::Default().withAssetPath("test/fixtures/storage/assets"));
|
|
|
|
std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://%6eonempty" }, [&](Response res) {
|
|
req.reset();
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("content is here\n", *res.data);
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
#endif
|