Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/json/json_parser_unittest.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/ios/crb_protocol_observers_unittest.mm ('k') | base/json/json_reader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_parser_unittest.cc
diff --git a/base/json/json_parser_unittest.cc b/base/json/json_parser_unittest.cc
index 74e20263013aa8de370db8469ef1f5f2681bbe48..f776ddfc2c0a869588fa3ab727205b2d67eca338 100644
--- a/base/json/json_parser_unittest.cc
+++ b/base/json/json_parser_unittest.cc
@@ -204,16 +204,16 @@ TEST_F(JSONParserTest, ErrorMessages) {
std::string error_message;
int error_code = 0;
scoped_ptr<Value> root;
- root.reset(JSONReader::ReadAndReturnError("[42]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[42]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_TRUE(error_message.empty());
EXPECT_EQ(0, error_code);
// Test line and column counting
const char big_json[] = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]";
// error here ----------------------------------^
- root.reset(JSONReader::ReadAndReturnError(big_json, JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ big_json, JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError),
error_message);
@@ -225,16 +225,16 @@ TEST_F(JSONParserTest, ErrorMessages) {
const char big_json_crlf[] =
"[\r\n0,\r\n1,\r\n2,\r\n3,4,5,6 7,\r\n8,\r\n9\r\n]";
// error here ----------------------^
- root.reset(JSONReader::ReadAndReturnError(big_json_crlf, JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ big_json_crlf, JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError),
error_message);
EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code);
// Test each of the error conditions
- root.reset(JSONReader::ReadAndReturnError("{},{}", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "{},{}", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 3,
JSONReader::kUnexpectedDataAfterRoot), error_message);
@@ -245,57 +245,56 @@ TEST_F(JSONParserTest, ErrorMessages) {
nested_json.insert(nested_json.begin(), '[');
nested_json.append(1, ']');
}
- root.reset(JSONReader::ReadAndReturnError(nested_json, JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ nested_json, JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 100, JSONReader::kTooMuchNesting),
error_message);
EXPECT_EQ(JSONReader::JSON_TOO_MUCH_NESTING, error_code);
- root.reset(JSONReader::ReadAndReturnError("[1,]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[1,]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 4, JSONReader::kTrailingComma),
error_message);
EXPECT_EQ(JSONReader::JSON_TRAILING_COMMA, error_code);
- root.reset(JSONReader::ReadAndReturnError("{foo:\"bar\"}", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "{foo:\"bar\"}", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 2,
JSONReader::kUnquotedDictionaryKey), error_message);
EXPECT_EQ(JSONReader::JSON_UNQUOTED_DICTIONARY_KEY, error_code);
- root.reset(JSONReader::ReadAndReturnError("{\"foo\":\"bar\",}",
- JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "{\"foo\":\"bar\",}", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 14, JSONReader::kTrailingComma),
error_message);
- root.reset(JSONReader::ReadAndReturnError("[nu]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[nu]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 2, JSONReader::kSyntaxError),
error_message);
EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code);
- root.reset(JSONReader::ReadAndReturnError("[\"xxx\\xq\"]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[\"xxx\\xq\"]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape),
error_message);
EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code);
- root.reset(JSONReader::ReadAndReturnError("[\"xxx\\uq\"]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[\"xxx\\uq\"]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape),
error_message);
EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code);
- root.reset(JSONReader::ReadAndReturnError("[\"xxx\\q\"]", JSON_PARSE_RFC,
- &error_code, &error_message));
+ root.reset(JSONReader::DeprecatedReadAndReturnError(
+ "[\"xxx\\q\"]", JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_FALSE(root.get());
EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape),
error_message);
@@ -309,9 +308,8 @@ TEST_F(JSONParserTest, Decode4ByteUtf8Char) {
"[\"😇\",[],[],[],{\"google:suggesttype\":[]}]";
std::string error_message;
int error_code = 0;
- scoped_ptr<Value> root(
- JSONReader::ReadAndReturnError(kUtf8Data, JSON_PARSE_RFC, &error_code,
- &error_message));
+ scoped_ptr<Value> root(JSONReader::DeprecatedReadAndReturnError(
+ kUtf8Data, JSON_PARSE_RFC, &error_code, &error_message));
EXPECT_TRUE(root.get()) << error_message;
}
« no previous file with comments | « base/ios/crb_protocol_observers_unittest.mm ('k') | base/json/json_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698