diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:38:29 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:38:29 +0000 |
| commit | 33ccd923b68f5f202230f5a400021f3efd304439 (patch) | |
| tree | c8c57a6de3b69286738be878683594f40a0c936d /chrome/browser/extensions/convert_user_script_unittest.cc | |
| parent | 2261b8bbffdf8abd12837326b0d0676f8eddb744 (diff) | |
| download | chromium_src-33ccd923b68f5f202230f5a400021f3efd304439.zip chromium_src-33ccd923b68f5f202230f5a400021f3efd304439.tar.gz chromium_src-33ccd923b68f5f202230f5a400021f3efd304439.tar.bz2 | |
Update URLPatternSet to contain a std::set instead of std::vector.
This updates URLPatternSet to contain a std::set instead of a std::vector, making it easier to implement the set operations in ExtensionPermissionSet.
BUG=84507
TEST=unit_tests
Review URL: http://codereview.chromium.org/7347011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_user_script_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/convert_user_script_unittest.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index a8aab8f..38b106a 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -15,6 +15,15 @@ #include "chrome/common/extensions/extension.h" #include "testing/gtest/include/gtest/gtest.h" +namespace { + +static void AddPattern(URLPatternSet* extent, const std::string& pattern) { + int schemes = URLPattern::SCHEME_ALL; + extent->AddPattern(URLPattern(schemes, pattern)); +} + +} + TEST(ExtensionFromUserScript, Basic) { FilePath test_file; ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file)); @@ -47,8 +56,9 @@ TEST(ExtensionFromUserScript, Basic) { EXPECT_EQ("http://www.yahoo.com/*", script.globs().at(1)); ASSERT_EQ(1u, script.exclude_globs().size()); EXPECT_EQ("*foo*", script.exclude_globs().at(0)); - ASSERT_EQ(1u, script.url_patterns().size()); - EXPECT_EQ("http://www.google.com/*", script.url_patterns()[0].GetAsString()); + ASSERT_EQ(1u, script.url_patterns().patterns().size()); + EXPECT_EQ("http://www.google.com/*", + script.url_patterns().begin()->GetAsString()); // Make sure the files actually exist on disk. EXPECT_TRUE(file_util::PathExists( @@ -86,9 +96,11 @@ TEST(ExtensionFromUserScript, NoMetdata) { ASSERT_EQ(1u, script.globs().size()); EXPECT_EQ("*", script.globs()[0]); EXPECT_EQ(0u, script.exclude_globs().size()); - ASSERT_EQ(2u, script.url_patterns().size()); - EXPECT_EQ("http://*/*", script.url_patterns()[0].GetAsString()); - EXPECT_EQ("https://*/*", script.url_patterns()[1].GetAsString()); + + URLPatternSet expected; + AddPattern(&expected, "http://*/*"); + AddPattern(&expected, "https://*/*"); + EXPECT_EQ(expected, script.url_patterns()); // Make sure the files actually exist on disk. EXPECT_TRUE(file_util::PathExists( |