diff options
author | James Zern <jzern@google.com> | 2014-08-01 19:17:55 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-01 19:17:55 -0700 |
commit | fffe4768e35027cf5b308e5e7c8f665e3129228d (patch) | |
tree | 0802d477bd5d2183a5335de79258fcc7d0c8fa0f | |
parent | ce896df057ed3eb39c8be13c69ce964a926fc980 (diff) | |
parent | e04273f7b690a73210e7c0ac1cb37d28cfc2e538 (diff) | |
download | libvpx-fffe4768e35027cf5b308e5e7c8f665e3129228d.tar libvpx-fffe4768e35027cf5b308e5e7c8f665e3129228d.tar.gz libvpx-fffe4768e35027cf5b308e5e7c8f665e3129228d.tar.bz2 libvpx-fffe4768e35027cf5b308e5e7c8f665e3129228d.zip |
Merge "frame_size_tests: cosmetics"
-rw-r--r-- | test/frame_size_tests.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc index 34ee8b605..2400c2021 100644 --- a/test/frame_size_tests.cc +++ b/test/frame_size_tests.cc @@ -7,13 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include <climits> -#include <vector> #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/codec_factory.h" -#include "test/encode_test_driver.h" -#include "test/i420_video_source.h" -#include "test/util.h" +#include "test/video_source.h" namespace { @@ -33,10 +29,7 @@ class VP9FrameSizeTestsLarge virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec, const libvpx_test::VideoSource &video, libvpx_test::Decoder *decoder) { - EXPECT_EQ(expected_res_, res_dec) - << "Expected " << expected_res_ - << "but got " << res_dec; - + EXPECT_EQ(expected_res_, res_dec) << decoder->DecodeError(); return !::testing::Test::HasFailure(); } |