Showing the changes to test/api/BaseDecoderTest.cpp (1 of 5 files). Show all
Unified · Split
| @@ -46,10 +46,13 @@ static void ReadFrame (std::ifstream* file, BufferedData* buf) { · 45 unmodified lines | ||
| 46 | 46 | BaseDecoderTest::BaseDecoderTest() |
| 47 | 47 | : decoder_ (NULL), decodeStatus_ (OpenFile) {} |
| 48 | 48 | |
| 49 | −void BaseDecoderTest::SetUp() { | |
| 49 | +int32_t BaseDecoderTest::SetUp() { | |
| 50 | 50 | long rv = WelsCreateDecoder (&decoder_); |
| 51 | − ASSERT_EQ (0, rv); | |
| 52 | − ASSERT_TRUE (decoder_ != NULL); | |
| 51 | + EXPECT_EQ (0, rv); | |
| 52 | + EXPECT_TRUE (decoder_ != NULL); | |
| 53 | + if (decoder_ == NULL) { | |
| 54 | + return rv; | |
| 55 | + } | |
| 53 | 56 | |
| 54 | 57 | SDecodingParam decParam; |
| 55 | 58 | memset (&decParam, 0, sizeof (SDecodingParam)); |
| @@ -58,7 +61,8 @@ void BaseDecoderTest::SetUp() { · 2 unmodified lines | ||
| 58 | 61 | decParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT; |
| 59 | 62 | |
| 60 | 63 | rv = decoder_->Initialize (&decParam); |
| 61 | − ASSERT_EQ (0, rv); | |
| 64 | + EXPECT_EQ (0, rv); | |
| 65 | + return (int32_t)rv; | |
| 62 | 66 | } |
| 63 | 67 | |
| 64 | 68 | void BaseDecoderTest::TearDown() { |