| 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> |
| 8 |
| 7 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 8 #include "base/memory/scoped_ptr.h" | |
| 9 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/values.h" | 11 #include "base/values.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 13 |
| 13 namespace base { | 14 namespace base { |
| 14 | 15 |
| 15 void ExpectDictBooleanValue(bool expected_value, | 16 void ExpectDictBooleanValue(bool expected_value, |
| 16 const DictionaryValue& value, | 17 const DictionaryValue& value, |
| 17 const std::string& key) { | 18 const std::string& key) { |
| 18 bool boolean_value = false; | 19 bool boolean_value = false; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 47 void ExpectDictStringValue(const std::string& expected_value, | 48 void ExpectDictStringValue(const std::string& expected_value, |
| 48 const DictionaryValue& value, | 49 const DictionaryValue& value, |
| 49 const std::string& key) { | 50 const std::string& key) { |
| 50 std::string string_value; | 51 std::string string_value; |
| 51 EXPECT_TRUE(value.GetString(key, &string_value)) << key; | 52 EXPECT_TRUE(value.GetString(key, &string_value)) << key; |
| 52 EXPECT_EQ(expected_value, string_value) << key; | 53 EXPECT_EQ(expected_value, string_value) << key; |
| 53 } | 54 } |
| 54 | 55 |
| 55 void ExpectStringValue(const std::string& expected_str, | 56 void ExpectStringValue(const std::string& expected_str, |
| 56 StringValue* actual) { | 57 StringValue* actual) { |
| 57 scoped_ptr<StringValue> scoped_actual(actual); | 58 std::unique_ptr<StringValue> scoped_actual(actual); |
| 58 std::string actual_str; | 59 std::string actual_str; |
| 59 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); | 60 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); |
| 60 EXPECT_EQ(expected_str, actual_str); | 61 EXPECT_EQ(expected_str, actual_str); |
| 61 } | 62 } |
| 62 | 63 |
| 63 namespace test { | 64 namespace test { |
| 64 | 65 |
| 65 scoped_ptr<Value> ParseJson(base::StringPiece json) { | 66 std::unique_ptr<Value> ParseJson(base::StringPiece json) { |
| 66 std::string error_msg; | 67 std::string error_msg; |
| 67 scoped_ptr<Value> result = base::JSONReader::ReadAndReturnError( | 68 std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError( |
| 68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); | 69 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); |
| 69 if (!result) { | 70 if (!result) { |
| 70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; | 71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; |
| 71 result = Value::CreateNullValue(); | 72 result = Value::CreateNullValue(); |
| 72 } | 73 } |
| 73 return result; | 74 return result; |
| 74 } | 75 } |
| 75 | 76 |
| 76 } // namespace test | 77 } // namespace test |
| 77 } // namespace base | 78 } // namespace base |
| OLD | NEW |