From 0ee386b656d7924c1c69ab1050c26ff9f2385ba6 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 25 Apr 2019 08:51:38 +0800 Subject: [PATCH] Refine http parser code. --- trunk/src/utest/srs_utest.hpp | 4 ++++ trunk/src/utest/srs_utest_protocol.cpp | 29 ++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/trunk/src/utest/srs_utest.hpp b/trunk/src/utest/srs_utest.hpp index f9222fe43..fb96274e6 100644 --- a/trunk/src/utest/srs_utest.hpp +++ b/trunk/src/utest/srs_utest.hpp @@ -40,6 +40,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // we add an empty macro for upp to show the smart tips. #define VOID +// For errors. +#define HELPER_EXPECT_SUCCESS(x) EXPECT_TRUE(srs_success == (err = x)); srs_freep(err) +#define HELPER_EXPECT_FAILED(x) EXPECT_TRUE(srs_success != (err = x)); srs_freep(err) + // the asserts of gtest: // * {ASSERT|EXPECT}_EQ(expected, actual): Tests that expected == actual // * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2 diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 919349696..b704c0ee5 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -5693,20 +5693,6 @@ MockParser::~MockParser() srs_freep(chunk_complete); } -srs_error_t MockParser::parse(string data) -{ - srs_error_t err = srs_success; - - const char* buf = (const char*)data.data(); - size_t size = (size_t)data.length(); - size_t nparsed = http_parser_execute(parser, &settings, buf, size); - if (nparsed != size) { - return srs_error_new(-1, "nparsed=%d, size=%d", nparsed, size); - } - - return err; -} - int MockParser::on_message_begin(http_parser* parser) { MockParser* obj = (MockParser*)parser->data; @@ -5827,8 +5813,19 @@ int MockParser::on_chunk_complete(http_parser* parser) return 0; } -#define HELPER_EXPECT_SUCCESS(x) EXPECT_TRUE(srs_success == (err = x)); srs_freep(err) -#define HELPER_EXPECT_FAILED(x) EXPECT_TRUE(srs_success != (err = x)); srs_freep(err) +srs_error_t MockParser::parse(string data) +{ + srs_error_t err = srs_success; + + const char* buf = (const char*)data.data(); + size_t size = (size_t)data.length(); + size_t nparsed = http_parser_execute(parser, &settings, buf, size); + if (nparsed != size) { + return srs_error_new(-1, "nparsed=%d, size=%d", nparsed, size); + } + + return err; +} VOID TEST(ProtocolHTTPTest, HTTPParser) {