update uv_zip and add tests

This commit is contained in:
Konstantin Käfer
2015-02-16 18:30:19 -08:00
parent 8d3c2b3d30
commit fe0baffe0d
11 changed files with 144 additions and 32 deletions

View File

@@ -4,12 +4,16 @@
#include <mbgl/storage/default_file_source.hpp>
TEST_F(Storage, ReadDirectory) {
TEST_F(Storage, AssetReadDirectory) {
SCOPED_TEST(ReadDirectory)
using namespace mbgl;
#ifdef MBGL_ASSET_ZIP
DefaultFileSource fs(nullptr, uv_default_loop(), "test/fixtures/storage/assets.zip");
#else
DefaultFileSource fs(nullptr, uv_default_loop());
#endif
fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage" }, uv_default_loop(), [&](const Response &res) {
EXPECT_EQ(Response::Error, res.status);
@@ -17,7 +21,11 @@ TEST_F(Storage, ReadDirectory) {
EXPECT_EQ(0, res.expires);
EXPECT_EQ(0, res.modified);
EXPECT_EQ("", res.etag);
#ifdef MBGL_ASSET_ZIP
EXPECT_EQ("No such file", res.message);
#elif MBGL_ASSET_FS
EXPECT_EQ("illegal operation on a directory", res.message);
#endif
ReadDirectory.finish();
});