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

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rule_unittest.cc

Issue 11572061: Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to Vaclav's CL and fix Dominic's comments Created 8 years 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
Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rule_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rule_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rule_unittest.cc
deleted file mode 100644
index d3caa4e45dde1652e60f78e86e5df1cdae34e5be..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rule_unittest.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"
-
-#include "base/json/json_reader.h"
-#include "base/memory/linked_ptr.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
-#include "chrome/common/extensions/matcher/url_matcher.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace extensions {
-
-namespace {
-const char kExtId[] = "ext1";
-} // namespace
-
-TEST(WebRequestRuleTest, Create) {
- const char kRule[] =
- "{ \n"
- " \"id\": \"rule1\", \n"
- " \"conditions\": [ \n"
- " { \n"
- " \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
- " \"url\": {\"hostSuffix\": \"foo.com\"}, \n"
- " \"contentType\": [\"image/jpeg\"] \n"
- " } \n"
- " ], \n"
- " \"actions\": [ \n"
- " { \n"
- " \"instanceType\": \"declarativeWebRequest.CancelRequest\" \n"
- " } \n"
- " ], \n"
- " \"priority\": 200 \n"
- "} ";
-
- scoped_ptr<Value> value(base::JSONReader::Read(kRule));
- ASSERT_TRUE(value.get());
-
- linked_ptr<RulesRegistry::Rule> rule(new RulesRegistry::Rule);
- ASSERT_TRUE(RulesRegistry::Rule::Populate(*value, rule.get()));
-
- URLMatcher matcher;
- std::string error;
- scoped_ptr<WebRequestRule> web_request_rule(
- WebRequestRule::Create(matcher.condition_factory(), kExtId, base::Time(),
- rule, &error));
- ASSERT_TRUE(web_request_rule.get());
- EXPECT_TRUE(error.empty());
-
- EXPECT_EQ(kExtId, web_request_rule->id().first);
- EXPECT_EQ("rule1", web_request_rule->id().second);
-
- EXPECT_EQ(200, web_request_rule->priority());
-
- const WebRequestConditionSet& condition_set = web_request_rule->conditions();
- const WebRequestConditionSet::Conditions conditions =
- condition_set.conditions();
- ASSERT_EQ(1u, conditions.size());
- linked_ptr<WebRequestCondition> condition = conditions[0];
- const WebRequestConditionAttributes& condition_attributes =
- condition->condition_attributes();
- ASSERT_EQ(1u, condition_attributes.size());
- EXPECT_EQ(WebRequestConditionAttribute::CONDITION_CONTENT_TYPE,
- condition_attributes[0]->GetType());
-
- const WebRequestActionSet& action_set = web_request_rule->actions();
- const WebRequestActionSet::Actions& actions = action_set.actions();
- ASSERT_EQ(1u, actions.size());
- EXPECT_EQ(WebRequestAction::ACTION_CANCEL_REQUEST, actions[0]->GetType());
-}
-
-TEST(WebRequestRuleTest, CheckConsistency) {
- // The contentType condition can only be evaluated during ON_HEADERS_RECEIVED
- // but the redirect action can only be executed during ON_BEFORE_REQUEST.
- // Therefore, this is an inconsistent rule that needs to be flagged.
- const char kRule[] =
- "{ \n"
- " \"id\": \"rule1\", \n"
- " \"conditions\": [ \n"
- " { \n"
- " \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
- " \"url\": {\"hostSuffix\": \"foo.com\"}, \n"
- " \"contentType\": [\"image/jpeg\"] \n"
- " } \n"
- " ], \n"
- " \"actions\": [ \n"
- " { \n"
- " \"instanceType\": \"declarativeWebRequest.RedirectRequest\",\n"
- " \"redirectUrl\": \"http://bar.com\" \n"
- " } \n"
- " ], \n"
- " \"priority\": 200 \n"
- "} ";
-
- scoped_ptr<Value> value(base::JSONReader::Read(kRule));
- ASSERT_TRUE(value.get());
-
- linked_ptr<RulesRegistry::Rule> rule(new RulesRegistry::Rule);
- ASSERT_TRUE(RulesRegistry::Rule::Populate(*value, rule.get()));
-
- URLMatcher matcher;
- std::string error;
- scoped_ptr<WebRequestRule> web_request_rule(
- WebRequestRule::Create(matcher.condition_factory(), kExtId, base::Time(),
- rule, &error));
- EXPECT_FALSE(web_request_rule.get());
- EXPECT_FALSE(error.empty());
-}
-
-} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698