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

Side by Side Diff: base/test/values_test_util.cc

Issue 11567027: Add a base::ParseJson() function to help tests construct Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move ParseJson into base::test Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
6
7 #include "base/json/json_reader.h"
5 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
6 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
7 #include "base/test/values_test_util.h"
8 #include "base/values.h" 10 #include "base/values.h"
9 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
10 12
11 namespace base { 13 namespace base {
12 14
13 void ExpectDictBooleanValue(bool expected_value, 15 void ExpectDictBooleanValue(bool expected_value,
14 const DictionaryValue& value, 16 const DictionaryValue& value,
15 const std::string& key) { 17 const std::string& key) {
16 bool boolean_value = false; 18 bool boolean_value = false;
17 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; 19 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 53 }
52 54
53 void ExpectStringValue(const std::string& expected_str, 55 void ExpectStringValue(const std::string& expected_str,
54 StringValue* actual) { 56 StringValue* actual) {
55 scoped_ptr<StringValue> scoped_actual(actual); 57 scoped_ptr<StringValue> scoped_actual(actual);
56 std::string actual_str; 58 std::string actual_str;
57 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); 59 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str));
58 EXPECT_EQ(expected_str, actual_str); 60 EXPECT_EQ(expected_str, actual_str);
59 } 61 }
60 62
63 namespace test {
64
65 scoped_ptr<Value> ParseJson(base::StringPiece json) {
66 std::string error_msg;
67 scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError(
68 json, base::JSON_ALLOW_TRAILING_COMMAS,
69 NULL, &error_msg));
70 if (!result) {
71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
72 result.reset(Value::CreateNullValue());
73 }
74 return result.Pass();
75 }
76
77 } // namespace test
61 } // namespace base 78 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698