未验证 提交 70b12fa1 编写于 作者: L liyuqian 提交者: GitHub

Strengthen json string comparisons (#17425)

Make the test robust even if the json map reorders its keys.
上级 807ca854
......@@ -1162,10 +1162,14 @@ TEST_F(ShellTest, OnServiceProtocolGetSkSLsWorks) {
document.Accept(writer);
DestroyShell(std::move(shell));
// Base64 encoding of x, y are eQ, eA.
ASSERT_STREQ(
buffer.GetString(),
"{\"type\":\"GetSkSLs\",\"SkSLs\":{\"II\":\"eQ==\",\"IE\":\"eA==\"}}");
const std::string expected_json1 =
"{\"type\":\"GetSkSLs\",\"SkSLs\":{\"II\":\"eQ==\",\"IE\":\"eA==\"}}";
const std::string expected_json2 =
"{\"type\":\"GetSkSLs\",\"SkSLs\":{\"IE\":\"eA==\",\"II\":\"eQ==\"}}";
bool json_is_expected = (expected_json1 == buffer.GetString()) ||
(expected_json2 == buffer.GetString());
ASSERT_TRUE(json_is_expected) << buffer.GetString() << " is not equal to "
<< expected_json1 << " or " << expected_json2;
// Cleanup files
fml::FileVisitor recursive_cleanup = [&recursive_cleanup](
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册