StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

bool status -> bool status_ok (tests:raw_decode)

Browse Source
This commit is contained in:
Alexandra Latysheva 2020-10-19 10:40:19 +00:00
parent 316828a219
commit 1350cfb3b6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oss-internship-2020/libtiff/test/raw_decode.cc
View File

@ -138,8 +138,8 @@ bool CheckRgbaPixel(uint32_t pixel, const ChannelLimits& limits,
TEST(SandboxTest, RawDecode) { TEST(SandboxTest, RawDecode) {
tsize_t sz; tsize_t sz;
bool pixel_status = false; bool pixel_status_ok = false;
bool cluster_status = false; bool cluster_status_ok = false;
std::string srcfile = GetFilePath("quad-tile.jpg.tiff"); std::string srcfile = GetFilePath("quad-tile.jpg.tiff");
TiffSapiSandbox sandbox(srcfile); TiffSapiSandbox sandbox(srcfile);
@ -187,9 +187,9 @@ TEST(SandboxTest, RawDecode) {
<< (int)status_or_long.value() << " instead of " << (int)sz << ")"; << (int)status_or_long.value() << " instead of " << (int)sz << ")";
for (const auto& [id, data] : kClusters) { for (const auto& [id, data] : kClusters) {
cluster_status |= CheckCluster(id, buffer_, data); cluster_status_ok |= CheckCluster(id, buffer_, data);
} }
ASSERT_FALSE(cluster_status) << "Clusters did not match expected results"; ASSERT_FALSE(cluster_status_ok) << "Clusters did not match expected results";
status_or_int = status_or_int =
api.TIFFSetFieldU1(&tif, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB); api.TIFFSetFieldU1(&tif, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
@ -213,7 +213,7 @@ TEST(SandboxTest, RawDecode) {
<< status_or_long.value() << " instead of " << sz; << status_or_long.value() << " instead of " << sz;
for (const auto& [id, data] : kLimits) { for (const auto& [id, data] : kLimits) {
pixel_status |= CheckRgbPixel(id, data, buffer2_); pixel_status_ok |= CheckRgbPixel(id, data, buffer2_);
} }
ASSERT_THAT(api.TIFFClose(&tif), IsOk()) << "TIFFClose fatal error"; ASSERT_THAT(api.TIFFClose(&tif), IsOk()) << "TIFFClose fatal error";
@ -234,11 +234,11 @@ TEST(SandboxTest, RawDecode) {
<< "TIFFReadRGBATile() returned failure code"; << "TIFFReadRGBATile() returned failure code";
for (const auto& [id, data] : kLimits) { for (const auto& [id, data] : kLimits) {
pixel_status |= CheckRgbaPixel(id, data, rgba_buffer_); pixel_status_ok |= CheckRgbaPixel(id, data, rgba_buffer_);
} }
EXPECT_THAT(api.TIFFClose(&tif2), IsOk()) << "TIFFClose fatal error"; EXPECT_THAT(api.TIFFClose(&tif2), IsOk()) << "TIFFClose fatal error";
EXPECT_THAT(pixel_status, IsFalse()) << "wrong encoding"; EXPECT_THAT(pixel_status_ok, IsFalse()) << "wrong encoding";
} }
} // namespace } // namespace