1a684c1f48
Since 9a9408e811, we marked tiles as non-renderable if an error occured. This lead to situations where a tile was loaded + parsed successfully, then a revalidation attempt occured (e.g. because the resource was stale) which failed. In this case, we used to mark the tile as non-renderable although we could've used the perfectly parsed (stale) resource.
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
C++
#include <mbgl/test/util.hpp>
|
|
#include <mbgl/test/fake_file_source.hpp>
|
|
#include <mbgl/tile/raster_tile.hpp>
|
|
#include <mbgl/tile/tile_loader_impl.hpp>
|
|
|
|
#include <mbgl/style/style.hpp>
|
|
#include <mbgl/util/default_thread_pool.hpp>
|
|
#include <mbgl/util/run_loop.hpp>
|
|
#include <mbgl/map/transform.hpp>
|
|
#include <mbgl/annotation/annotation_manager.hpp>
|
|
#include <mbgl/renderer/tile_parameters.hpp>
|
|
#include <mbgl/renderer/buckets/raster_bucket.hpp>
|
|
#include <mbgl/renderer/image_manager.hpp>
|
|
#include <mbgl/text/glyph_manager.hpp>
|
|
|
|
using namespace mbgl;
|
|
|
|
class RasterTileTest {
|
|
public:
|
|
FakeFileSource fileSource;
|
|
TransformState transformState;
|
|
util::RunLoop loop;
|
|
ThreadPool threadPool { 1 };
|
|
style::Style style { loop, fileSource, 1 };
|
|
AnnotationManager annotationManager { style };
|
|
ImageManager imageManager;
|
|
GlyphManager glyphManager { fileSource };
|
|
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
|
|
|
|
TileParameters tileParameters {
|
|
1.0,
|
|
MapDebugOptions(),
|
|
transformState,
|
|
threadPool,
|
|
fileSource,
|
|
MapMode::Continuous,
|
|
annotationManager,
|
|
imageManager,
|
|
glyphManager,
|
|
0
|
|
};
|
|
};
|
|
|
|
TEST(RasterTile, setError) {
|
|
RasterTileTest test;
|
|
RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
|
|
tile.setError(std::make_exception_ptr(std::runtime_error("test")));
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(RasterTile, onError) {
|
|
RasterTileTest test;
|
|
RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
|
|
tile.onError(std::make_exception_ptr(std::runtime_error("test")));
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(RasterTile, onParsed) {
|
|
RasterTileTest test;
|
|
RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
|
|
tile.onParsed(std::make_unique<RasterBucket>(PremultipliedImage{}));
|
|
EXPECT_TRUE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
|
|
// Make sure that once we've had a renderable tile and then receive erroneous data, we retain
|
|
// the previously rendered data and keep the tile renderable.
|
|
tile.setError(std::make_exception_ptr(std::runtime_error("Connection offline")));
|
|
EXPECT_TRUE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
|
|
// Then simulate a parsing failure and make sure that we keep it renderable in this situation
|
|
// as well.
|
|
tile.onError(std::make_exception_ptr(std::runtime_error("Parse error")), 0);
|
|
ASSERT_TRUE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|
|
|
|
TEST(RasterTile, onParsedEmpty) {
|
|
RasterTileTest test;
|
|
RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
|
|
tile.onParsed(nullptr);
|
|
EXPECT_FALSE(tile.isRenderable());
|
|
EXPECT_TRUE(tile.isLoaded());
|
|
EXPECT_TRUE(tile.isComplete());
|
|
}
|