Skip to content

Commit 78a3106

Browse files
alalekalalek
committed
imgproc(test): add checks for remove() call
1 parent 999f41f commit 78a3106

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎modules/imgcodecs/test/test_grfmt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ TEST_P(Imgcodecs_ExtSize, write_imageseq)
175175
EXPECT_LT(n, 1.);
176176
EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), img, img_gt);
177177
}
178-
remove(filename.c_str());
178+
EXPECT_EQ(0, remove(filename.c_str()));
179179
}
180180
}
181181

‎modules/imgcodecs/test/test_jpeg.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_progressive_jpeg)
123123

124124
EXPECT_EQ(0, cvtest::norm(img_jpg_progressive, img_jpg_normal, NORM_INF));
125125

126-
remove(output_progressive.c_str());
127-
remove(output_normal.c_str());
126+
EXPECT_EQ(0, remove(output_progressive.c_str()));
127+
EXPECT_EQ(0, remove(output_normal.c_str()));
128128
}
129129

130130
TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
@@ -148,8 +148,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
148148

149149
EXPECT_EQ(0, cvtest::norm(img_jpg_optimized, img_jpg_normal, NORM_INF));
150150

151-
remove(output_optimized.c_str());
152-
remove(output_normal.c_str());
151+
EXPECT_EQ(0, remove(output_optimized.c_str()));
152+
EXPECT_EQ(0, remove(output_normal.c_str()));
153153
}
154154

155155
TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg)
@@ -173,8 +173,8 @@ TEST(Imgcodecs_Jpeg, encode_decode_rst_jpeg)
173173

174174
EXPECT_EQ(0, cvtest::norm(img_jpg_rst, img_jpg_normal, NORM_INF));
175175

176-
remove(output_rst.c_str());
177-
remove(output_normal.c_str());
176+
EXPECT_EQ(0, remove(output_rst.c_str()));
177+
EXPECT_EQ(0, remove(output_normal.c_str()));
178178
}
179179

180180
#endif // HAVE_JPEG

‎modules/imgcodecs/test/test_png.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TEST(Imgcodecs_Png, write_big)
1717
EXPECT_EQ(13043, img.cols);
1818
EXPECT_EQ(13917, img.rows);
1919
ASSERT_NO_THROW(imwrite(dst_file, img));
20-
remove(dst_file.c_str());
20+
EXPECT_EQ(0, remove(dst_file.c_str()));
2121
}
2222

2323
TEST(Imgcodecs_Png, encode)

‎modules/imgcodecs/test/test_read_write.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TEST(Imgcodecs_Image, read_write_bmp)
5050
psnr = cvtest::PSNR(buf_loaded, image);
5151
EXPECT_GT(psnr, thresDbell);
5252

53-
remove(dst_name.c_str());
53+
EXPECT_EQ(0, remove(dst_name.c_str()));
5454
}
5555
}
5656

@@ -95,7 +95,7 @@ TEST_P(Imgcodecs_Image, read_write)
9595
psnr = cvtest::PSNR(buf_loaded, image);
9696
EXPECT_GT(psnr, thresDbell);
9797

98-
remove(full_name.c_str());
98+
EXPECT_EQ(0, remove(full_name.c_str()));
9999
}
100100

101101
const string exts[] = {

‎modules/imgcodecs/test/test_tiff.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ TEST(Imgcodecs_Tiff, decode_tile16384x16384)
4141
// not enough memory
4242
}
4343

44-
remove(file3.c_str());
45-
remove(file4.c_str());
44+
EXPECT_EQ(0, remove(file3.c_str()));
45+
EXPECT_EQ(0, remove(file4.c_str()));
4646
}
4747

4848
TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian)
@@ -88,7 +88,7 @@ TEST(Imgcodecs_Tiff, write_read_16bit_big_little_endian)
8888
EXPECT_EQ(0xDEAD, img.at<ushort>(0,0));
8989
EXPECT_EQ(0xBEEF, img.at<ushort>(0,1));
9090

91-
remove(filename.c_str());
91+
EXPECT_EQ(0, remove(filename.c_str()));
9292
}
9393
}
9494

@@ -143,7 +143,7 @@ TEST(Imgcodecs_Tiff, decode_infinite_rowsperstrip)
143143

144144
EXPECT_NO_THROW(cv::imread(filename, IMREAD_UNCHANGED));
145145

146-
remove(filename.c_str());
146+
EXPECT_EQ(0, remove(filename.c_str()));
147147
}
148148

149149
//==================================================================================================

‎modules/imgcodecs/test/test_webp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossless_webp)
4444
}
4545
}
4646

47-
remove(output.c_str());
47+
EXPECT_EQ(0, remove(output.c_str()));
4848

4949
cv::Mat decode = cv::imdecode(buf, IMREAD_COLOR);
5050
ASSERT_FALSE(decode.empty());
@@ -71,7 +71,7 @@ TEST(Imgcodecs_WebP, encode_decode_lossy_webp)
7171

7272
EXPECT_NO_THROW(cv::imwrite(output, img, params));
7373
cv::Mat img_webp = cv::imread(output);
74-
remove(output.c_str());
74+
EXPECT_EQ(0, remove(output.c_str()));
7575
EXPECT_FALSE(img_webp.empty());
7676
EXPECT_EQ(3, img_webp.channels());
7777
EXPECT_EQ(512, img_webp.cols);
@@ -96,7 +96,7 @@ TEST(Imgcodecs_WebP, encode_decode_with_alpha_webp)
9696

9797
EXPECT_NO_THROW(cv::imwrite(output, img));
9898
cv::Mat img_webp = cv::imread(output);
99-
remove(output.c_str());
99+
EXPECT_EQ(0, remove(output.c_str()));
100100
EXPECT_FALSE(img_webp.empty());
101101
EXPECT_EQ(4, img_webp.channels());
102102
EXPECT_EQ(512, img_webp.cols);

0 commit comments

Comments
 (0)