diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:51:54 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:51:54 +0000 |
commit | d2a69e2fccc65e8c74b770343cecad7a1136f9fd (patch) | |
tree | efc684e21d7ef65d72dcb31fba6a01184df8407b /chrome/browser/extensions/user_script_master_unittest.cc | |
parent | a60551c712b36d6241c234cd81ae2a847f323ec5 (diff) | |
download | chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.zip chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.tar.gz chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.tar.bz2 |
Integrate URLPattern with Extension user scripts.
Also refactored the UserScript class in
UserScriptSlave and the UserScriptInfo structure
in UserScriptMaster into a common location.
Review URL: http://codereview.chromium.org/21070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/user_script_master_unittest.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index af60cb8..8ce2391 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -139,21 +139,21 @@ TEST_F(UserScriptMasterTest, Parse1) { "\n" "alert('hoo!');\n"); - std::vector<std::string> includes; - UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &includes); - EXPECT_EQ(3U, includes.size()); - EXPECT_EQ("*mail.google.com*", includes[0]); - EXPECT_EQ("*mail.yahoo.com*", includes[1]); - EXPECT_EQ("*mail.msn.com*", includes[2]); + UserScript script; + UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &script); + EXPECT_EQ(3U, script.globs().size()); + EXPECT_EQ("*mail.google.com*", script.globs()[0]); + EXPECT_EQ("*mail.yahoo.com*", script.globs()[1]); + EXPECT_EQ("*mail.msn.com*", script.globs()[2]); } TEST_F(UserScriptMasterTest, Parse2) { const std::string text("default to @include *"); - std::vector<std::string> includes; - UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &includes); - EXPECT_EQ(1U, includes.size()); - EXPECT_EQ("*", includes[0]); + UserScript script; + UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &script); + EXPECT_EQ(1U, script.globs().size()); + EXPECT_EQ("*", script.globs()[0]); } TEST_F(UserScriptMasterTest, Parse3) { @@ -162,8 +162,8 @@ TEST_F(UserScriptMasterTest, Parse3) { "// @include *foo*\n" "// ==/UserScript=="); // no trailing newline - std::vector<std::string> includes; - UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &includes); - EXPECT_EQ(1U, includes.size()); - EXPECT_EQ("*foo*", includes[0]); + UserScript script; + UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &script); + EXPECT_EQ(1U, script.globs().size()); + EXPECT_EQ("*foo*", script.globs()[0]); } |