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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/values_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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/android/search_geolocation/search_geolocation_service_unittest.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 37759d0bed3e335b011f67867e9d0df641d64ded..b44f80ce23389aa71b804f71d034c0f580d0b3df 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -20,23 +20,23 @@ namespace base {
// Group of tests for the value constructors.
TEST(ValuesTest, ConstructBool) {
- FundamentalValue true_value(true);
+ Value true_value(true);
EXPECT_EQ(Value::Type::BOOLEAN, true_value.type());
EXPECT_TRUE(true_value.GetBool());
- FundamentalValue false_value(false);
+ Value false_value(false);
EXPECT_EQ(Value::Type::BOOLEAN, false_value.type());
EXPECT_FALSE(false_value.GetBool());
}
TEST(ValuesTest, ConstructInt) {
- FundamentalValue value(-37);
+ Value value(-37);
EXPECT_EQ(Value::Type::INTEGER, value.type());
EXPECT_EQ(-37, value.GetInt());
}
TEST(ValuesTest, ConstructDouble) {
- FundamentalValue value(-4.655);
+ Value value(-4.655);
EXPECT_EQ(Value::Type::DOUBLE, value.type());
EXPECT_EQ(-4.655, value.GetDouble());
}
@@ -103,13 +103,13 @@ TEST(ValuesTest, ConstructList) {
// checks comparisons of the interesting fields are done instead of relying on
// Equals being correct.
TEST(ValuesTest, CopyBool) {
- FundamentalValue true_value(true);
- FundamentalValue copied_true_value(true_value);
+ Value true_value(true);
+ Value copied_true_value(true_value);
EXPECT_EQ(true_value.type(), copied_true_value.type());
EXPECT_EQ(true_value.GetBool(), copied_true_value.GetBool());
- FundamentalValue false_value(false);
- FundamentalValue copied_false_value(false_value);
+ Value false_value(false);
+ Value copied_false_value(false_value);
EXPECT_EQ(false_value.type(), copied_false_value.type());
EXPECT_EQ(false_value.GetBool(), copied_false_value.GetBool());
@@ -125,8 +125,8 @@ TEST(ValuesTest, CopyBool) {
}
TEST(ValuesTest, CopyInt) {
- FundamentalValue value(74);
- FundamentalValue copied_value(value);
+ Value value(74);
+ Value copied_value(value);
EXPECT_EQ(value.type(), copied_value.type());
EXPECT_EQ(value.GetInt(), copied_value.GetInt());
@@ -138,8 +138,8 @@ TEST(ValuesTest, CopyInt) {
}
TEST(ValuesTest, CopyDouble) {
- FundamentalValue value(74.896);
- FundamentalValue copied_value(value);
+ Value value(74.896);
+ Value copied_value(value);
EXPECT_EQ(value.type(), copied_value.type());
EXPECT_EQ(value.GetDouble(), copied_value.GetDouble());
@@ -222,49 +222,49 @@ TEST(ValuesTest, CopyList) {
// Group of tests for the move constructors and move-assigmnent.
TEST(ValuesTest, MoveBool) {
- FundamentalValue true_value(true);
- FundamentalValue moved_true_value(std::move(true_value));
+ Value true_value(true);
+ Value moved_true_value(std::move(true_value));
EXPECT_EQ(Value::Type::BOOLEAN, moved_true_value.type());
EXPECT_TRUE(moved_true_value.GetBool());
- FundamentalValue false_value(false);
- FundamentalValue moved_false_value(std::move(false_value));
+ Value false_value(false);
+ Value moved_false_value(std::move(false_value));
EXPECT_EQ(Value::Type::BOOLEAN, moved_false_value.type());
EXPECT_FALSE(moved_false_value.GetBool());
Value blank;
- blank = FundamentalValue(true);
+ blank = Value(true);
EXPECT_EQ(Value::Type::BOOLEAN, blank.type());
EXPECT_TRUE(blank.GetBool());
- blank = FundamentalValue(false);
+ blank = Value(false);
EXPECT_EQ(Value::Type::BOOLEAN, blank.type());
EXPECT_FALSE(blank.GetBool());
}
TEST(ValuesTest, MoveInt) {
- FundamentalValue value(74);
- FundamentalValue moved_value(std::move(value));
+ Value value(74);
+ Value moved_value(std::move(value));
EXPECT_EQ(Value::Type::INTEGER, moved_value.type());
EXPECT_EQ(74, moved_value.GetInt());
Value blank;
- blank = FundamentalValue(47);
+ blank = Value(47);
EXPECT_EQ(Value::Type::INTEGER, blank.type());
EXPECT_EQ(47, blank.GetInt());
}
TEST(ValuesTest, MoveDouble) {
- FundamentalValue value(74.896);
- FundamentalValue moved_value(std::move(value));
+ Value value(74.896);
+ Value moved_value(std::move(value));
EXPECT_EQ(Value::Type::DOUBLE, moved_value.type());
EXPECT_EQ(74.896, moved_value.GetDouble());
Value blank;
- blank = FundamentalValue(654.38);
+ blank = Value(654.38);
EXPECT_EQ(Value::Type::DOUBLE, blank.type());
EXPECT_EQ(654.38, blank.GetDouble());
}
@@ -379,9 +379,9 @@ TEST(ValuesTest, Basic) {
TEST(ValuesTest, List) {
std::unique_ptr<ListValue> mixed_list(new ListValue());
- mixed_list->Set(0, MakeUnique<FundamentalValue>(true));
- mixed_list->Set(1, MakeUnique<FundamentalValue>(42));
- mixed_list->Set(2, MakeUnique<FundamentalValue>(88.8));
+ mixed_list->Set(0, MakeUnique<Value>(true));
+ mixed_list->Set(1, MakeUnique<Value>(42));
+ mixed_list->Set(2, MakeUnique<Value>(88.8));
mixed_list->Set(3, MakeUnique<StringValue>("foo"));
ASSERT_EQ(4u, mixed_list->GetSize());
@@ -417,8 +417,8 @@ TEST(ValuesTest, List) {
ASSERT_EQ("foo", string_value);
// Try searching in the mixed list.
- base::FundamentalValue sought_value(42);
- base::FundamentalValue not_found_value(false);
+ base::Value sought_value(42);
+ base::Value not_found_value(false);
ASSERT_NE(mixed_list->end(), mixed_list->Find(sought_value));
ASSERT_TRUE((*mixed_list->Find(sought_value))->GetAsInteger(&int_value));
@@ -642,14 +642,14 @@ TEST(ValuesTest, DeepCopy) {
std::unique_ptr<Value> scoped_null = Value::CreateNullValue();
Value* original_null = scoped_null.get();
original_dict.Set("null", std::move(scoped_null));
- std::unique_ptr<FundamentalValue> scoped_bool(new FundamentalValue(true));
- FundamentalValue* original_bool = scoped_bool.get();
+ std::unique_ptr<Value> scoped_bool(new Value(true));
+ Value* original_bool = scoped_bool.get();
original_dict.Set("bool", std::move(scoped_bool));
- std::unique_ptr<FundamentalValue> scoped_int(new FundamentalValue(42));
- FundamentalValue* original_int = scoped_int.get();
+ std::unique_ptr<Value> scoped_int(new Value(42));
+ Value* original_int = scoped_int.get();
original_dict.Set("int", std::move(scoped_int));
- std::unique_ptr<FundamentalValue> scoped_double(new FundamentalValue(3.14));
- FundamentalValue* original_double = scoped_double.get();
+ std::unique_ptr<Value> scoped_double(new Value(3.14));
+ Value* original_double = scoped_double.get();
original_dict.Set("double", std::move(scoped_double));
std::unique_ptr<StringValue> scoped_string(new StringValue("hello"));
StringValue* original_string = scoped_string.get();
@@ -667,12 +667,10 @@ TEST(ValuesTest, DeepCopy) {
std::unique_ptr<ListValue> scoped_list(new ListValue());
Value* original_list = scoped_list.get();
- std::unique_ptr<FundamentalValue> scoped_list_element_0(
- new FundamentalValue(0));
+ std::unique_ptr<Value> scoped_list_element_0(new Value(0));
Value* original_list_element_0 = scoped_list_element_0.get();
scoped_list->Append(std::move(scoped_list_element_0));
- std::unique_ptr<FundamentalValue> scoped_list_element_1(
- new FundamentalValue(1));
+ std::unique_ptr<Value> scoped_list_element_1(new Value(1));
Value* original_list_element_1 = scoped_list_element_1.get();
scoped_list->Append(std::move(scoped_list_element_1));
original_dict.Set("list", std::move(scoped_list));
@@ -795,7 +793,7 @@ TEST(ValuesTest, Equals) {
EXPECT_NE(null1.get(), null2.get());
EXPECT_TRUE(null1->Equals(null2.get()));
- FundamentalValue boolean(false);
+ Value boolean(false);
EXPECT_FALSE(null1->Equals(&boolean));
DictionaryValue dv;
@@ -820,7 +818,7 @@ TEST(ValuesTest, Equals) {
copy->Set("f", std::move(list_copy));
EXPECT_TRUE(dv.Equals(copy.get()));
- original_list->Append(MakeUnique<FundamentalValue>(true));
+ original_list->Append(MakeUnique<Value>(true));
EXPECT_FALSE(dv.Equals(copy.get()));
// Check if Equals detects differences in only the keys.
@@ -837,9 +835,9 @@ TEST(ValuesTest, StaticEquals) {
EXPECT_TRUE(Value::Equals(null1.get(), null2.get()));
EXPECT_TRUE(Value::Equals(NULL, NULL));
- std::unique_ptr<Value> i42(new FundamentalValue(42));
- std::unique_ptr<Value> j42(new FundamentalValue(42));
- std::unique_ptr<Value> i17(new FundamentalValue(17));
+ std::unique_ptr<Value> i42(new Value(42));
+ std::unique_ptr<Value> j42(new Value(42));
+ std::unique_ptr<Value> i17(new Value(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()));
@@ -859,13 +857,13 @@ TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
std::unique_ptr<Value> scoped_null(Value::CreateNullValue());
Value* original_null = scoped_null.get();
original_dict.Set("null", std::move(scoped_null));
- std::unique_ptr<FundamentalValue> scoped_bool(new FundamentalValue(true));
+ std::unique_ptr<Value> scoped_bool(new Value(true));
Value* original_bool = scoped_bool.get();
original_dict.Set("bool", std::move(scoped_bool));
- std::unique_ptr<FundamentalValue> scoped_int(new FundamentalValue(42));
+ std::unique_ptr<Value> scoped_int(new Value(42));
Value* original_int = scoped_int.get();
original_dict.Set("int", std::move(scoped_int));
- std::unique_ptr<FundamentalValue> scoped_double(new FundamentalValue(3.14));
+ std::unique_ptr<Value> scoped_double(new Value(3.14));
Value* original_double = scoped_double.get();
original_dict.Set("double", std::move(scoped_double));
std::unique_ptr<StringValue> scoped_string(new StringValue("hello"));
@@ -884,11 +882,9 @@ TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
std::unique_ptr<ListValue> scoped_list(new ListValue());
Value* original_list = scoped_list.get();
- std::unique_ptr<FundamentalValue> scoped_list_element_0(
- new FundamentalValue(0));
+ std::unique_ptr<Value> scoped_list_element_0(new Value(0));
scoped_list->Append(std::move(scoped_list_element_0));
- std::unique_ptr<FundamentalValue> scoped_list_element_1(
- new FundamentalValue(1));
+ std::unique_ptr<Value> scoped_list_element_1(new Value(1));
scoped_list->Append(std::move(scoped_list_element_1));
original_dict.Set("list", std::move(scoped_list));
@@ -1111,9 +1107,9 @@ TEST(ValuesTest, GetWithNullOutValue) {
DictionaryValue main_dict;
ListValue main_list;
- FundamentalValue bool_value(false);
- FundamentalValue int_value(1234);
- FundamentalValue double_value(12.34567);
+ Value bool_value(false);
+ Value int_value(1234);
+ Value double_value(12.34567);
StringValue string_value("foo");
BinaryValue binary_value(Value::Type::BINARY);
DictionaryValue dict_value;
« no previous file with comments | « base/values.cc ('k') | chrome/browser/android/search_geolocation/search_geolocation_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698