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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/common/features/simple_feature_unittest.cc

Issue 2151583003: [Extensions] Add extension feature generation code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include fix Created 4 years, 5 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 | « extensions/common/features/simple_feature.cc ('k') | tools/json_schema_compiler/feature_compiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/features/simple_feature_unittest.cc
diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc
index bb5c6440941fd8ef2cbe8d25723418ecbdf7f272..2f40b81083befc0f0c6353259130194f1fa5b1da 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -115,8 +115,8 @@ TEST_F(SimpleFeatureTest, Whitelist) {
const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
const std::string kIdBaz("bazabbbbccccddddeeeeffffgggghhhh");
SimpleFeature feature;
- feature.whitelist()->push_back(kIdFoo);
- feature.whitelist()->push_back(kIdBar);
+ feature.whitelist_.push_back(kIdFoo);
+ feature.whitelist_.push_back(kIdBar);
EXPECT_EQ(
Feature::IS_AVAILABLE,
@@ -148,7 +148,7 @@ TEST_F(SimpleFeatureTest, Whitelist) {
-1,
Feature::UNSPECIFIED_PLATFORM).result());
- feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+ feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
EXPECT_EQ(
Feature::NOT_FOUND_IN_WHITELIST,
feature.IsAvailableToManifest(kIdBaz,
@@ -165,7 +165,7 @@ TEST_F(SimpleFeatureTest, HashedIdWhitelist) {
const std::string kIdFooHashed("55BC7228A0D502A2A48C9BB16B07062A01E62897");
SimpleFeature feature;
- feature.whitelist()->push_back(kIdFooHashed);
+ feature.whitelist_.push_back(kIdFooHashed);
EXPECT_EQ(
Feature::IS_AVAILABLE,
@@ -202,8 +202,8 @@ TEST_F(SimpleFeatureTest, Blacklist) {
const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
const std::string kIdBaz("bazabbbbccccddddeeeeffffgggghhhh");
SimpleFeature feature;
- feature.blacklist()->push_back(kIdFoo);
- feature.blacklist()->push_back(kIdBar);
+ feature.blacklist_.push_back(kIdFoo);
+ feature.blacklist_.push_back(kIdBar);
EXPECT_EQ(
Feature::FOUND_IN_BLACKLIST,
@@ -243,7 +243,7 @@ TEST_F(SimpleFeatureTest, HashedIdBlacklist) {
const std::string kIdFooHashed("55BC7228A0D502A2A48C9BB16B07062A01E62897");
SimpleFeature feature;
- feature.blacklist()->push_back(kIdFooHashed);
+ feature.blacklist_.push_back(kIdFooHashed);
EXPECT_EQ(
Feature::FOUND_IN_BLACKLIST,
@@ -277,8 +277,8 @@ TEST_F(SimpleFeatureTest, HashedIdBlacklist) {
TEST_F(SimpleFeatureTest, PackageType) {
SimpleFeature feature;
- feature.extension_types()->push_back(Manifest::TYPE_EXTENSION);
- feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+ feature.extension_types_.push_back(Manifest::TYPE_EXTENSION);
+ feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
EXPECT_EQ(
Feature::IS_AVAILABLE,
@@ -314,9 +314,9 @@ TEST_F(SimpleFeatureTest, PackageType) {
TEST_F(SimpleFeatureTest, Context) {
SimpleFeature feature;
feature.set_name("somefeature");
- feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
- feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
- feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+ feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+ feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+ feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
feature.set_min_manifest_version(21);
feature.set_max_manifest_version(25);
@@ -333,14 +333,14 @@ TEST_F(SimpleFeatureTest, Context) {
EXPECT_EQ("", error);
ASSERT_TRUE(extension.get());
- feature.whitelist()->push_back("monkey");
+ feature.whitelist_.push_back("monkey");
EXPECT_EQ(Feature::NOT_FOUND_IN_WHITELIST, feature.IsAvailableToContext(
extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
Feature::CHROMEOS_PLATFORM).result());
- feature.whitelist()->clear();
+ feature.whitelist_.clear();
- feature.extension_types()->clear();
- feature.extension_types()->push_back(Manifest::TYPE_THEME);
+ feature.extension_types_.clear();
+ feature.extension_types_.push_back(Manifest::TYPE_THEME);
{
Feature::Availability availability = feature.IsAvailableToContext(
extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
@@ -351,11 +351,11 @@ TEST_F(SimpleFeatureTest, Context) {
availability.message());
}
- feature.extension_types()->clear();
- feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
- feature.contexts()->clear();
- feature.contexts()->push_back(Feature::UNBLESSED_EXTENSION_CONTEXT);
- feature.contexts()->push_back(Feature::CONTENT_SCRIPT_CONTEXT);
+ feature.extension_types_.clear();
+ feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+ feature.contexts_.clear();
+ feature.contexts_.push_back(Feature::UNBLESSED_EXTENSION_CONTEXT);
+ feature.contexts_.push_back(Feature::CONTENT_SCRIPT_CONTEXT);
{
Feature::Availability availability = feature.IsAvailableToContext(
extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
@@ -366,7 +366,7 @@ TEST_F(SimpleFeatureTest, Context) {
availability.message());
}
- feature.contexts()->push_back(Feature::WEB_PAGE_CONTEXT);
+ feature.contexts_.push_back(Feature::WEB_PAGE_CONTEXT);
{
Feature::Availability availability = feature.IsAvailableToContext(
extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
@@ -377,8 +377,8 @@ TEST_F(SimpleFeatureTest, Context) {
availability.message());
}
- feature.contexts()->clear();
- feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+ feature.contexts_.clear();
+ feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
feature.set_location(SimpleFeature::COMPONENT_LOCATION);
EXPECT_EQ(Feature::INVALID_LOCATION, feature.IsAvailableToContext(
extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
@@ -451,7 +451,7 @@ TEST_F(SimpleFeatureTest, Location) {
TEST_F(SimpleFeatureTest, Platform) {
SimpleFeature feature;
- feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+ feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
EXPECT_EQ(Feature::IS_AVAILABLE,
feature.IsAvailableToManifest(std::string(),
Manifest::TYPE_UNKNOWN,
@@ -530,11 +530,11 @@ TEST_F(SimpleFeatureTest, ParseNull) {
std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
feature->Parse(value.get());
- EXPECT_TRUE(feature->whitelist()->empty());
- EXPECT_TRUE(feature->extension_types()->empty());
- EXPECT_TRUE(feature->contexts()->empty());
+ EXPECT_TRUE(feature->whitelist().empty());
+ EXPECT_TRUE(feature->extension_types().empty());
+ EXPECT_TRUE(feature->contexts().empty());
EXPECT_EQ(SimpleFeature::UNSPECIFIED_LOCATION, feature->location());
- EXPECT_TRUE(feature->platforms()->empty());
+ EXPECT_TRUE(feature->platforms().empty());
EXPECT_EQ(0, feature->min_manifest_version());
EXPECT_EQ(0, feature->max_manifest_version());
}
@@ -547,9 +547,9 @@ TEST_F(SimpleFeatureTest, ParseWhitelist) {
value->Set("whitelist", whitelist);
std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
feature->Parse(value.get());
- EXPECT_EQ(2u, feature->whitelist()->size());
- EXPECT_TRUE(STLCount(*(feature->whitelist()), "foo"));
- EXPECT_TRUE(STLCount(*(feature->whitelist()), "bar"));
+ EXPECT_EQ(2u, feature->whitelist().size());
+ EXPECT_TRUE(STLCount(feature->whitelist(), "foo"));
+ EXPECT_TRUE(STLCount(feature->whitelist(), "bar"));
}
TEST_F(SimpleFeatureTest, ParsePackageTypes) {
@@ -564,25 +564,21 @@ TEST_F(SimpleFeatureTest, ParsePackageTypes) {
value->Set("extension_types", extension_types);
std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
feature->Parse(value.get());
- EXPECT_EQ(6u, feature->extension_types()->size());
+ EXPECT_EQ(6u, feature->extension_types().size());
+ EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_EXTENSION));
+ EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_THEME));
EXPECT_TRUE(
- STLCount(*(feature->extension_types()), Manifest::TYPE_EXTENSION));
+ STLCount(feature->extension_types(), Manifest::TYPE_LEGACY_PACKAGED_APP));
+ EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_HOSTED_APP));
EXPECT_TRUE(
- STLCount(*(feature->extension_types()), Manifest::TYPE_THEME));
+ STLCount(feature->extension_types(), Manifest::TYPE_PLATFORM_APP));
EXPECT_TRUE(
- STLCount(
- *(feature->extension_types()), Manifest::TYPE_LEGACY_PACKAGED_APP));
- EXPECT_TRUE(
- STLCount(*(feature->extension_types()), Manifest::TYPE_HOSTED_APP));
- EXPECT_TRUE(
- STLCount(*(feature->extension_types()), Manifest::TYPE_PLATFORM_APP));
- EXPECT_TRUE(
- STLCount(*(feature->extension_types()), Manifest::TYPE_SHARED_MODULE));
+ STLCount(feature->extension_types(), Manifest::TYPE_SHARED_MODULE));
value->SetString("extension_types", "all");
std::unique_ptr<SimpleFeature> feature2(new SimpleFeature());
feature2->Parse(value.get());
- EXPECT_EQ(*(feature->extension_types()), *(feature2->extension_types()));
+ EXPECT_EQ(feature->extension_types(), feature2->extension_types());
}
TEST_F(SimpleFeatureTest, ParseContexts) {
@@ -598,22 +594,19 @@ TEST_F(SimpleFeatureTest, ParseContexts) {
value->Set("contexts", contexts);
std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
feature->Parse(value.get());
- EXPECT_EQ(7u, feature->contexts()->size());
- EXPECT_TRUE(
- STLCount(*(feature->contexts()), Feature::BLESSED_EXTENSION_CONTEXT));
+ EXPECT_EQ(7u, feature->contexts().size());
EXPECT_TRUE(
- STLCount(*(feature->contexts()), Feature::UNBLESSED_EXTENSION_CONTEXT));
+ STLCount(feature->contexts(), Feature::BLESSED_EXTENSION_CONTEXT));
EXPECT_TRUE(
- STLCount(*(feature->contexts()), Feature::CONTENT_SCRIPT_CONTEXT));
- EXPECT_TRUE(
- STLCount(*(feature->contexts()), Feature::WEB_PAGE_CONTEXT));
- EXPECT_TRUE(
- STLCount(*(feature->contexts()), Feature::BLESSED_WEB_PAGE_CONTEXT));
+ STLCount(feature->contexts(), Feature::UNBLESSED_EXTENSION_CONTEXT));
+ EXPECT_TRUE(STLCount(feature->contexts(), Feature::CONTENT_SCRIPT_CONTEXT));
+ EXPECT_TRUE(STLCount(feature->contexts(), Feature::WEB_PAGE_CONTEXT));
+ EXPECT_TRUE(STLCount(feature->contexts(), Feature::BLESSED_WEB_PAGE_CONTEXT));
value->SetString("contexts", "all");
std::unique_ptr<SimpleFeature> feature2(new SimpleFeature());
feature2->Parse(value.get());
- EXPECT_EQ(*(feature->contexts()), *(feature2->contexts()));
+ EXPECT_EQ(feature->contexts(), feature2->contexts());
}
TEST_F(SimpleFeatureTest, ParseLocation) {
@@ -630,18 +623,18 @@ TEST_F(SimpleFeatureTest, ParsePlatforms) {
base::ListValue* platforms = new base::ListValue();
value->Set("platforms", platforms);
feature->Parse(value.get());
- EXPECT_TRUE(feature->platforms()->empty());
+ EXPECT_TRUE(feature->platforms().empty());
platforms->AppendString("chromeos");
feature->Parse(value.get());
- EXPECT_FALSE(feature->platforms()->empty());
- EXPECT_EQ(Feature::CHROMEOS_PLATFORM, *feature->platforms()->begin());
+ EXPECT_FALSE(feature->platforms().empty());
+ EXPECT_EQ(Feature::CHROMEOS_PLATFORM, *feature->platforms().begin());
platforms->Clear();
platforms->AppendString("win");
feature->Parse(value.get());
- EXPECT_FALSE(feature->platforms()->empty());
- EXPECT_EQ(Feature::WIN_PLATFORM, *feature->platforms()->begin());
+ EXPECT_FALSE(feature->platforms().empty());
+ EXPECT_EQ(Feature::WIN_PLATFORM, *feature->platforms().begin());
platforms->Clear();
platforms->AppendString("win");
@@ -651,8 +644,8 @@ TEST_F(SimpleFeatureTest, ParsePlatforms) {
expected_platforms.push_back(Feature::CHROMEOS_PLATFORM);
expected_platforms.push_back(Feature::WIN_PLATFORM);
- EXPECT_FALSE(feature->platforms()->empty());
- EXPECT_EQ(expected_platforms, *feature->platforms());
+ EXPECT_FALSE(feature->platforms().empty());
+ EXPECT_EQ(expected_platforms, feature->platforms());
}
TEST_F(SimpleFeatureTest, ParseManifestVersion) {
@@ -667,11 +660,11 @@ TEST_F(SimpleFeatureTest, ParseManifestVersion) {
TEST_F(SimpleFeatureTest, Inheritance) {
SimpleFeature feature;
- feature.whitelist()->push_back("foo");
- feature.extension_types()->push_back(Manifest::TYPE_THEME);
- feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+ feature.whitelist_.push_back("foo");
+ feature.extension_types_.push_back(Manifest::TYPE_THEME);
+ feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
feature.set_location(SimpleFeature::COMPONENT_LOCATION);
- feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+ feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
feature.set_min_manifest_version(1);
feature.set_max_manifest_version(2);
@@ -679,13 +672,13 @@ TEST_F(SimpleFeatureTest, Inheritance) {
// changes to a SimpleFeature.
base::DictionaryValue definition;
feature.Parse(&definition);
- EXPECT_EQ(1u, feature.whitelist()->size());
- EXPECT_EQ(1u, feature.extension_types()->size());
- EXPECT_EQ(1u, feature.contexts()->size());
- EXPECT_EQ(1, STLCount(*(feature.whitelist()), "foo"));
+ EXPECT_EQ(1u, feature.whitelist().size());
+ EXPECT_EQ(1u, feature.extension_types().size());
+ EXPECT_EQ(1u, feature.contexts().size());
+ EXPECT_EQ(1, STLCount(feature.whitelist(), "foo"));
EXPECT_EQ(SimpleFeature::COMPONENT_LOCATION, feature.location());
- EXPECT_EQ(1u, feature.platforms()->size());
- EXPECT_EQ(1, STLCount(*(feature.platforms()), Feature::CHROMEOS_PLATFORM));
+ EXPECT_EQ(1u, feature.platforms().size());
+ EXPECT_EQ(1, STLCount(feature.platforms(), Feature::CHROMEOS_PLATFORM));
EXPECT_EQ(1, feature.min_manifest_version());
EXPECT_EQ(2, feature.max_manifest_version());
@@ -703,15 +696,13 @@ TEST_F(SimpleFeatureTest, Inheritance) {
definition.Set("max_manifest_version", new base::FundamentalValue(3));
feature.Parse(&definition);
- EXPECT_EQ(1u, feature.whitelist()->size());
- EXPECT_EQ(1u, feature.extension_types()->size());
- EXPECT_EQ(1u, feature.contexts()->size());
- EXPECT_EQ(1, STLCount(*(feature.whitelist()), "bar"));
- EXPECT_EQ(1,
- STLCount(*(feature.extension_types()), Manifest::TYPE_EXTENSION));
+ EXPECT_EQ(1u, feature.whitelist().size());
+ EXPECT_EQ(1u, feature.extension_types().size());
+ EXPECT_EQ(1u, feature.contexts().size());
+ EXPECT_EQ(1, STLCount(feature.whitelist(), "bar"));
+ EXPECT_EQ(1, STLCount(feature.extension_types(), Manifest::TYPE_EXTENSION));
EXPECT_EQ(1,
- STLCount(
- *(feature.contexts()), Feature::UNBLESSED_EXTENSION_CONTEXT));
+ STLCount(feature.contexts(), Feature::UNBLESSED_EXTENSION_CONTEXT));
EXPECT_EQ(2, feature.min_manifest_version());
EXPECT_EQ(3, feature.max_manifest_version());
}
« no previous file with comments | « extensions/common/features/simple_feature.cc ('k') | tools/json_schema_compiler/feature_compiler.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698