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

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « base/test/user_action_tester_unittest.cc ('k') | base/threading/non_thread_safe_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 5 #include "base/test/values_test_util.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/googletest/include/gtest/gtest.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 void ExpectDictBooleanValue(bool expected_value, 15 void ExpectDictBooleanValue(bool expected_value,
16 const DictionaryValue& value, 16 const DictionaryValue& value,
17 const std::string& key) { 17 const std::string& key) {
18 bool boolean_value = false; 18 bool boolean_value = false;
19 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; 19 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key;
20 EXPECT_EQ(expected_value, boolean_value) << key; 20 EXPECT_EQ(expected_value, boolean_value) << key;
21 } 21 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); 68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg);
69 if (!result) { 69 if (!result) {
70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; 70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
71 result = Value::CreateNullValue(); 71 result = Value::CreateNullValue();
72 } 72 }
73 return result.Pass(); 73 return result.Pass();
74 } 74 }
75 75
76 } // namespace test 76 } // namespace test
77 } // namespace base 77 } // namespace base
OLDNEW
« no previous file with comments | « base/test/user_action_tester_unittest.cc ('k') | base/threading/non_thread_safe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698