From e683f0771514db10f4cd38bac3a2cdcf1f141d31 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 22 Oct 2019 09:01:29 +0800 Subject: [PATCH] Cover JSON codec. 3.0.62 --- trunk/src/protocol/srs_protocol_json.cpp | 6 ++---- trunk/src/utest/srs_utest_amf0.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/trunk/src/protocol/srs_protocol_json.cpp b/trunk/src/protocol/srs_protocol_json.cpp index 2465dea93..a87159fdb 100644 --- a/trunk/src/protocol/srs_protocol_json.cpp +++ b/trunk/src/protocol/srs_protocol_json.cpp @@ -1577,7 +1577,7 @@ string SrsJsonAny::dumps() return "\"" + to_str() + "\""; } case SRS_JSON_Boolean: { - return to_boolean()? "true":"false"; + return to_boolean()? "true" : "false"; } case SRS_JSON_Integer: { return srs_int2str(to_integer()); @@ -1600,11 +1600,9 @@ string SrsJsonAny::dumps() return arr->dumps(); } default: { - break; + return "null"; } } - - return "null"; } SrsAmf0Any* SrsJsonAny::to_amf0() diff --git a/trunk/src/utest/srs_utest_amf0.cpp b/trunk/src/utest/srs_utest_amf0.cpp index e2e19e69b..b42823366 100644 --- a/trunk/src/utest/srs_utest_amf0.cpp +++ b/trunk/src/utest/srs_utest_amf0.cpp @@ -2561,5 +2561,17 @@ VOID TEST(ProtocolJSONTest, Dumps) EXPECT_STREQ("[]", p->dumps().c_str()); srs_freep(p); } + + if (true) { + SrsJsonAny* p = SrsJsonAny::object(); + EXPECT_STREQ("{}", p->dumps().c_str()); + srs_freep(p); + } + + if (true) { + SrsJsonAny* p = SrsJsonAny::array(); + EXPECT_STREQ("[]", p->dumps().c_str()); + srs_freep(p); + } }