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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/permissions/media_galleries_permission_unittest.cc

Issue 141743005: Extensions: Make it possible for permission parsing code to return a detailed error message. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 | « chrome/common/extensions/permissions/media_galleries_permission.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/permissions/media_galleries_permission_unittest.cc
===================================================================
--- chrome/common/extensions/permissions/media_galleries_permission_unittest.cc (revision 247036)
+++ chrome/common/extensions/permissions/media_galleries_permission_unittest.cc (working copy)
@@ -19,6 +19,7 @@
namespace {
TEST(MediaGalleriesPermissionTest, GoodValues) {
+ std::string error;
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
@@ -29,41 +30,55 @@
scoped_ptr<base::ListValue> value(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
// all_detected
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
// access_type
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
// Repeats do not make a difference.
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
@@ -72,10 +87,13 @@
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- EXPECT_TRUE(permission->FromValue(value.get()));
+ EXPECT_TRUE(permission->FromValue(value.get(), &error));
+ EXPECT_TRUE(error.empty());
+ error.clear();
}
TEST(MediaGalleriesPermissionTest, BadValues) {
+ std::string error;
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
@@ -83,35 +101,47 @@
// Empty
scoped_ptr<base::ListValue> value(new base::ListValue());
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
// copyTo and delete without read
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
// copyTo without delete
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
// Repeats do not make a difference.
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
@@ -119,7 +149,9 @@
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- EXPECT_FALSE(permission->FromValue(value.get()));
+ EXPECT_FALSE(permission->FromValue(value.get(), &error));
+ EXPECT_FALSE(error.empty());
+ error.clear();
}
TEST(MediaGalleriesPermissionTest, Equal) {
@@ -134,43 +166,43 @@
scoped_ptr<base::ListValue> value(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
- ASSERT_TRUE(permission2->FromValue(value.get()));
+ ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
- ASSERT_TRUE(permission2->FromValue(value.get()));
+ ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- ASSERT_TRUE(permission2->FromValue(value.get()));
+ ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- ASSERT_TRUE(permission2->FromValue(value.get()));
+ ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
}
@@ -186,14 +218,14 @@
scoped_ptr<base::ListValue> value(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
- ASSERT_TRUE(permission2->FromValue(value.get()));
+ ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
EXPECT_FALSE(permission1->Equal(permission2.get()));
}
@@ -209,32 +241,32 @@
scoped_ptr<base::ListValue> value(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
value->AppendString(MediaGalleriesPermission::kReadPermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
scoped_ptr<base::Value> vtmp(permission1->ToValue());
ASSERT_TRUE(vtmp);
- ASSERT_TRUE(permission2->FromValue(vtmp.get()));
+ ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
value->AppendString(MediaGalleriesPermission::kCopyToPermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
vtmp = permission1->ToValue();
ASSERT_TRUE(vtmp);
- ASSERT_TRUE(permission2->FromValue(vtmp.get()));
+ ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
value.reset(new base::ListValue());
value->AppendString(MediaGalleriesPermission::kReadPermission);
value->AppendString(MediaGalleriesPermission::kDeletePermission);
- ASSERT_TRUE(permission1->FromValue(value.get()));
+ ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
vtmp = permission1->ToValue();
ASSERT_TRUE(vtmp);
- ASSERT_TRUE(permission2->FromValue(vtmp.get()));
+ ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
}
« no previous file with comments | « chrome/common/extensions/permissions/media_galleries_permission.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698