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

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: Dirk's 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') | tools/json_schema_compiler/feature_compiler.py » ('J')
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 50e3bbc6cfa4bd34c5867778152150d412bbe72b..f7403f1c9343953c0c759c6c888dfa1ec567f0c6 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -117,8 +117,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,
@@ -150,7 +150,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,
@@ -167,7 +167,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,
@@ -204,8 +204,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,
@@ -245,7 +245,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,
@@ -279,8 +279,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,
@@ -316,9 +316,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);
@@ -335,14 +335,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,
@@ -353,11 +353,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,
@@ -368,7 +368,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,
@@ -379,8 +379,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,
@@ -453,7 +453,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,
@@ -532,11 +532,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());
}
@@ -549,7 +549,7 @@ 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_EQ(2u, feature->whitelist().size());
EXPECT_TRUE(STLCount(*(feature->whitelist()), "foo"));
EXPECT_TRUE(STLCount(*(feature->whitelist()), "bar"));
}
@@ -566,7 +566,7 @@ 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(
@@ -600,7 +600,7 @@ 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_EQ(7u, feature->contexts().size());
EXPECT_TRUE(
STLCount(*(feature->contexts()), Feature::BLESSED_EXTENSION_CONTEXT));
EXPECT_TRUE(
@@ -632,17 +632,17 @@ 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_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_FALSE(feature->platforms().empty());
EXPECT_EQ(Feature::WIN_PLATFORM, *feature->platforms()->begin());
platforms->Clear();
@@ -653,7 +653,7 @@ TEST_F(SimpleFeatureTest, ParsePlatforms) {
expected_platforms.push_back(Feature::CHROMEOS_PLATFORM);
expected_platforms.push_back(Feature::WIN_PLATFORM);
- EXPECT_FALSE(feature->platforms()->empty());
+ EXPECT_FALSE(feature->platforms().empty());
EXPECT_EQ(expected_platforms, *feature->platforms());
}
@@ -669,11 +669,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);
@@ -681,12 +681,12 @@ 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(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(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());
@@ -705,9 +705,9 @@ 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(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));
« no previous file with comments | « extensions/common/features/simple_feature.cc ('k') | tools/json_schema_compiler/feature_compiler.py » ('j') | tools/json_schema_compiler/feature_compiler.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698