diff --git a/trunk/src/utest/srs_utest_amf0.cpp b/trunk/src/utest/srs_utest_amf0.cpp index a76f22464..4b65e13c4 100644 --- a/trunk/src/utest/srs_utest_amf0.cpp +++ b/trunk/src/utest/srs_utest_amf0.cpp @@ -526,6 +526,8 @@ VOID TEST(ProtocolAMF0Test, ApiAnyElem) */ VOID TEST(ProtocolAMF0Test, ApiAnyIO) { + srs_error_t err; + SrsAmf0Any* o = NULL; char buf[1024]; @@ -539,14 +541,15 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) o = SrsAmf0Any::object_eof(); SrsAutoFree(SrsAmf0Any, o); - - EXPECT_EQ(srs_success, o->read(&s)); + + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_EQ(3, s.pos()); s.skip(-1 * s.pos()); (s.data() + s.pos())[0] = 0x01; - EXPECT_NE(srs_success, o->read(&s)); + + HELPER_EXPECT_FAILED(o->read(&s)); } if (true) { s.skip(-1 * s.pos()); @@ -580,7 +583,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) s.skip(-1 * s.pos()); (s.data() + s.pos())[3] = 'x'; - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_STREQ("xinlin", o->to_str().c_str()); } @@ -599,7 +602,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) EXPECT_EQ(0, s.read_1bytes()); s.skip(-1 * s.pos()); - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_DOUBLE_EQ(10, o->to_number()); } @@ -618,7 +621,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) EXPECT_EQ(1, s.read_1bytes()); s.skip(-1 * s.pos()); - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_TRUE(o->to_boolean()); } @@ -635,7 +638,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) EXPECT_EQ(1, s.read_1bytes()); s.skip(-1 * s.pos()); - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_FALSE(o->to_boolean()); } @@ -654,7 +657,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) EXPECT_EQ(5, s.read_1bytes()); s.skip(-1 * s.pos()); - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_TRUE(o->is_null()); } @@ -673,7 +676,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) EXPECT_EQ(6, s.read_1bytes()); s.skip(-1 * s.pos()); - EXPECT_EQ(srs_success, o->read(&s)); + HELPER_EXPECT_SUCCESS(o->read(&s)); EXPECT_EQ(o->total_size(), s.pos()); EXPECT_TRUE(o->is_undefined()); } @@ -838,6 +841,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyIO) */ VOID TEST(ProtocolAMF0Test, ApiAnyTypeAssert) { + srs_error_t err; SrsAmf0Any* o = NULL; char buf[1024]; @@ -848,7 +852,7 @@ VOID TEST(ProtocolAMF0Test, ApiAnyTypeAssert) if (true) { s.skip(-1 * s.pos()); (s.data() + s.pos())[0] = 0x12; - EXPECT_NE(srs_success, srs_amf0_read_any(&s, &o)); + HELPER_EXPECT_FAILED(srs_amf0_read_any(&s, &o)); EXPECT_TRUE(NULL == o); srs_freep(o); }