* 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
208 lines
6.6 KiB
C++
208 lines
6.6 KiB
C++
#include <mbgl/storage/http_file_source.hpp>
|
|
#include <mbgl/storage/resource.hpp>
|
|
#include <mbgl/test/util.hpp>
|
|
#include <mbgl/util/chrono.hpp>
|
|
#include <mbgl/util/exception.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <mbgl/util/string.hpp>
|
|
#include <mbgl/storage/resource_options.hpp>
|
|
|
|
using namespace mbgl;
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response) {
|
|
ADD_FAILURE() << "Callback should not be called";
|
|
});
|
|
|
|
loop.runOnce();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response res) {
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("Hello World!", *res.data);
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP404)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) {
|
|
ASSERT_NE(nullptr, res.error);
|
|
EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
|
|
EXPECT_EQ("HTTP status code 404", res.error->message);
|
|
EXPECT_FALSE(bool(res.data));
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTPTile404)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Tile, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) {
|
|
EXPECT_TRUE(res.noContent);
|
|
EXPECT_FALSE(bool(res.error));
|
|
EXPECT_FALSE(bool(res.data));
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200EmptyData)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/empty-data" }, [&](Response res) {
|
|
EXPECT_FALSE(res.noContent);
|
|
EXPECT_FALSE(bool(res.error));
|
|
EXPECT_EQ(*res.data, std::string());
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP204)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/no-content" }, [&](Response res) {
|
|
EXPECT_TRUE(res.noContent);
|
|
EXPECT_FALSE(bool(res.error));
|
|
EXPECT_FALSE(bool(res.data));
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP500)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" }, [&](Response res) {
|
|
ASSERT_NE(nullptr, res.error);
|
|
EXPECT_EQ(Response::Error::Reason::Server, res.error->reason);
|
|
EXPECT_EQ("HTTP status code 500", res.error->message);
|
|
EXPECT_FALSE(bool(res.data));
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(ExpiresParsing)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown,
|
|
"http://127.0.0.1:3000/test?modified=1420794326&expires=1420797926&etag=foo" }, [&](Response res) {
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("Hello World!", *res.data);
|
|
EXPECT_EQ(Timestamp{ Seconds(1420797926) }, res.expires);
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_EQ(Timestamp{ Seconds(1420794326) }, res.modified);
|
|
EXPECT_EQ("foo", *res.etag);
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" }, [&](Response res) {
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ("Hello World!", *res.data);
|
|
EXPECT_GT(Seconds(2), util::abs(*res.expires - util::now() - Seconds(120))) << "Expiration date isn't about 120 seconds in the future";
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
loop.stop();
|
|
});
|
|
|
|
loop.run();
|
|
}
|
|
|
|
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Load)) {
|
|
util::RunLoop loop;
|
|
HTTPFileSource fs(ResourceOptions::Default());
|
|
|
|
const int concurrency = 50;
|
|
const int max = 10000;
|
|
int number = 1;
|
|
|
|
std::unique_ptr<AsyncRequest> reqs[concurrency];
|
|
|
|
std::function<void(int)> req = [&](int i) {
|
|
const auto current = number++;
|
|
reqs[i] = fs.request({ Resource::Unknown,
|
|
std::string("http://127.0.0.1:3000/load/") + util::toString(current) },
|
|
[&, i, current](Response res) {
|
|
reqs[i].reset();
|
|
EXPECT_EQ(nullptr, res.error);
|
|
ASSERT_TRUE(res.data.get());
|
|
EXPECT_EQ(std::string("Request ") + util::toString(current), *res.data);
|
|
EXPECT_FALSE(bool(res.expires));
|
|
EXPECT_FALSE(res.mustRevalidate);
|
|
EXPECT_FALSE(bool(res.modified));
|
|
EXPECT_FALSE(bool(res.etag));
|
|
|
|
if (number <= max) {
|
|
req(i);
|
|
} else if (current == max) {
|
|
loop.stop();
|
|
}
|
|
});
|
|
};
|
|
|
|
for (int i = 0; i < concurrency; i++) {
|
|
req(i);
|
|
}
|
|
|
|
loop.run();
|
|
}
|