bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix devtools_util_unittest.cc failures

Browse Source
This commit is contained in:
Nik Pavlov
2022-04-19 16:17:16 +00:00
committed by Marshall Greenblatt
parent b1cd9d1598
commit edef01f579
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libcef/browser/devtools/devtools_util.cc
View File

@ -30,7 +30,7 @@ bool ParseEvent(const base::StringPiece& message,
const size_t method_start = sizeof(kMethodStart) - 1; const size_t method_start = sizeof(kMethodStart) - 1;
const size_t method_end = message.find(kMethodEnd, method_start); const size_t method_end = message.find(kMethodEnd, method_start);
if (method_end < 0U) if (method_end == base::StringPiece::npos)
return false; return false;
method = message.substr(method_start, method_end - method_start); method = message.substr(method_start, method_end - method_start);
if (method.empty()) if (method.empty())
@ -77,7 +77,7 @@ bool ParseResult(const base::StringPiece& message,
const size_t id_start = sizeof(kIdStart) - 1; const size_t id_start = sizeof(kIdStart) - 1;
const size_t id_end = message.find(kIdEnd, id_start); const size_t id_end = message.find(kIdEnd, id_start);
if (id_end < 0U) if (id_end == base::StringPiece::npos)
return false; return false;
const base::StringPiece& id_str = message.substr(id_start, id_end - id_start); const base::StringPiece& id_str = message.substr(id_start, id_end - id_start);
if (id_str.empty() || !base::StringToInt(id_str, &message_id)) if (id_str.empty() || !base::StringToInt(id_str, &message_id))

34
libcef/browser/devtools/devtools_util_unittest.cc
View File

@ -83,7 +83,7 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsEvent) {
EXPECT_TRUE(parser.Initialize(message)); EXPECT_TRUE(parser.Initialize(message));
EXPECT_TRUE(parser.IsInitialized()); EXPECT_TRUE(parser.IsInitialized());
EXPECT_TRUE(parser.IsEvent()); EXPECT_TRUE(parser.IsEvent());
EXPECT_STREQ("Test.myMethod", parser.method_.data()); EXPECT_EQ("Test.myMethod", parser.method_);
EXPECT_TRUE(parser.params_.empty()); EXPECT_TRUE(parser.params_.empty());
parser.Reset(); parser.Reset();
@ -94,8 +94,8 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsEvent) {
EXPECT_TRUE(parser.Initialize(message)); EXPECT_TRUE(parser.Initialize(message));
EXPECT_TRUE(parser.IsInitialized()); EXPECT_TRUE(parser.IsInitialized());
EXPECT_TRUE(parser.IsEvent()); EXPECT_TRUE(parser.IsEvent());
EXPECT_STREQ("Test.myMethod2", parser.method_.data()); EXPECT_EQ("Test.myMethod2", parser.method_);
EXPECT_STREQ("{}", parser.params_.data()); EXPECT_EQ("{}", parser.params_);
parser.Reset(); parser.Reset();
EXPECT_FALSE(parser.IsInitialized()); EXPECT_FALSE(parser.IsInitialized());
@ -105,8 +105,8 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsEvent) {
EXPECT_TRUE(parser.Initialize(message)); EXPECT_TRUE(parser.Initialize(message));
EXPECT_TRUE(parser.IsInitialized()); EXPECT_TRUE(parser.IsInitialized());
EXPECT_TRUE(parser.IsEvent()); EXPECT_TRUE(parser.IsEvent());
EXPECT_STREQ("Test.myMethod3", parser.method_.data()); EXPECT_EQ("Test.myMethod3", parser.method_);
EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.data()); EXPECT_EQ("{\"foo\":\"bar\"}", parser.params_);
} }
TEST(DevToolsUtil, ProtocolParser_Initialize_IsFailure_ResultMalformed) { TEST(DevToolsUtil, ProtocolParser_Initialize_IsFailure_ResultMalformed) {
@ -162,7 +162,7 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Result) {
EXPECT_TRUE(parser.IsResult()); EXPECT_TRUE(parser.IsResult());
EXPECT_EQ(1, parser.message_id_); EXPECT_EQ(1, parser.message_id_);
EXPECT_TRUE(parser.success_); EXPECT_TRUE(parser.success_);
EXPECT_STREQ("{}", parser.params_.data()); EXPECT_EQ("{}", parser.params_);
parser.Reset(); parser.Reset();
EXPECT_FALSE(parser.IsInitialized()); EXPECT_FALSE(parser.IsInitialized());
@ -174,7 +174,7 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Result) {
EXPECT_TRUE(parser.IsResult()); EXPECT_TRUE(parser.IsResult());
EXPECT_EQ(2, parser.message_id_); EXPECT_EQ(2, parser.message_id_);
EXPECT_TRUE(parser.success_); EXPECT_TRUE(parser.success_);
EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.data()); EXPECT_EQ("{\"foo\":\"bar\"}", parser.params_);
} }
TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Error) { TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Error) {
@ -188,7 +188,7 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Error) {
EXPECT_TRUE(parser.IsResult()); EXPECT_TRUE(parser.IsResult());
EXPECT_EQ(1, parser.message_id_); EXPECT_EQ(1, parser.message_id_);
EXPECT_FALSE(parser.success_); EXPECT_FALSE(parser.success_);
EXPECT_STREQ("{}", parser.params_.data()); EXPECT_EQ("{}", parser.params_);
parser.Reset(); parser.Reset();
EXPECT_FALSE(parser.IsInitialized()); EXPECT_FALSE(parser.IsInitialized());
@ -200,5 +200,21 @@ TEST(DevToolsUtil, ProtocolParser_Initialize_IsResult_Error) {
EXPECT_TRUE(parser.IsResult()); EXPECT_TRUE(parser.IsResult());
EXPECT_EQ(2, parser.message_id_); EXPECT_EQ(2, parser.message_id_);
EXPECT_FALSE(parser.success_); EXPECT_FALSE(parser.success_);
EXPECT_STREQ("{\"foo\":\"bar\"}", parser.params_.data()); EXPECT_EQ("{\"foo\":\"bar\"}", parser.params_);
}
TEST(DevToolsUtil, ProtocolParser_Can_Handle_MissingQuote) {
ProtocolParser parser;
const auto message = "{\"method\":\"Test.myMethod}";
EXPECT_TRUE(parser.Initialize(message));
EXPECT_TRUE(parser.IsFailure());
}
TEST(DevToolsUtil, ProtocolParser_Can_Handle_MissingComma) {
ProtocolParser parser;
const auto message = "{\"id\":1\"error\":{}}";
EXPECT_TRUE(parser.Initialize(message));
EXPECT_TRUE(parser.IsFailure());
} }