[core] Eliminate platform::assetRoot()

I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
This commit is contained in:
John Firebaugh
2016-01-11 15:00:56 -08:00
parent 86c8446d3a
commit 5a7d2fd60e
29 changed files with 29 additions and 89 deletions

View File

@@ -18,9 +18,10 @@ TEST(API, RepeatedRender) {
auto display = std::make_shared<mbgl::HeadlessDisplay>();
HeadlessView view(display, 1, 256, 512);
#ifdef MBGL_ASSET_ZIP
DefaultFileSource fileSource(":memory", "test/fixtures/api/assets.zip");
// Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/`
DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip");
#else
DefaultFileSource fileSource;
DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
#endif
Log::setObserver(std::make_unique<FixtureLogObserver>());
@@ -40,7 +41,7 @@ TEST(API, RepeatedRender) {
}
{
map.setStyleJSON(style, "TEST_DATA/suite");
map.setStyleJSON(style, "");
std::promise<PremultipliedImage> promise;
map.renderStill([&promise](std::exception_ptr, PremultipliedImage&& image) {
promise.set_value(std::move(image));