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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/json_schema/json_schema_validator_unittest_base.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 | « 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 6442fb31d58e215bfe33fe5b1e74d84ff8622647..eb60ebb289fb5d83338ed4967c6c6aeb884b30b8 100644
--- a/components/json_schema/json_schema_validator_unittest_base.cc
+++ b/components/json_schema/json_schema_validator_unittest_base.cc
@@ -144,14 +144,12 @@ void JSONSchemaValidatorTestBase::TestEnum() {
ExpectValid(TEST_SOURCE,
std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
- schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(false)).get(),
+ schema.get(), NULL);
ExpectNotValid(
TEST_SOURCE,
@@ -168,10 +166,9 @@ void JSONSchemaValidatorTestBase::TestChoices() {
ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
- schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
+ schema.get(), NULL);
std::unique_ptr<base::DictionaryValue> instance(new base::DictionaryValue());
instance->SetString("foo", "bar");
@@ -405,7 +402,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 +425,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 +439,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,86 +526,75 @@ 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::Value(50)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(100)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(88.88)).get(),
schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(50)).get(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(100)).get(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.88)).get(),
- schema.get(), NULL);
- ExpectNotValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(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(),
- schema.get(), NULL, std::string(),
- JSONSchemaValidator::FormatErrorMessage(
- JSONSchemaValidator::kNumberMaximum, "100"));
+ ExpectNotValid(TEST_SOURCE,
+ 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::Value(100.1)).get(),
+ schema.get(), NULL, std::string(),
+ JSONSchemaValidator::FormatErrorMessage(
+ JSONSchemaValidator::kNumberMaximum, "100"));
}
void JSONSchemaValidatorTestBase::TestTypeClassifier() {
EXPECT_EQ(std::string(schema::kBoolean),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(true))
- .get()));
+ 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))
- .get()));
+ std::unique_ptr<base::Value>(new base::Value(false)).get()));
// It doesn't matter whether the C++ type is 'integer' or 'real'. If the
// number is integral and within the representable range of integers in
// double, it's classified as 'integer'.
+ EXPECT_EQ(std::string(schema::kInteger),
+ JSONSchemaValidator::GetJSONSchemaType(
+ 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::Value(0)).get()));
+ EXPECT_EQ(std::string(schema::kInteger),
+ JSONSchemaValidator::GetJSONSchemaType(
+ 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(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(pow(2.0, DBL_MANT_DIG)))
+ .get()));
EXPECT_EQ(
std::string(schema::kInteger),
JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get()));
- EXPECT_EQ(std::string(schema::kInteger),
- JSONSchemaValidator::GetJSONSchemaType(
- std::unique_ptr<base::Value>(
- new base::FundamentalValue(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)))
- .get()));
+ std::unique_ptr<base::Value>(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))
- .get()));
+ 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(
@@ -648,55 +634,48 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema.get(), NULL);
schema->SetString(schema::kType, schema::kNumber);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.8)).get(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(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(88.8)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ 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(),
- schema.get(), NULL);
- ExpectValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(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(42)).get(),
schema.get(), NULL);
ExpectValid(TEST_SOURCE,
- std::unique_ptr<base::Value>(
- new base::FundamentalValue(pow(2.0, DBL_MANT_DIG)))
- .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(pow(-2.0, DBL_MANT_DIG)))
- .get(),
+ std::unique_ptr<base::Value>(new base::Value(0)).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(pow(2.0, DBL_MANT_DIG)))
+ .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(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::Value(false)).get(),
+ schema.get(), NULL);
+ ExpectValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(true)).get(),
+ schema.get(), NULL);
+
schema->SetString(schema::kType, schema::kNull);
ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
NULL);
@@ -718,20 +697,18 @@ void JSONSchemaValidatorTestBase::TestTypes() {
schema->SetString(schema::kType, schema::kArray);
ExpectNotValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+ TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value(42)).get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kInvalidType, schema::kArray, schema::kInteger));
schema->SetString(schema::kType, schema::kString);
- ExpectNotValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
- schema.get(), NULL, std::string(),
- JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
- schema::kString,
- schema::kInteger));
+ ExpectNotValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(42)).get(),
+ schema.get(), NULL, std::string(),
+ JSONSchemaValidator::FormatErrorMessage(
+ JSONSchemaValidator::kInvalidType, schema::kString,
+ schema::kInteger));
schema->SetString(schema::kType, schema::kNumber);
ExpectNotValid(
@@ -742,25 +719,22 @@ void JSONSchemaValidatorTestBase::TestTypes() {
JSONSchemaValidator::kInvalidType, schema::kNumber, schema::kString));
schema->SetString(schema::kType, schema::kInteger);
- ExpectNotValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(88.8)).get(),
- schema.get(), NULL, std::string(),
- JSONSchemaValidator::kInvalidTypeIntegerNumber);
+ ExpectNotValid(TEST_SOURCE,
+ 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(),
- schema.get(), NULL, std::string(),
- JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
- schema::kBoolean,
- schema::kInteger));
+ ExpectNotValid(TEST_SOURCE,
+ std::unique_ptr<base::Value>(new base::Value(1)).get(),
+ schema.get(), NULL, std::string(),
+ JSONSchemaValidator::FormatErrorMessage(
+ JSONSchemaValidator::kInvalidType, schema::kBoolean,
+ schema::kInteger));
schema->SetString(schema::kType, schema::kNull);
ExpectNotValid(
- TEST_SOURCE,
- std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
+ TEST_SOURCE, 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