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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/values_unittest.cc

Issue 254473002: Add support for int64 and uint64 in values.h's API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test compile Created 6 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/values.cc ('k') | chrome/browser/prefs/pref_hash_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/values_unittest.cc
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index c8a6cbf9a7735ba3b501c981720d69107c3ddf5b..c241b10603d03ff627a5a840aa0515a5fb238e20 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -12,6 +12,12 @@
namespace base {
+const int64 kTestInt64 = -100200300400500600;
+
+// kTestUint64 is bigger than the max value for int64 and can only be converted
+// to a uint64.
+const uint64 kTestUint64 = 10100200300400500600U;
+
TEST(ValuesTest, Basic) {
// Test basic dictionary getting/setting
DictionaryValue settings;
@@ -57,19 +63,23 @@ TEST(ValuesTest, Basic) {
TEST(ValuesTest, List) {
scoped_ptr<ListValue> mixed_list(new ListValue());
- mixed_list->Set(0, new FundamentalValue(true));
- mixed_list->Set(1, new FundamentalValue(42));
- mixed_list->Set(2, new FundamentalValue(88.8));
- mixed_list->Set(3, new StringValue("foo"));
- ASSERT_EQ(4u, mixed_list->GetSize());
+ mixed_list->AppendBoolean(true);
+ mixed_list->AppendInteger(42);
+ mixed_list->AppendDouble(88.8);
+ mixed_list->AppendString("foo");
+ mixed_list->AppendInt64(kTestInt64);
+ mixed_list->AppendUint64(kTestUint64);
+ ASSERT_EQ(6u, mixed_list->GetSize());
Value *value = NULL;
bool bool_value = false;
int int_value = 0;
double double_value = 0.0;
std::string string_value;
+ int64 int64_value = 0;
+ uint64 uint64_value = 0;
- ASSERT_FALSE(mixed_list->Get(4, &value));
+ ASSERT_FALSE(mixed_list->Get(6, &value));
ASSERT_FALSE(mixed_list->GetInteger(0, &int_value));
ASSERT_EQ(0, int_value);
@@ -77,10 +87,14 @@ TEST(ValuesTest, List) {
ASSERT_FALSE(bool_value);
ASSERT_FALSE(mixed_list->GetString(2, &string_value));
ASSERT_EQ("", string_value);
- ASSERT_FALSE(mixed_list->GetInteger(2, &int_value));
+ ASSERT_FALSE(mixed_list->GetInt64(2, &int64_value));
+ ASSERT_EQ(0, int64_value);
+ ASSERT_FALSE(mixed_list->GetUint64(3, &uint64_value));
+ ASSERT_FALSE(uint64_value);
+ ASSERT_FALSE(mixed_list->GetInteger(4, &int_value));
+ ASSERT_EQ(0, int_value);
+ ASSERT_FALSE(mixed_list->GetInteger(5, &int_value));
ASSERT_EQ(0, int_value);
- ASSERT_FALSE(mixed_list->GetBoolean(3, &bool_value));
- ASSERT_FALSE(bool_value);
ASSERT_TRUE(mixed_list->GetBoolean(0, &bool_value));
ASSERT_TRUE(bool_value);
@@ -93,14 +107,29 @@ TEST(ValuesTest, List) {
ASSERT_EQ(88.8, double_value);
ASSERT_TRUE(mixed_list->GetString(3, &string_value));
ASSERT_EQ("foo", string_value);
+ ASSERT_TRUE(mixed_list->GetInt64(4, &int64_value));
+ ASSERT_EQ(kTestInt64, int64_value);
+ ASSERT_TRUE(mixed_list->GetUint64(5, &uint64_value));
+ ASSERT_EQ(kTestUint64, uint64_value);
// Try searching in the mixed list.
- base::FundamentalValue sought_value(42);
+ base::FundamentalValue sought_int_value(42);
+ base::StringValue sought_int64_value(kTestInt64);
base::FundamentalValue not_found_value(false);
+ ListValue::const_iterator found_value_it;
+
+ found_value_it = mixed_list->Find(sought_int_value);
+ ASSERT_NE(mixed_list->end(), found_value_it);
+ int found_int_value;
+ ASSERT_TRUE((*found_value_it)->GetAsInteger(&found_int_value));
+ ASSERT_EQ(42, found_int_value);
+
+ found_value_it = mixed_list->Find(sought_int64_value);
+ ASSERT_NE(mixed_list->end(), found_value_it);
+ int64 found_int64_value;
+ ASSERT_TRUE((*found_value_it)->GetAsInt64(&found_int64_value));
+ ASSERT_EQ(kTestInt64, found_int64_value);
- ASSERT_NE(mixed_list->end(), mixed_list->Find(sought_value));
- ASSERT_TRUE((*mixed_list->Find(sought_value))->GetAsInteger(&int_value));
- ASSERT_EQ(42, int_value);
ASSERT_EQ(mixed_list->end(), mixed_list->Find(not_found_value));
}
@@ -163,6 +192,30 @@ TEST(ValuesTest, StringValue) {
static_cast<const StringValue**>(NULL)));
}
+TEST(ValuesTest, StringValueInt64) {
+ // Test overloaded StringValue constructors for (u)int64.
+ scoped_ptr<Value> test_int64_value(new StringValue(kTestInt64));
+ ASSERT_TRUE(test_int64_value.get());
+ ASSERT_TRUE(test_int64_value->IsType(Value::TYPE_STRING));
+
+ scoped_ptr<Value> test_uint64_value(new StringValue(kTestUint64));
+ ASSERT_TRUE(test_uint64_value.get());
+ ASSERT_TRUE(test_uint64_value->IsType(Value::TYPE_STRING));
+
+ // Test overloaded GetAs(U)Int64.
+ int64 actual_int64_value;
+ ASSERT_TRUE(test_int64_value->GetAsInt64(&actual_int64_value));
+ ASSERT_EQ(kTestInt64, actual_int64_value);
+
+ uint64 actual_uint64_value;
+ ASSERT_TRUE(test_uint64_value->GetAsUint64(&actual_uint64_value));
+ ASSERT_EQ(kTestUint64, actual_uint64_value);
+
+ // Don't choke on NULL values.
+ ASSERT_TRUE(test_int64_value->GetAsInt64(static_cast<int64*>(NULL)));
+ ASSERT_TRUE(test_uint64_value->GetAsUint64(static_cast<uint64*>(NULL)));
+}
+
// This is a Value object that allows us to tell if it's been
// properly deleted by modifying the value of external flag on destruction.
class DeletionTestValue : public Value {
@@ -819,6 +872,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
FundamentalValue int_value(1234);
FundamentalValue double_value(12.34567);
StringValue string_value("foo");
+ StringValue int64_value(kTestInt64);
+ StringValue uint64_value(kTestUint64);
BinaryValue binary_value;
DictionaryValue dict_value;
ListValue list_value;
@@ -827,6 +882,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
main_dict.Set("int", int_value.DeepCopy());
main_dict.Set("double", double_value.DeepCopy());
main_dict.Set("string", string_value.DeepCopy());
+ main_dict.Set("int64", int64_value.DeepCopy());
+ main_dict.Set("uint64", uint64_value.DeepCopy());
main_dict.Set("binary", binary_value.DeepCopy());
main_dict.Set("dict", dict_value.DeepCopy());
main_dict.Set("list", list_value.DeepCopy());
@@ -835,6 +892,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
main_list.Append(int_value.DeepCopy());
main_list.Append(double_value.DeepCopy());
main_list.Append(string_value.DeepCopy());
+ main_list.Append(int64_value.DeepCopy());
+ main_list.Append(uint64_value.DeepCopy());
main_list.Append(binary_value.DeepCopy());
main_list.Append(dict_value.DeepCopy());
main_list.Append(list_value.DeepCopy());
@@ -843,6 +902,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.Get("int", NULL));
EXPECT_TRUE(main_dict.Get("double", NULL));
EXPECT_TRUE(main_dict.Get("string", NULL));
+ EXPECT_TRUE(main_dict.Get("int64", NULL));
+ EXPECT_TRUE(main_dict.Get("uint64", NULL));
EXPECT_TRUE(main_dict.Get("binary", NULL));
EXPECT_TRUE(main_dict.Get("dict", NULL));
EXPECT_TRUE(main_dict.Get("list", NULL));
@@ -852,6 +913,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetBoolean("int", NULL));
EXPECT_FALSE(main_dict.GetBoolean("double", NULL));
EXPECT_FALSE(main_dict.GetBoolean("string", NULL));
+ EXPECT_FALSE(main_dict.GetBoolean("int64", NULL));
+ EXPECT_FALSE(main_dict.GetBoolean("uint64", NULL));
EXPECT_FALSE(main_dict.GetBoolean("binary", NULL));
EXPECT_FALSE(main_dict.GetBoolean("dict", NULL));
EXPECT_FALSE(main_dict.GetBoolean("list", NULL));
@@ -861,6 +924,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.GetInteger("int", NULL));
EXPECT_FALSE(main_dict.GetInteger("double", NULL));
EXPECT_FALSE(main_dict.GetInteger("string", NULL));
+ EXPECT_FALSE(main_dict.GetInteger("int64", NULL));
+ EXPECT_FALSE(main_dict.GetInteger("uint64", NULL));
EXPECT_FALSE(main_dict.GetInteger("binary", NULL));
EXPECT_FALSE(main_dict.GetInteger("dict", NULL));
EXPECT_FALSE(main_dict.GetInteger("list", NULL));
@@ -871,6 +936,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.GetDouble("int", NULL));
EXPECT_TRUE(main_dict.GetDouble("double", NULL));
EXPECT_FALSE(main_dict.GetDouble("string", NULL));
+ EXPECT_FALSE(main_dict.GetDouble("int64", NULL));
+ EXPECT_FALSE(main_dict.GetDouble("uint64", NULL));
EXPECT_FALSE(main_dict.GetDouble("binary", NULL));
EXPECT_FALSE(main_dict.GetDouble("dict", NULL));
EXPECT_FALSE(main_dict.GetDouble("list", NULL));
@@ -880,6 +947,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetString("int", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetString("double", static_cast<std::string*>(NULL)));
EXPECT_TRUE(main_dict.GetString("string", static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_dict.GetString("int64", static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_dict.GetString("uint64", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetString("binary", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetString("dict", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetString("list", static_cast<std::string*>(NULL)));
@@ -889,15 +958,41 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetString("int", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetString("double", static_cast<string16*>(NULL)));
EXPECT_TRUE(main_dict.GetString("string", static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_dict.GetString("int64", static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_dict.GetString("uint64", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetString("binary", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetString("dict", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetString("list", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetString("DNE", static_cast<string16*>(NULL)));
+ EXPECT_FALSE(main_dict.GetInt64("bool", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("int", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("double", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("string", NULL));
+ EXPECT_TRUE(main_dict.GetInt64("int64", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("uint64", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("binary", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("dict", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("list", NULL));
+ EXPECT_FALSE(main_dict.GetInt64("DNE", NULL));
+
+ EXPECT_FALSE(main_dict.GetUint64("bool", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("int", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("double", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("string", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("int64", NULL));
+ EXPECT_TRUE(main_dict.GetUint64("uint64", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("binary", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("dict", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("list", NULL));
+ EXPECT_FALSE(main_dict.GetUint64("DNE", NULL));
+
EXPECT_FALSE(main_dict.GetBinary("bool", NULL));
EXPECT_FALSE(main_dict.GetBinary("int", NULL));
EXPECT_FALSE(main_dict.GetBinary("double", NULL));
EXPECT_FALSE(main_dict.GetBinary("string", NULL));
+ EXPECT_FALSE(main_dict.GetBinary("int64", NULL));
+ EXPECT_FALSE(main_dict.GetBinary("uint64", NULL));
EXPECT_TRUE(main_dict.GetBinary("binary", NULL));
EXPECT_FALSE(main_dict.GetBinary("dict", NULL));
EXPECT_FALSE(main_dict.GetBinary("list", NULL));
@@ -907,6 +1002,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetDictionary("int", NULL));
EXPECT_FALSE(main_dict.GetDictionary("double", NULL));
EXPECT_FALSE(main_dict.GetDictionary("string", NULL));
+ EXPECT_FALSE(main_dict.GetDictionary("int64", NULL));
+ EXPECT_FALSE(main_dict.GetDictionary("uint64", NULL));
EXPECT_FALSE(main_dict.GetDictionary("binary", NULL));
EXPECT_TRUE(main_dict.GetDictionary("dict", NULL));
EXPECT_FALSE(main_dict.GetDictionary("list", NULL));
@@ -916,6 +1013,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetList("int", NULL));
EXPECT_FALSE(main_dict.GetList("double", NULL));
EXPECT_FALSE(main_dict.GetList("string", NULL));
+ EXPECT_FALSE(main_dict.GetList("int64", NULL));
+ EXPECT_FALSE(main_dict.GetList("uint64", NULL));
EXPECT_FALSE(main_dict.GetList("binary", NULL));
EXPECT_FALSE(main_dict.GetList("dict", NULL));
EXPECT_TRUE(main_dict.GetList("list", NULL));
@@ -925,6 +1024,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("int", NULL));
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("double", NULL));
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("string", NULL));
+ EXPECT_TRUE(main_dict.GetWithoutPathExpansion("int64", NULL));
+ EXPECT_TRUE(main_dict.GetWithoutPathExpansion("uint64", NULL));
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("binary", NULL));
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("dict", NULL));
EXPECT_TRUE(main_dict.GetWithoutPathExpansion("list", NULL));
@@ -934,6 +1035,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("int", NULL));
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("double", NULL));
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("uint64", NULL));
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("binary", NULL));
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("dict", NULL));
EXPECT_FALSE(main_dict.GetBooleanWithoutPathExpansion("list", NULL));
@@ -943,6 +1046,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.GetIntegerWithoutPathExpansion("int", NULL));
EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("double", NULL));
EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("uint64", NULL));
EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("binary", NULL));
EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("dict", NULL));
EXPECT_FALSE(main_dict.GetIntegerWithoutPathExpansion("list", NULL));
@@ -952,6 +1057,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_dict.GetDoubleWithoutPathExpansion("int", NULL));
EXPECT_TRUE(main_dict.GetDoubleWithoutPathExpansion("double", NULL));
EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("uint64", NULL));
EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("binary", NULL));
EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("dict", NULL));
EXPECT_FALSE(main_dict.GetDoubleWithoutPathExpansion("list", NULL));
@@ -965,6 +1072,10 @@ TEST(ValuesTest, GetWithNullOutValue) {
"double", static_cast<std::string*>(NULL)));
EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
"string", static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
+ "int64", static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
+ "uint64", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetStringWithoutPathExpansion(
"binary", static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_dict.GetStringWithoutPathExpansion(
@@ -982,6 +1093,10 @@ TEST(ValuesTest, GetWithNullOutValue) {
"double", static_cast<string16*>(NULL)));
EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
"string", static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
+ "int64", static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_dict.GetStringWithoutPathExpansion(
+ "uint64", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetStringWithoutPathExpansion(
"binary", static_cast<string16*>(NULL)));
EXPECT_FALSE(main_dict.GetStringWithoutPathExpansion(
@@ -991,6 +1106,28 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetStringWithoutPathExpansion(
"DNE", static_cast<string16*>(NULL)));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("bool", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("int", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("double", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("string", NULL));
+ EXPECT_TRUE(main_dict.GetInt64WithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("uint64", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("binary", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("dict", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("list", NULL));
+ EXPECT_FALSE(main_dict.GetInt64WithoutPathExpansion("DNE", NULL));
+
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("bool", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("int", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("double", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("int64", NULL));
+ EXPECT_TRUE(main_dict.GetUint64WithoutPathExpansion("uint64", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("binary", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("dict", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("list", NULL));
+ EXPECT_FALSE(main_dict.GetUint64WithoutPathExpansion("DNE", NULL));
+
// There is no GetBinaryWithoutPathExpansion for some reason, but if there
// were it should be tested here...
@@ -998,6 +1135,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("int", NULL));
EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("double", NULL));
EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("uint64", NULL));
EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("binary", NULL));
EXPECT_TRUE(main_dict.GetDictionaryWithoutPathExpansion("dict", NULL));
EXPECT_FALSE(main_dict.GetDictionaryWithoutPathExpansion("list", NULL));
@@ -1007,6 +1146,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("int", NULL));
EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("double", NULL));
EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("string", NULL));
+ EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("int64", NULL));
+ EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("uint64", NULL));
EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("binary", NULL));
EXPECT_FALSE(main_dict.GetListWithoutPathExpansion("dict", NULL));
EXPECT_TRUE(main_dict.GetListWithoutPathExpansion("list", NULL));
@@ -1019,7 +1160,9 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_TRUE(main_list.Get(4, NULL));
EXPECT_TRUE(main_list.Get(5, NULL));
EXPECT_TRUE(main_list.Get(6, NULL));
- EXPECT_FALSE(main_list.Get(7, NULL));
+ EXPECT_TRUE(main_list.Get(7, NULL));
+ EXPECT_TRUE(main_list.Get(8, NULL));
+ EXPECT_FALSE(main_list.Get(9, NULL));
EXPECT_TRUE(main_list.GetBoolean(0, NULL));
EXPECT_FALSE(main_list.GetBoolean(1, NULL));
@@ -1029,6 +1172,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_list.GetBoolean(5, NULL));
EXPECT_FALSE(main_list.GetBoolean(6, NULL));
EXPECT_FALSE(main_list.GetBoolean(7, NULL));
+ EXPECT_FALSE(main_list.GetBoolean(8, NULL));
+ EXPECT_FALSE(main_list.GetBoolean(9, NULL));
EXPECT_FALSE(main_list.GetInteger(0, NULL));
EXPECT_TRUE(main_list.GetInteger(1, NULL));
@@ -1038,6 +1183,8 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_list.GetInteger(5, NULL));
EXPECT_FALSE(main_list.GetInteger(6, NULL));
EXPECT_FALSE(main_list.GetInteger(7, NULL));
+ EXPECT_FALSE(main_list.GetInteger(8, NULL));
+ EXPECT_FALSE(main_list.GetInteger(9, NULL));
EXPECT_FALSE(main_list.GetDouble(0, NULL));
EXPECT_TRUE(main_list.GetDouble(1, NULL));
@@ -1047,42 +1194,74 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_list.GetDouble(5, NULL));
EXPECT_FALSE(main_list.GetDouble(6, NULL));
EXPECT_FALSE(main_list.GetDouble(7, NULL));
+ EXPECT_FALSE(main_list.GetDouble(8, NULL));
+ EXPECT_FALSE(main_list.GetDouble(9, NULL));
EXPECT_FALSE(main_list.GetString(0, static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_list.GetString(1, static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_list.GetString(2, static_cast<std::string*>(NULL)));
EXPECT_TRUE(main_list.GetString(3, static_cast<std::string*>(NULL)));
- EXPECT_FALSE(main_list.GetString(4, static_cast<std::string*>(NULL)));
- EXPECT_FALSE(main_list.GetString(5, static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_list.GetString(4, static_cast<std::string*>(NULL)));
+ EXPECT_TRUE(main_list.GetString(5, static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_list.GetString(6, static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_list.GetString(7, static_cast<std::string*>(NULL)));
+ EXPECT_FALSE(main_list.GetString(8, static_cast<std::string*>(NULL)));
+ EXPECT_FALSE(main_list.GetString(9, static_cast<std::string*>(NULL)));
EXPECT_FALSE(main_list.GetString(0, static_cast<string16*>(NULL)));
EXPECT_FALSE(main_list.GetString(1, static_cast<string16*>(NULL)));
EXPECT_FALSE(main_list.GetString(2, static_cast<string16*>(NULL)));
EXPECT_TRUE(main_list.GetString(3, static_cast<string16*>(NULL)));
- EXPECT_FALSE(main_list.GetString(4, static_cast<string16*>(NULL)));
- EXPECT_FALSE(main_list.GetString(5, static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_list.GetString(4, static_cast<string16*>(NULL)));
+ EXPECT_TRUE(main_list.GetString(5, static_cast<string16*>(NULL)));
EXPECT_FALSE(main_list.GetString(6, static_cast<string16*>(NULL)));
EXPECT_FALSE(main_list.GetString(7, static_cast<string16*>(NULL)));
+ EXPECT_FALSE(main_list.GetString(8, static_cast<string16*>(NULL)));
+ EXPECT_FALSE(main_list.GetString(9, static_cast<string16*>(NULL)));
+
+ EXPECT_FALSE(main_list.GetInt64(0, NULL));
+ EXPECT_FALSE(main_list.GetInt64(1, NULL));
+ EXPECT_FALSE(main_list.GetInt64(2, NULL));
+ EXPECT_FALSE(main_list.GetInt64(3, NULL));
+ EXPECT_TRUE(main_list.GetInt64(4, NULL));
+ EXPECT_FALSE(main_list.GetInt64(5, NULL));
+ EXPECT_FALSE(main_list.GetInt64(6, NULL));
+ EXPECT_FALSE(main_list.GetInt64(7, NULL));
+ EXPECT_FALSE(main_list.GetInt64(8, NULL));
+ EXPECT_FALSE(main_list.GetInt64(9, NULL));
+
+ EXPECT_FALSE(main_list.GetUint64(0, NULL));
+ EXPECT_FALSE(main_list.GetUint64(1, NULL));
+ EXPECT_FALSE(main_list.GetUint64(2, NULL));
+ EXPECT_FALSE(main_list.GetUint64(3, NULL));
+ EXPECT_FALSE(main_list.GetUint64(4, NULL));
+ EXPECT_TRUE(main_list.GetUint64(5, NULL));
+ EXPECT_FALSE(main_list.GetUint64(6, NULL));
+ EXPECT_FALSE(main_list.GetUint64(7, NULL));
+ EXPECT_FALSE(main_list.GetUint64(8, NULL));
+ EXPECT_FALSE(main_list.GetUint64(9, NULL));
EXPECT_FALSE(main_list.GetBinary(0, NULL));
EXPECT_FALSE(main_list.GetBinary(1, NULL));
EXPECT_FALSE(main_list.GetBinary(2, NULL));
EXPECT_FALSE(main_list.GetBinary(3, NULL));
- EXPECT_TRUE(main_list.GetBinary(4, NULL));
+ EXPECT_FALSE(main_list.GetBinary(4, NULL));
EXPECT_FALSE(main_list.GetBinary(5, NULL));
- EXPECT_FALSE(main_list.GetBinary(6, NULL));
+ EXPECT_TRUE(main_list.GetBinary(6, NULL));
EXPECT_FALSE(main_list.GetBinary(7, NULL));
+ EXPECT_FALSE(main_list.GetBinary(8, NULL));
+ EXPECT_FALSE(main_list.GetBinary(9, NULL));
EXPECT_FALSE(main_list.GetDictionary(0, NULL));
EXPECT_FALSE(main_list.GetDictionary(1, NULL));
EXPECT_FALSE(main_list.GetDictionary(2, NULL));
EXPECT_FALSE(main_list.GetDictionary(3, NULL));
EXPECT_FALSE(main_list.GetDictionary(4, NULL));
- EXPECT_TRUE(main_list.GetDictionary(5, NULL));
+ EXPECT_FALSE(main_list.GetDictionary(5, NULL));
EXPECT_FALSE(main_list.GetDictionary(6, NULL));
- EXPECT_FALSE(main_list.GetDictionary(7, NULL));
+ EXPECT_TRUE(main_list.GetDictionary(7, NULL));
+ EXPECT_FALSE(main_list.GetDictionary(8, NULL));
+ EXPECT_FALSE(main_list.GetDictionary(9, NULL));
EXPECT_FALSE(main_list.GetList(0, NULL));
EXPECT_FALSE(main_list.GetList(1, NULL));
@@ -1090,8 +1269,10 @@ TEST(ValuesTest, GetWithNullOutValue) {
EXPECT_FALSE(main_list.GetList(3, NULL));
EXPECT_FALSE(main_list.GetList(4, NULL));
EXPECT_FALSE(main_list.GetList(5, NULL));
- EXPECT_TRUE(main_list.GetList(6, NULL));
+ EXPECT_FALSE(main_list.GetList(6, NULL));
EXPECT_FALSE(main_list.GetList(7, NULL));
+ EXPECT_TRUE(main_list.GetList(8, NULL));
+ EXPECT_FALSE(main_list.GetList(9, NULL));
}
} // namespace base
« no previous file with comments | « base/values.cc ('k') | chrome/browser/prefs/pref_hash_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698