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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/json_schema/json_schema_validator_unittest_base.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/dom_distiller/ios/distiller_page_ios.mm ('k') | components/login/base_screen_handler_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/json_schema/json_schema_validator_unittest_base.cc
diff --git a/components/json_schema/json_schema_validator_unittest_base.cc b/components/json_schema/json_schema_validator_unittest_base.cc
index a1da991f9548b5ba4daccb8dda48862b3e0edaca..2d170b24b0a2416074debe5b687fc80ea3ed90d2 100644
--- a/components/json_schema/json_schema_validator_unittest_base.cc
+++ b/components/json_schema/json_schema_validator_unittest_base.cc
@@ -146,11 +146,11 @@ void JSONSchemaValidatorTestBase::TestEnum() {
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
+ std::unique_ptr<base::Value>(new base::Value(false)).get(),
schema.get(), NULL);
ExpectNotValid(
@@ -170,7 +170,7 @@ void JSONSchemaValidatorTestBase::TestChoices() {
NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
std::unique_ptr<base::DictionaryValue> instance(new base::DictionaryValue());
@@ -405,7 +405,7 @@ void JSONSchemaValidatorTestBase::TestArrayTuple() {
ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "1",
JSONSchemaValidator::kArrayItemRequired);
- instance->Set(0, new base::FundamentalValue(42));
+ instance->Set(0, new base::Value(42));
instance->AppendInteger(42);
ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
JSONSchemaValidator::FormatErrorMessage(
@@ -428,7 +428,7 @@ void JSONSchemaValidatorTestBase::TestArrayTuple() {
JSONSchemaValidator::kInvalidType,
schema::kBoolean,
schema::kArray));
- instance->Set(2, new base::FundamentalValue(false));
+ instance->Set(2, new base::Value(false));
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
base::ListValue* items_schema = NULL;
@@ -442,7 +442,7 @@ void JSONSchemaValidatorTestBase::TestArrayTuple() {
// for objects.
instance->Set(0, base::Value::CreateNullValue());
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
- instance->Set(0, new base::FundamentalValue(42));
+ instance->Set(0, new base::Value(42));
ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kInvalidType,
@@ -529,30 +529,30 @@ void JSONSchemaValidatorTestBase::TestNumber() {
schema->SetInteger("maxDecimal", 2);
ExpectValid(TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(1)).get(),
+ std::unique_ptr<base::Value>(new base::Value(1)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(50)).get(),
+ std::unique_ptr<base::Value>(new base::Value(50)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(100)).get(),
+ std::unique_ptr<base::Value>(new base::Value(100)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.88)).get(),
+ std::unique_ptr<base::Value>(new base::Value(88.88)).get(),
schema.get(), NULL);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(0.5)).get(),
+ std::unique_ptr<base::Value>(new base::Value(0.5)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kNumberMinimum, "1"));
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(100.1)).get(),
+ std::unique_ptr<base::Value>(new base::Value(100.1)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kNumberMaximum, "100"));
@@ -561,11 +561,11 @@ void JSONSchemaValidatorTestBase::TestNumber() {
void JSONSchemaValidatorTestBase::TestTypeClassifier() {
EXPECT_EQ(std::string(schema::kBoolean),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(true))
+ std::unique_ptr<base::Value>(new base::Value(true))
.get()));
EXPECT_EQ(std::string(schema::kBoolean),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(false))
+ std::unique_ptr<base::Value>(new base::Value(false))
.get()));
// It doesn't matter whether the C++ type is 'integer' or 'real'. If the
@@ -574,41 +574,41 @@ void JSONSchemaValidatorTestBase::TestTypeClassifier() {
EXPECT_EQ(
std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get()));
+ std::unique_ptr<base::Value>(new base::Value(42)).get()));
EXPECT_EQ(
std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get()));
+ std::unique_ptr<base::Value>(new base::Value(0)).get()));
EXPECT_EQ(
std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get()));
+ std::unique_ptr<base::Value>(new base::Value(42)).get()));
EXPECT_EQ(std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(2.0, DBL_MANT_DIG)))
+ new base::Value(pow(2.0, DBL_MANT_DIG)))
.get()));
EXPECT_EQ(std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG)))
+ new base::Value(pow(-2.0, DBL_MANT_DIG)))
.get()));
// "number" is only used for non-integral numbers, or numbers beyond what
// double can accurately represent.
EXPECT_EQ(std::string(schema::kNumber),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.8))
+ std::unique_ptr<base::Value>(new base::Value(88.8))
.get()));
EXPECT_EQ(std::string(schema::kNumber),
JSONSchemaValidator::GetJSONSchemaType(
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(2.0, DBL_MANT_DIG) * 2))
+ new base::Value(pow(2.0, DBL_MANT_DIG) * 2))
.get()));
EXPECT_EQ(std::string(schema::kNumber),
JSONSchemaValidator::GetJSONSchemaType(
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG) * 2))
+ new base::Value(pow(-2.0, DBL_MANT_DIG) * 2))
.get()));
EXPECT_EQ(
@@ -650,51 +650,51 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kNumber);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.8)).get(),
+ std::unique_ptr<base::Value>(new base::Value(88.8)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
ExpectValid(TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get(),
+ std::unique_ptr<base::Value>(new base::Value(0)).get(),
schema.get(), NULL);
schema->SetString(schema::kType, schema::kInteger);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL);
ExpectValid(TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get(),
+ std::unique_ptr<base::Value>(new base::Value(0)).get(),
schema.get(), NULL);
ExpectValid(TEST_SOURCE,
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(2.0, DBL_MANT_DIG)))
+ new base::Value(pow(2.0, DBL_MANT_DIG)))
.get(),
schema.get(), NULL);
ExpectValid(TEST_SOURCE,
std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG)))
+ new base::Value(pow(-2.0, DBL_MANT_DIG)))
.get(),
schema.get(), NULL);
schema->SetString(schema::kType, schema::kBoolean);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
+ std::unique_ptr<base::Value>(new base::Value(false)).get(),
schema.get(), NULL);
ExpectValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(true)).get(),
+ std::unique_ptr<base::Value>(new base::Value(true)).get(),
schema.get(), NULL);
schema->SetString(schema::kType, schema::kNull);
@@ -719,7 +719,7 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kArray);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kInvalidType, schema::kArray, schema::kInteger));
@@ -727,7 +727,7 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kString);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
schema::kString,
@@ -744,14 +744,14 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kInteger);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.8)).get(),
+ std::unique_ptr<base::Value>(new base::Value(88.8)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::kInvalidTypeIntegerNumber);
schema->SetString(schema::kType, schema::kBoolean);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(1)).get(),
+ std::unique_ptr<base::Value>(new base::Value(1)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
schema::kBoolean,
@@ -760,7 +760,7 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kNull);
ExpectNotValid(
TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
+ std::unique_ptr<base::Value>(new base::Value(false)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
schema::kNull, schema::kBoolean));
« no previous file with comments | « components/dom_distiller/ios/distiller_page_ios.mm ('k') | components/login/base_screen_handler_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698