diff options
Diffstat (limited to 'test/storage/asset_file_source.test.cpp')
-rw-r--r-- | test/storage/asset_file_source.test.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp index 978a41a306..694d56be6d 100644 --- a/test/storage/asset_file_source.test.cpp +++ b/test/storage/asset_file_source.test.cpp @@ -33,8 +33,8 @@ TEST(AssetFileSource, Load) { 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); + ASSERT_TRUE(res.data); + EXPECT_EQ("content is here\n", *res.data.uncompressedData()); if (!--numRequests) { endCallback(); @@ -86,8 +86,8 @@ TEST(AssetFileSource, EmptyFile) { 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); + ASSERT_TRUE(res.data); + EXPECT_EQ("", *res.data.uncompressedData()); loop.stop(); }); @@ -102,8 +102,8 @@ TEST(AssetFileSource, NonEmptyFile) { 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); + ASSERT_TRUE(res.data); + EXPECT_EQ("content is here\n", *res.data.uncompressedData()); loop.stop(); }); @@ -119,7 +119,7 @@ TEST(AssetFileSource, NonExistentFile) { req.reset(); ASSERT_NE(nullptr, res.error); EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); - ASSERT_FALSE(res.data.get()); + ASSERT_FALSE(res.data); // Do not assert on platform-specific error message. loop.stop(); }); @@ -137,7 +137,7 @@ TEST(AssetFileSource, InvalidURL) { 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()); + ASSERT_FALSE(res.data); loop.stop(); }); @@ -153,7 +153,7 @@ TEST(AssetFileSource, ReadDirectory) { req.reset(); ASSERT_NE(nullptr, res.error); EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); - ASSERT_FALSE(res.data.get()); + ASSERT_FALSE(res.data); // Do not assert on platform-specific error message. loop.stop(); }); @@ -169,8 +169,8 @@ TEST(AssetFileSource, URLEncoding) { 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); + ASSERT_TRUE(res.data); + EXPECT_EQ("content is here\n", *res.data.uncompressedData()); loop.stop(); }); |