From d3bc0103671e986cbf96b2658ac3760c715523ee Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 15 Dec 2014 22:48:32 +0000 Subject: [PATCH] Use expect near to see exact values for differences. BUG=269 TESTED=local unittest R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/32349004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1204 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- unit_test/convert_test.cc | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc index ee26015b0..86dd08867 100644 --- a/unit_test/convert_test.cc +++ b/unit_test/convert_test.cc @@ -657,30 +657,24 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##N) { \ } \ for (int i = 0; i < kHeight; ++i) { \ for (int j = 0; j < kWidth; ++j) { \ - int abs_diff = \ - abs(static_cast(dst_y_c[i * kWidth + j]) - \ - static_cast(dst_y_opt[i * kWidth + j])); \ - EXPECT_LE(abs_diff, DIFF); \ + EXPECT_NEAR(static_cast(dst_y_c[i * kWidth + j]), \ + static_cast(dst_y_opt[i * kWidth + j]), DIFF); \ } \ } \ for (int i = 0; i < SUBSAMPLE(kHeight, SUBSAMP_Y); ++i) { \ for (int j = 0; j < SUBSAMPLE(kWidth, SUBSAMP_X); ++j) { \ - int abs_diff = \ - abs(static_cast(dst_u_c[i * \ - SUBSAMPLE(kWidth, SUBSAMP_X) + j]) - \ - static_cast(dst_u_opt[i * \ - SUBSAMPLE(kWidth, SUBSAMP_X) + j])); \ - EXPECT_LE(abs_diff, DIFF); \ + EXPECT_NEAR(static_cast(dst_u_c[i * \ + SUBSAMPLE(kWidth, SUBSAMP_X) + j]), \ + static_cast(dst_u_opt[i * \ + SUBSAMPLE(kWidth, SUBSAMP_X) + j]), DIFF); \ } \ } \ for (int i = 0; i < SUBSAMPLE(kHeight, SUBSAMP_Y); ++i) { \ for (int j = 0; j < SUBSAMPLE(kWidth, SUBSAMP_X); ++j) { \ - int abs_diff = \ - abs(static_cast(dst_v_c[i * \ - SUBSAMPLE(kWidth, SUBSAMP_X) + j]) - \ - static_cast(dst_v_opt[i * \ - SUBSAMPLE(kWidth, SUBSAMP_X) + j])); \ - EXPECT_LE(abs_diff, DIFF); \ + EXPECT_NEAR(static_cast(dst_v_c[i * \ + SUBSAMPLE(kWidth, SUBSAMP_X) + j]), \ + static_cast(dst_v_opt[i * \ + SUBSAMPLE(kWidth, SUBSAMP_X) + j]), DIFF); \ } \ } \ free_aligned_buffer_64(dst_y_c); \