imgproc(test): add checks for remove() call

This commit is contained in:
Alexander Alekhin 2017-08-16 13:53:12 +03:00
parent 999f41fb4f
commit 78a310630f
6 changed files with 17 additions and 17 deletions

View File

@ -175,7 +175,7 @@ TEST_P(Imgcodecs_ExtSize, write_imageseq)
EXPECT_LT(n, 1.); EXPECT_LT(n, 1.);
EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), img, img_gt); EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), img, img_gt);
} }
remove(filename.c_str()); EXPECT_EQ(0, remove(filename.c_str()));
} }
} }

View File

@ -123,8 +123,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_progressive_jpeg)
EXPECT_EQ(0, cvtest::norm(img_jpg_progressive, img_jpg_normal, NORM_INF)); EXPECT_EQ(0, cvtest::norm(img_jpg_progressive, img_jpg_normal, NORM_INF));
remove(output_progressive.c_str()); EXPECT_EQ(0, remove(output_progressive.c_str()));
remove(output_normal.c_str()); EXPECT_EQ(0, remove(output_normal.c_str()));
} }
TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg) TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
@ -148,8 +148,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
EXPECT_EQ(0, cvtest::norm(img_jpg_optimized, img_jpg_normal, NORM_INF)); EXPECT_EQ(0, cvtest::norm(img_jpg_optimized, img_jpg_normal, NORM_INF));
remove(output_optimized.c_str()); EXPECT_EQ(0, remove(output_optimized.c_str()));
remove(output_normal.c_str()); EXPECT_EQ(0, remove(output_normal.c_str()));
} }
TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg) TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg)
@ -173,8 +173,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg)
EXPECT_EQ(0, cvtest::norm(img_jpg_rst, img_jpg_normal, NORM_INF)); EXPECT_EQ(0, cvtest::norm(img_jpg_rst, img_jpg_normal, NORM_INF));
remove(output_rst.c_str()); EXPECT_EQ(0, remove(output_rst.c_str()));
remove(output_normal.c_str()); EXPECT_EQ(0, remove(output_normal.c_str()));
} }
#endif // HAVE_JPEG #endif // HAVE_JPEG

View File

@ -17,7 +17,7 @@ TEST(Imgcodecs_Png, write_big)
EXPECT_EQ(13043, img.cols); EXPECT_EQ(13043, img.cols);
EXPECT_EQ(13917, img.rows); EXPECT_EQ(13917, img.rows);
ASSERT_NO_THROW(imwrite(dst_file, img)); ASSERT_NO_THROW(imwrite(dst_file, img));
remove(dst_file.c_str()); EXPECT_EQ(0, remove(dst_file.c_str()));
} }
TEST(Imgcodecs_Png, encode) TEST(Imgcodecs_Png, encode)

View File

@ -50,7 +50,7 @@ TEST(Imgcodecs_Image, read_write_bmp)
psnr = cvtest::PSNR(buf_loaded, image); psnr = cvtest::PSNR(buf_loaded, image);
EXPECT_GT(psnr, thresDbell); EXPECT_GT(psnr, thresDbell);
remove(dst_name.c_str()); EXPECT_EQ(0, remove(dst_name.c_str()));
} }
} }
@ -95,7 +95,7 @@ TEST_P(Imgcodecs_Image, read_write)
psnr = cvtest::PSNR(buf_loaded, image); psnr = cvtest::PSNR(buf_loaded, image);
EXPECT_GT(psnr, thresDbell); EXPECT_GT(psnr, thresDbell);
remove(full_name.c_str()); EXPECT_EQ(0, remove(full_name.c_str()));
} }
const string exts[] = { const string exts[] = {

View File

@ -41,8 +41,8 @@ TEST(Imgcodecs_Tiff, decode_tile16384x16384)
// not enough memory // not enough memory
} }
remove(file3.c_str()); EXPECT_EQ(0, remove(file3.c_str()));
remove(file4.c_str()); EXPECT_EQ(0, remove(file4.c_str()));
} }
TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian) TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian)
@ -88,7 +88,7 @@ TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian)
EXPECT_EQ(0xDEAD, img.at<ushort>(0,0)); EXPECT_EQ(0xDEAD, img.at<ushort>(0,0));
EXPECT_EQ(0xBEEF, img.at<ushort>(0,1)); EXPECT_EQ(0xBEEF, img.at<ushort>(0,1));
remove(filename.c_str()); EXPECT_EQ(0, remove(filename.c_str()));
} }
} }
@ -143,7 +143,7 @@ TEST(Imgcodecs_Tiff, decode_infinite_rowsperstrip)
EXPECT_NO_THROW(cv::imread(filename, IMREAD_UNCHANGED)); EXPECT_NO_THROW(cv::imread(filename, IMREAD_UNCHANGED));
remove(filename.c_str()); EXPECT_EQ(0, remove(filename.c_str()));
} }
//================================================================================================== //==================================================================================================

View File

@ -44,7 +44,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossless_webp)
} }
} }
remove(output.c_str()); EXPECT_EQ(0, remove(output.c_str()));
cv::Mat decode = cv::imdecode(buf, IMREAD_COLOR); cv::Mat decode = cv::imdecode(buf, IMREAD_COLOR);
ASSERT_FALSE(decode.empty()); ASSERT_FALSE(decode.empty());
@ -71,7 +71,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossy_webp)
EXPECT_NO_THROW(cv::imwrite(output, img, params)); EXPECT_NO_THROW(cv::imwrite(output, img, params));
cv::Mat img_webp = cv::imread(output); cv::Mat img_webp = cv::imread(output);
remove(output.c_str()); EXPECT_EQ(0, remove(output.c_str()));
EXPECT_FALSE(img_webp.empty()); EXPECT_FALSE(img_webp.empty());
EXPECT_EQ(3, img_webp.channels()); EXPECT_EQ(3, img_webp.channels());
EXPECT_EQ(512, img_webp.cols); EXPECT_EQ(512, img_webp.cols);
@ -96,7 +96,7 @@ TEST(Imgcodecs_WebP, encode_decode_with_alpha_webp)
EXPECT_NO_THROW(cv::imwrite(output, img)); EXPECT_NO_THROW(cv::imwrite(output, img));
cv::Mat img_webp = cv::imread(output); cv::Mat img_webp = cv::imread(output);
remove(output.c_str()); EXPECT_EQ(0, remove(output.c_str()));
EXPECT_FALSE(img_webp.empty()); EXPECT_FALSE(img_webp.empty());
EXPECT_EQ(4, img_webp.channels()); EXPECT_EQ(4, img_webp.channels());
EXPECT_EQ(512, img_webp.cols); EXPECT_EQ(512, img_webp.cols);