OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/test/values_test_util.h" | 5 #include "base/test/values_test_util.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 } | 46 } |
47 | 47 |
48 void ExpectDictStringValue(const std::string& expected_value, | 48 void ExpectDictStringValue(const std::string& expected_value, |
49 const DictionaryValue& value, | 49 const DictionaryValue& value, |
50 const std::string& key) { | 50 const std::string& key) { |
51 std::string string_value; | 51 std::string string_value; |
52 EXPECT_TRUE(value.GetString(key, &string_value)) << key; | 52 EXPECT_TRUE(value.GetString(key, &string_value)) << key; |
53 EXPECT_EQ(expected_value, string_value) << key; | 53 EXPECT_EQ(expected_value, string_value) << key; |
54 } | 54 } |
55 | 55 |
56 void ExpectStringValue(const std::string& expected_str, | 56 void ExpectStringValue(const std::string& expected_str, Value* actual) { |
57 StringValue* actual) { | 57 std::unique_ptr<Value> scoped_actual(actual); |
58 std::unique_ptr<StringValue> scoped_actual(actual); | |
59 std::string actual_str; | 58 std::string actual_str; |
60 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); | 59 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); |
61 EXPECT_EQ(expected_str, actual_str); | 60 EXPECT_EQ(expected_str, actual_str); |
62 } | 61 } |
63 | 62 |
64 namespace test { | 63 namespace test { |
65 | 64 |
66 std::unique_ptr<Value> ParseJson(base::StringPiece json) { | 65 std::unique_ptr<Value> ParseJson(base::StringPiece json) { |
67 std::string error_msg; | 66 std::string error_msg; |
68 std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError( | 67 std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError( |
69 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); | 68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); |
70 if (!result) { | 69 if (!result) { |
71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; | 70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; |
72 result = Value::CreateNullValue(); | 71 result = Value::CreateNullValue(); |
73 } | 72 } |
74 return result; | 73 return result; |
75 } | 74 } |
76 | 75 |
77 } // namespace test | 76 } // namespace test |
78 } // namespace base | 77 } // namespace base |
OLD | NEW |