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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/common/permissions/api_permission_set_unittest.cc

Issue 553153005: Move extensions APIPermissionSet tests to extensions_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (api-permissions) cleanup Created 6 years, 3 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
« chrome/common/extensions/permissions/permission_set_unittest.cc ('K') | « chrome/common/extensions/permissions/permission_set_unittest.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/api_permission_set_unittest.cc
diff --git a/extensions/common/permissions/api_permission_set_unittest.cc b/extensions/common/permissions/api_permission_set_unittest.cc
index e007d5b51487e8fdd0117d5fd34f021493c2ebed..0574250d202ab09a979ea55c21c3b2b70e75815e 100644
--- a/extensions/common/permissions/api_permission_set_unittest.cc
+++ b/extensions/common/permissions/api_permission_set_unittest.cc
@@ -14,21 +14,21 @@ namespace extensions {
TEST(APIPermissionSetTest, General) {
APIPermissionSet apis;
- apis.insert(APIPermission::kTab);
- apis.insert(APIPermission::kBackground);
- apis.insert(APIPermission::kProxy);
- apis.insert(APIPermission::kClipboardWrite);
- apis.insert(APIPermission::kPlugin);
+ apis.insert(APIPermission::kAudioCapture);
+ apis.insert(APIPermission::kDns);
+ apis.insert(APIPermission::kHid);
+ apis.insert(APIPermission::kPower);
+ apis.insert(APIPermission::kSerial);
- EXPECT_EQ(apis.find(APIPermission::kProxy)->id(), APIPermission::kProxy);
+ EXPECT_EQ(apis.find(APIPermission::kPower)->id(), APIPermission::kPower);
EXPECT_TRUE(apis.find(APIPermission::kSocket) == apis.end());
EXPECT_EQ(apis.size(), 5u);
- EXPECT_EQ(apis.erase(APIPermission::kTab), 1u);
+ EXPECT_EQ(apis.erase(APIPermission::kAudioCapture), 1u);
EXPECT_EQ(apis.size(), 4u);
- EXPECT_EQ(apis.erase(APIPermission::kTab), 0u);
+ EXPECT_EQ(apis.erase(APIPermission::kAudioCapture), 0u);
EXPECT_EQ(apis.size(), 4u);
}
@@ -52,13 +52,14 @@ TEST(APIPermissionSetTest, CreateUnion) {
}
// Union with an empty set.
- apis1.insert(APIPermission::kTab);
- apis1.insert(APIPermission::kBackground);
+ apis1.insert(APIPermission::kAudioCapture);
+ apis1.insert(APIPermission::kDns);
apis1.insert(permission->Clone());
- expected_apis.insert(APIPermission::kTab);
- expected_apis.insert(APIPermission::kBackground);
+ expected_apis.insert(APIPermission::kAudioCapture);
+ expected_apis.insert(APIPermission::kDns);
expected_apis.insert(permission);
+ ASSERT_TRUE(apis2.empty());
APIPermissionSet::Union(apis1, apis2, &result);
EXPECT_TRUE(apis1.Contains(apis2));
@@ -71,10 +72,10 @@ TEST(APIPermissionSetTest, CreateUnion) {
EXPECT_EQ(expected_apis, result);
// Now use a real second set.
- apis2.insert(APIPermission::kTab);
- apis2.insert(APIPermission::kProxy);
- apis2.insert(APIPermission::kClipboardWrite);
- apis2.insert(APIPermission::kPlugin);
+ apis2.insert(APIPermission::kAudioCapture);
+ apis2.insert(APIPermission::kHid);
+ apis2.insert(APIPermission::kPower);
+ apis2.insert(APIPermission::kSerial);
permission = permission_info->CreateAPIPermission();
{
@@ -85,10 +86,10 @@ TEST(APIPermissionSetTest, CreateUnion) {
}
apis2.insert(permission);
- expected_apis.insert(APIPermission::kTab);
- expected_apis.insert(APIPermission::kProxy);
- expected_apis.insert(APIPermission::kClipboardWrite);
- expected_apis.insert(APIPermission::kPlugin);
+ expected_apis.insert(APIPermission::kAudioCapture);
+ expected_apis.insert(APIPermission::kHid);
+ expected_apis.insert(APIPermission::kPower);
+ expected_apis.insert(APIPermission::kSerial);
permission = permission_info->CreateAPIPermission();
{
@@ -126,8 +127,8 @@ TEST(APIPermissionSetTest, CreateIntersection) {
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
// Intersection with an empty set.
- apis1.insert(APIPermission::kTab);
- apis1.insert(APIPermission::kBackground);
+ apis1.insert(APIPermission::kAudioCapture);
+ apis1.insert(APIPermission::kDns);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -138,7 +139,9 @@ TEST(APIPermissionSetTest, CreateIntersection) {
}
apis1.insert(permission);
+ ASSERT_TRUE(apis2.empty());
APIPermissionSet::Intersection(apis1, apis2, &result);
+
EXPECT_TRUE(apis1.Contains(result));
EXPECT_TRUE(apis2.Contains(result));
EXPECT_TRUE(apis1.Contains(apis2));
@@ -150,10 +153,10 @@ TEST(APIPermissionSetTest, CreateIntersection) {
EXPECT_EQ(expected_apis, result);
// Now use a real second set.
- apis2.insert(APIPermission::kTab);
- apis2.insert(APIPermission::kProxy);
- apis2.insert(APIPermission::kClipboardWrite);
- apis2.insert(APIPermission::kPlugin);
+ apis2.insert(APIPermission::kAudioCapture);
+ apis2.insert(APIPermission::kHid);
+ apis2.insert(APIPermission::kPower);
+ apis2.insert(APIPermission::kSerial);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -164,7 +167,7 @@ TEST(APIPermissionSetTest, CreateIntersection) {
}
apis2.insert(permission);
- expected_apis.insert(APIPermission::kTab);
+ expected_apis.insert(APIPermission::kAudioCapture);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -198,8 +201,8 @@ TEST(APIPermissionSetTest, CreateDifference) {
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
// Difference with an empty set.
- apis1.insert(APIPermission::kTab);
- apis1.insert(APIPermission::kBackground);
+ apis1.insert(APIPermission::kAudioCapture);
+ apis1.insert(APIPermission::kDns);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -210,15 +213,16 @@ TEST(APIPermissionSetTest, CreateDifference) {
}
apis1.insert(permission);
+ ASSERT_TRUE(apis2.empty());
APIPermissionSet::Difference(apis1, apis2, &result);
EXPECT_EQ(apis1, result);
// Now use a real second set.
- apis2.insert(APIPermission::kTab);
- apis2.insert(APIPermission::kProxy);
- apis2.insert(APIPermission::kClipboardWrite);
- apis2.insert(APIPermission::kPlugin);
+ apis2.insert(APIPermission::kAudioCapture);
+ apis2.insert(APIPermission::kHid);
+ apis2.insert(APIPermission::kPower);
+ apis2.insert(APIPermission::kSerial);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -228,7 +232,7 @@ TEST(APIPermissionSetTest, CreateDifference) {
}
apis2.insert(permission);
- expected_apis.insert(APIPermission::kBackground);
+ expected_apis.insert(APIPermission::kDns);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -260,8 +264,8 @@ TEST(APIPermissionSetTest, IPC) {
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
- apis.insert(APIPermission::kTab);
- apis.insert(APIPermission::kBackground);
+ apis.insert(APIPermission::kAudioCapture);
+ apis.insert(APIPermission::kDns);
permission = permission_info->CreateAPIPermission();
{
scoped_ptr<base::ListValue> value(new base::ListValue());
@@ -281,33 +285,4 @@ TEST(APIPermissionSetTest, IPC) {
EXPECT_EQ(apis, expected_apis);
}
-TEST(APIPermissionSetTest, ImplicitPermissions) {
- APIPermissionSet apis;
- apis.insert(APIPermission::kFileSystemWrite);
- apis.AddImpliedPermissions();
-
- EXPECT_EQ(apis.find(APIPermission::kFileSystemWrite)->id(),
- APIPermission::kFileSystemWrite);
- EXPECT_EQ(apis.size(), 1u);
-
- apis.erase(APIPermission::kFileSystemWrite);
- apis.insert(APIPermission::kFileSystemDirectory);
- apis.AddImpliedPermissions();
-
- EXPECT_EQ(apis.find(APIPermission::kFileSystemDirectory)->id(),
- APIPermission::kFileSystemDirectory);
- EXPECT_EQ(apis.size(), 1u);
-
- apis.insert(APIPermission::kFileSystemWrite);
- apis.AddImpliedPermissions();
-
- EXPECT_EQ(apis.find(APIPermission::kFileSystemWrite)->id(),
- APIPermission::kFileSystemWrite);
- EXPECT_EQ(apis.find(APIPermission::kFileSystemDirectory)->id(),
- APIPermission::kFileSystemDirectory);
- EXPECT_EQ(apis.find(APIPermission::kFileSystemWriteDirectory)->id(),
- APIPermission::kFileSystemWriteDirectory);
- EXPECT_EQ(apis.size(), 3u);
-}
-
} // namespace extensions
« chrome/common/extensions/permissions/permission_set_unittest.cc ('K') | « chrome/common/extensions/permissions/permission_set_unittest.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698