| OLD | NEW |
| 1 // Copyright (c) 2011 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 "chrome/test/base/values_test_util.h" | |
| 6 | |
| 7 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string_number_conversions.h" | 6 #include "base/string_number_conversions.h" |
| 7 #include "base/test/values_test_util.h" |
| 9 #include "base/values.h" | 8 #include "base/values.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 11 | 10 |
| 12 namespace test { | 11 namespace base { |
| 13 | 12 |
| 14 void ExpectDictBooleanValue(bool expected_value, | 13 void ExpectDictBooleanValue(bool expected_value, |
| 15 const DictionaryValue& value, | 14 const DictionaryValue& value, |
| 16 const std::string& key) { | 15 const std::string& key) { |
| 17 bool boolean_value = false; | 16 bool boolean_value = false; |
| 18 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; | 17 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; |
| 19 EXPECT_EQ(expected_value, boolean_value) << key; | 18 EXPECT_EQ(expected_value, boolean_value) << key; |
| 20 } | 19 } |
| 21 | 20 |
| 22 void ExpectDictDictionaryValue(const DictionaryValue& expected_value, | 21 void ExpectDictDictionaryValue(const DictionaryValue& expected_value, |
| (...skipping 29 matching lines...) Expand all Loading... |
| 52 } | 51 } |
| 53 | 52 |
| 54 void ExpectStringValue(const std::string& expected_str, | 53 void ExpectStringValue(const std::string& expected_str, |
| 55 StringValue* actual) { | 54 StringValue* actual) { |
| 56 scoped_ptr<StringValue> scoped_actual(actual); | 55 scoped_ptr<StringValue> scoped_actual(actual); |
| 57 std::string actual_str; | 56 std::string actual_str; |
| 58 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); | 57 EXPECT_TRUE(scoped_actual->GetAsString(&actual_str)); |
| 59 EXPECT_EQ(expected_str, actual_str); | 58 EXPECT_EQ(expected_str, actual_str); |
| 60 } | 59 } |
| 61 | 60 |
| 62 } // namespace test | 61 } // namespace base |
| OLD | NEW |