more changes

base/values_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 TEST(ValuesTest, Basic) {
   // Test basic dictionary getting/setting
   DictionaryValue settings;
   std::string homepage = "http://google.com";
   ASSERT_FALSE(settings.GetString("global.homepage", &homepage));
   ASSERT_EQ(std::string("http://google.com"), homepage);
 
   ASSERT_FALSE(settings.Get("global", NULL));
-  settings.Set("global", Value::CreateBooleanValue(true));
+  settings.Set("global", TrueValue());
   ASSERT_TRUE(settings.Get("global", NULL));
   settings.SetString("global.homepage", "http://scurvy.com");
   ASSERT_TRUE(settings.Get("global", NULL));
   homepage = "http://google.com";
   ASSERT_TRUE(settings.GetString("global.homepage", &homepage));
   ASSERT_EQ(std::string("http://scurvy.com"), homepage);
 
   // Test storing a dictionary in a list.
   ListValue* toolbar_bookmarks;
   ASSERT_FALSE(
@@ skipping 16 matching lines @@
   std::string bookmark_name = "Unnamed";
   ASSERT_TRUE(bookmark->GetString("name", &bookmark_name));
   ASSERT_EQ(std::string("Froogle"), bookmark_name);
   std::string bookmark_url;
   ASSERT_TRUE(bookmark->GetString("url", &bookmark_url));
   ASSERT_EQ(std::string("http://froogle.com"), bookmark_url);
 }
 
 TEST(ValuesTest, List) {
   scoped_ptr<ListValue> mixed_list(new ListValue());
-  mixed_list->Set(0, Value::CreateBooleanValue(true));
-  mixed_list->Set(1, Value::CreateIntegerValue(42));
-  mixed_list->Set(2, Value::CreateDoubleValue(88.8));
-  mixed_list->Set(3, Value::CreateStringValue("foo"));
+  mixed_list->Set(0, TrueValue());
+  mixed_list->Set(1, NumberValue::New(42));
+  mixed_list->Set(2, NumberValue::New(88.8));
+  mixed_list->Set(3, StringValue::New("foo"));
   ASSERT_EQ(4u, mixed_list->GetSize());
 
-  Value *value = NULL;
+  Value* value = NULL;
   bool bool_value = false;
   int int_value = 0;
   double double_value = 0.0;
   std::string string_value;
 
   ASSERT_FALSE(mixed_list->Get(4, &value));
 
   ASSERT_FALSE(mixed_list->GetInteger(0, &int_value));
   ASSERT_EQ(0, int_value);
   ASSERT_FALSE(mixed_list->GetBoolean(1, &bool_value));
   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_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);
   ASSERT_TRUE(mixed_list->GetInteger(1, &int_value));
   ASSERT_EQ(42, int_value);
-  // implicit conversion from Integer to Double should be possible.
+  // Implicit conversion from Integer to Double should be possible.
   ASSERT_TRUE(mixed_list->GetDouble(1, &double_value));
   ASSERT_EQ(42, double_value);
   ASSERT_TRUE(mixed_list->GetDouble(2, &double_value));
   ASSERT_EQ(88.8, double_value);
   ASSERT_TRUE(mixed_list->GetString(3, &string_value));
   ASSERT_EQ("foo", string_value);
 }
 
 TEST(ValuesTest, BinaryValue) {
   char* buffer = NULL;
@@ skipping 22 matching lines @@
   memset(stack_buffer, '!', 42);
   binary.reset(BinaryValue::CreateWithCopiedBuffer(stack_buffer, 42));
   ASSERT_TRUE(binary.get());
   ASSERT_TRUE(binary->GetBuffer());
   ASSERT_NE(stack_buffer, binary->GetBuffer());
   ASSERT_EQ(42U, binary->GetSize());
   ASSERT_EQ(0, memcmp(stack_buffer, binary->GetBuffer(), binary->GetSize()));
 }
 
 TEST(ValuesTest, StringValue) {
-  // Test overloaded CreateStringValue.
-  scoped_ptr<Value> narrow_value(Value::CreateStringValue("narrow"));
+  // Test overloaded StringValue::New.
+  scoped_ptr<Value> narrow_value(StringValue::New("narrow"));
   ASSERT_TRUE(narrow_value.get());
   ASSERT_TRUE(narrow_value->IsType(Value::TYPE_STRING));
-  scoped_ptr<Value> utf16_value(
-      Value::CreateStringValue(ASCIIToUTF16("utf16")));
+  scoped_ptr<Value> utf16_value(StringValue::New(ASCIIToUTF16("utf16")));
   ASSERT_TRUE(utf16_value.get());
   ASSERT_TRUE(utf16_value->IsType(Value::TYPE_STRING));
 
   // Test overloaded GetString.
   std::string narrow = "http://google.com";
   string16 utf16 = ASCIIToUTF16("http://google.com");
   ASSERT_TRUE(narrow_value->GetAsString(&narrow));
   ASSERT_TRUE(narrow_value->GetAsString(&utf16));
   ASSERT_EQ(std::string("narrow"), narrow);
   ASSERT_EQ(ASCIIToUTF16("narrow"), utf16);
@@ skipping 41 matching lines @@
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     list.Clear();
     EXPECT_TRUE(deletion_flag);
   }
 
   {
     ListValue list;
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
-    EXPECT_TRUE(list.Set(0, Value::CreateNullValue()));
+    EXPECT_TRUE(list.Set(0, NullValue()));
     EXPECT_TRUE(deletion_flag);
   }
 }
 
 TEST(ValuesTest, ListRemoval) {
   bool deletion_flag = true;
   Value* removed_item = NULL;
 
   {
     ListValue list;
@@ skipping 50 matching lines @@
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     dict.Clear();
     EXPECT_TRUE(deletion_flag);
   }
 
   {
     DictionaryValue dict;
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
-    dict.Set(key, Value::CreateNullValue());
+    dict.Set(key, NullValue());
     EXPECT_TRUE(deletion_flag);
   }
 }
 
 TEST(ValuesTest, DictionaryRemoval) {
   std::string key = "test";
   bool deletion_flag = true;
   Value* removed_item = NULL;
 
   {
@@ skipping 17 matching lines @@
     EXPECT_FALSE(deletion_flag);
     EXPECT_TRUE(dict.HasKey(key));
     EXPECT_TRUE(dict.Remove(key, NULL));
     EXPECT_TRUE(deletion_flag);
     EXPECT_FALSE(dict.HasKey(key));
   }
 }
 
 TEST(ValuesTest, DictionaryWithoutPathExpansion) {
   DictionaryValue dict;
-  dict.Set("this.is.expanded", Value::CreateNullValue());
-  dict.SetWithoutPathExpansion("this.isnt.expanded", Value::CreateNullValue());
+  dict.Set("this.is.expanded", NullValue());
+  dict.SetWithoutPathExpansion("this.isnt.expanded", NullValue());
 
   EXPECT_FALSE(dict.HasKey("this.is.expanded"));
   EXPECT_TRUE(dict.HasKey("this"));
   Value* value1;
   EXPECT_TRUE(dict.Get("this", &value1));
   DictionaryValue* value2;
   ASSERT_TRUE(dict.GetDictionaryWithoutPathExpansion("this", &value2));
   EXPECT_EQ(value1, value2);
   EXPECT_EQ(1U, value2->size());
 
   EXPECT_TRUE(dict.HasKey("this.isnt.expanded"));
   Value* value3;
   EXPECT_FALSE(dict.Get("this.isnt.expanded", &value3));
   Value* value4;
   ASSERT_TRUE(dict.GetWithoutPathExpansion("this.isnt.expanded", &value4));
   EXPECT_EQ(Value::TYPE_NULL, value4->GetType());
 }
 
 TEST(ValuesTest, DeepCopy) {
   DictionaryValue original_dict;
-  Value* original_null = Value::CreateNullValue();
+  Value* original_null = NullValue();
   original_dict.Set("null", original_null);
-  FundamentalValue* original_bool = Value::CreateBooleanValue(true);
+  BooleanValue* original_bool = TrueValue();
   original_dict.Set("bool", original_bool);
-  FundamentalValue* original_int = Value::CreateIntegerValue(42);
+  NumberValue* original_int = NumberValue::New(42);
   original_dict.Set("int", original_int);
-  FundamentalValue* original_double = Value::CreateDoubleValue(3.14);
+  NumberValue* original_double = NumberValue::New(3.14);
   original_dict.Set("double", original_double);
-  StringValue* original_string = Value::CreateStringValue("hello");
+  StringValue* original_string = StringValue::New("hello");
   original_dict.Set("string", original_string);
-  StringValue* original_string16 =
-      Value::CreateStringValue(ASCIIToUTF16("hello16"));
+  StringValue* original_string16 = StringValue::New(ASCIIToUTF16("hello16"));
   original_dict.Set("string16", original_string16);
 
   char* original_buffer = new char[42];
   memset(original_buffer, '!', 42);
   BinaryValue* original_binary = BinaryValue::Create(original_buffer, 42);
   original_dict.Set("binary", original_binary);
 
   ListValue* original_list = new ListValue();
-  FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0);
+  NumberValue* original_list_element_0 = NumberValue::New(0);
   original_list->Append(original_list_element_0);
-  FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1);
+  NumberValue* original_list_element_1 = NumberValue::New(1);
   original_list->Append(original_list_element_1);
   original_dict.Set("list", original_list);
 
   scoped_ptr<DictionaryValue> copy_dict(original_dict.DeepCopy());
   ASSERT_TRUE(copy_dict.get());
   ASSERT_NE(copy_dict.get(), &original_dict);
 
   Value* copy_null = NULL;
   ASSERT_TRUE(copy_dict->Get("null", &copy_null));
   ASSERT_TRUE(copy_null);
@@ skipping 81 matching lines @@
   Value* copy_list_element_1;
   ASSERT_TRUE(copy_list->Get(1, &copy_list_element_1));
   ASSERT_TRUE(copy_list_element_1);
   ASSERT_NE(copy_list_element_1, original_list_element_1);
   int copy_list_element_1_value;
   ASSERT_TRUE(copy_list_element_1->GetAsInteger(&copy_list_element_1_value));
   ASSERT_EQ(1, copy_list_element_1_value);
 }
 
 TEST(ValuesTest, Equals) {
-  Value* null1 = Value::CreateNullValue();
-  Value* null2 = Value::CreateNullValue();
+  Value* null1 = NullValue();
+  Value* null2 = NullValue();
   EXPECT_NE(null1, null2);
   EXPECT_TRUE(null1->Equals(null2));
 
-  Value* boolean = Value::CreateBooleanValue(false);
+  Value* boolean = FalseValue();
   EXPECT_FALSE(null1->Equals(boolean));
   delete null1;
   delete null2;
   delete boolean;
 
   DictionaryValue dv;
   dv.SetBoolean("a", false);
   dv.SetInteger("b", 2);
   dv.SetDouble("c", 2.5);
   dv.SetString("d1", "string");
   dv.SetString("d2", ASCIIToUTF16("http://google.com"));
-  dv.Set("e", Value::CreateNullValue());
+  dv.Set("e", NullValue());
 
   scoped_ptr<DictionaryValue> copy;
   copy.reset(dv.DeepCopy());
   EXPECT_TRUE(dv.Equals(copy.get()));
 
   ListValue* list = new ListValue;
-  list->Append(Value::CreateNullValue());
+  list->Append(NullValue());
   list->Append(new DictionaryValue);
   dv.Set("f", list);
 
   EXPECT_FALSE(dv.Equals(copy.get()));
   copy->Set("f", list->DeepCopy());
   EXPECT_TRUE(dv.Equals(copy.get()));
 
-  list->Append(Value::CreateBooleanValue(true));
+  list->Append(TrueValue());
   EXPECT_FALSE(dv.Equals(copy.get()));
 
   // Check if Equals detects differences in only the keys.
   copy.reset(dv.DeepCopy());
   EXPECT_TRUE(dv.Equals(copy.get()));
   copy->Remove("a", NULL);
   copy->SetBoolean("aa", false);
   EXPECT_FALSE(dv.Equals(copy.get()));
 }
 
 TEST(ValuesTest, StaticEquals) {
-  scoped_ptr<Value> null1(Value::CreateNullValue());
-  scoped_ptr<Value> null2(Value::CreateNullValue());
+  scoped_ptr<Value> null1(NullValue());
+  scoped_ptr<Value> null2(NullValue());
   EXPECT_TRUE(Value::Equals(null1.get(), null2.get()));
   EXPECT_TRUE(Value::Equals(NULL, NULL));
 
-  scoped_ptr<Value> i42(Value::CreateIntegerValue(42));
-  scoped_ptr<Value> j42(Value::CreateIntegerValue(42));
-  scoped_ptr<Value> i17(Value::CreateIntegerValue(17));
+  scoped_ptr<Value> i42(NumberValue::New(42));
+  scoped_ptr<Value> j42(NumberValue::New(42));
+  scoped_ptr<Value> i17(NumberValue::New(17));
   EXPECT_TRUE(Value::Equals(i42.get(), i42.get()));
   EXPECT_TRUE(Value::Equals(j42.get(), i42.get()));
   EXPECT_TRUE(Value::Equals(i42.get(), j42.get()));
   EXPECT_FALSE(Value::Equals(i42.get(), i17.get()));
   EXPECT_FALSE(Value::Equals(i42.get(), NULL));
   EXPECT_FALSE(Value::Equals(NULL, i42.get()));
 
-  // NULL and Value::CreateNullValue() are intentionally different: We need
+  // NULL and NullValue() are intentionally different: We need
   // support for NULL as a return value for "undefined" without caring for
   // ownership of the pointer.
   EXPECT_FALSE(Value::Equals(null1.get(), NULL));
   EXPECT_FALSE(Value::Equals(NULL, null1.get()));
 }
 
 TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
   DictionaryValue original_dict;
-  Value* original_null = Value::CreateNullValue();
+  Value* original_null = NullValue();
   original_dict.Set("null", original_null);
-  FundamentalValue* original_bool = Value::CreateBooleanValue(true);
+  BooleanValue* original_bool = TrueValue();
   original_dict.Set("bool", original_bool);
-  FundamentalValue* original_int = Value::CreateIntegerValue(42);
+  NumberValue* original_int = NumberValue::New(42);
   original_dict.Set("int", original_int);
-  FundamentalValue* original_double = Value::CreateDoubleValue(3.14);
+  NumberValue* original_double = NumberValue::New(3.14);
   original_dict.Set("double", original_double);
-  StringValue* original_string = Value::CreateStringValue("hello");
+  StringValue* original_string = StringValue::New("hello");
   original_dict.Set("string", original_string);
-  StringValue* original_string16 =
-      Value::CreateStringValue(ASCIIToUTF16("hello16"));
+  StringValue* original_string16 = StringValue::New(ASCIIToUTF16("hello16"));
   original_dict.Set("string16", original_string16);
 
   char* original_buffer = new char[42];
   memset(original_buffer, '!', 42);
   BinaryValue* original_binary = BinaryValue::Create(original_buffer, 42);
   original_dict.Set("binary", original_binary);
 
   ListValue* original_list = new ListValue();
-  FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0);
+  NumberValue* original_list_element_0 = NumberValue::New(0);
   original_list->Append(original_list_element_0);
-  FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1);
+  NumberValue* original_list_element_1 = NumberValue::New(1);
   original_list->Append(original_list_element_1);
   original_dict.Set("list", original_list);
 
   Value* original_dict_value = &original_dict;
   Value* original_bool_value = original_bool;
   Value* original_int_value = original_int;
   Value* original_double_value = original_double;
   Value* original_string_value = original_string;
   Value* original_string16_value = original_string16;
   Value* original_binary_value = original_binary;
@@ skipping 76 matching lines @@
     EXPECT_EQ(2U, root->size());
   }
 
   // Make sure nested values don't get pruned.
   {
     ListValue* inner = new ListValue;
     root->Set("list_with_empty_children", inner);
     ListValue* inner2 = new ListValue;
     inner->Append(new DictionaryValue);
     inner->Append(inner2);
-    inner2->Append(Value::CreateStringValue("hello"));
+    inner2->Append(StringValue::New("hello"));
     root.reset(root->DeepCopyWithoutEmptyChildren());
     EXPECT_EQ(3U, root->size());
     EXPECT_TRUE(root->GetList("list_with_empty_children", &inner));
     EXPECT_EQ(1U, inner->GetSize());  // Dictionary was pruned.
     EXPECT_TRUE(inner->GetList(0, &inner2));
     EXPECT_EQ(1U, inner2->GetSize());
   }
 }
 
 TEST(ValuesTest, MergeDictionary) {
@@ skipping 35 matching lines @@
   std::string sub_collide_key_value;
   EXPECT_TRUE(res_sub_dict->GetString("sub_collide_key",
                                       &sub_collide_key_value));
   EXPECT_EQ("sub_collide_key_value_merge", sub_collide_key_value); // Replaced.
   std::string sub_merge_key_value;
   EXPECT_TRUE(res_sub_dict->GetString("sub_merge_key", &sub_merge_key_value));
   EXPECT_EQ("sub_merge_key_value_merge", sub_merge_key_value); // Merged in.
 }
 
 }  // namespace base