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

Unified Diff: components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc

Issue 1004853002: Create abstraction for DataReductionProxyParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sclittle comments Created 5 years, 9 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 | « components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
index 0be78bfbd54552baa858fd88c1ee9f316a1d1346..e2e8120cbff5d0573f403bce91cd25b5497c4b32 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
@@ -7,11 +7,8 @@
#include <map>
#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/strings/string_util.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
-#include "net/proxy/proxy_retry_info.h"
#include "net/proxy/proxy_server.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -762,472 +759,6 @@ TEST_F(DataReductionProxyParamsTest, IsDataReductionProxy) {
}
}
-std::string GetRetryMapKeyFromOrigin(std::string origin) {
- // The retry map has the scheme prefix for https but not for http
- return origin;
-}
-
-TEST_F(DataReductionProxyParamsTest, AreProxiesBypassed) {
- const struct {
- // proxy flags
- bool allowed;
- bool fallback_allowed;
- bool alt_allowed;
- // is https request
- bool is_https;
- // proxies in retry map
- bool origin;
- bool fallback_origin;
- bool alt_origin;
- bool alt_fallback_origin;
- bool ssl_origin;
-
- bool expected_result;
- } tests[] = {
- { // proxy flags
- false,
- false,
- false,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- false,
- false,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- false,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- true,
- // proxies in retry map
- false,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- false,
- false,
- true,
- // is https request
- true,
- // proxies in retry map
- false,
- false,
- false,
- false,
- true,
- // expected result
- true,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- true,
- // proxies in retry map
- false,
- false,
- false,
- false,
- true,
- // expected result
- true,
- },
- { // proxy flags
- true,
- false,
- false,
- // is https request
- false,
- // proxies in retry map
- true,
- false,
- false,
- false,
- false,
- // expected result
- true,
- },
- { // proxy flags
- true,
- true,
- false,
- // is https request
- false,
- // proxies in retry map
- false,
- true,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- false,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- false,
- true,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- false,
- // is https request
- false,
- // proxies in retry map
- true,
- false,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- false,
- // is https request
- false,
- // proxies in retry map
- true,
- true,
- false,
- false,
- false,
- // expected result
- true,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- true,
- true,
- false,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- true,
- false,
- true,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- true,
- true,
- false,
- // expected result
- false,
- },
- { // proxy flags
- false,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- true,
- true,
- false,
- // expected result
- true,
- },
- { // proxy flags
- false,
- true,
- false,
- // is https request
- false,
- // proxies in retry map
- false,
- false,
- true,
- false,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- true,
- false,
- true,
- true,
- false,
- // expected result
- false,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- false,
- // proxies in retry map
- true,
- true,
- true,
- true,
- true,
- // expected result
- true,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- true,
- // proxies in retry map
- true,
- true,
- true,
- true,
- true,
- // expected result
- true,
- },
- { // proxy flags
- true,
- true,
- true,
- // is https request
- true,
- // proxies in retry map
- true,
- true,
- true,
- true,
- false,
- // expected result
- false,
- },
- };
-
- // The retry map has the scheme prefix for https but not for http.
- std::string origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultOrigin());
- std::string fallback_origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultFallbackOrigin());
- std::string alt_origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultAltOrigin());
- std::string alt_fallback_origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultAltFallbackOrigin());
- std::string ssl_origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultSSLOrigin());
-
- for (size_t i = 0; i < arraysize(tests); ++i) {
- net::ProxyConfig::ProxyRules rules;
- std::vector<std::string> proxies;
-
- if (tests[i].allowed)
- proxies.push_back(origin);
- if (tests[i].alt_allowed)
- proxies.push_back(alt_origin);
- if (tests[i].allowed && tests[i].fallback_allowed)
- proxies.push_back(fallback_origin);
- if (tests[i].alt_allowed && tests[i].fallback_allowed)
- proxies.push_back(alt_fallback_origin);
-
- std::string proxy_rules = "http=" + JoinString(proxies, ",") + ",direct://;"
- + (tests[i].alt_allowed ? ("https=" + ssl_origin + ",direct://;") : "");
-
- rules.ParseFromString(proxy_rules);
-
- int flags = 0;
- if (tests[i].allowed)
- flags |= DataReductionProxyParams::kAllowed;
- if (tests[i].alt_allowed)
- flags |= DataReductionProxyParams::kAlternativeAllowed;
- if (tests[i].fallback_allowed)
- flags |= DataReductionProxyParams::kFallbackAllowed;
- unsigned int has_definitions =
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN;
- TestDataReductionProxyParams params(flags, has_definitions);
-
- net::ProxyRetryInfoMap retry_map;
- net::ProxyRetryInfo retry_info;
- retry_info.bad_until = base::TimeTicks() + base::TimeDelta::Max();
-
- if (tests[i].origin)
- retry_map[origin] = retry_info;
- if (tests[i].fallback_origin)
- retry_map[fallback_origin] = retry_info;
- if (tests[i].alt_origin)
- retry_map[alt_origin] = retry_info;
- if (tests[i].alt_fallback_origin)
- retry_map[alt_fallback_origin] = retry_info;
- if (tests[i].ssl_origin)
- retry_map[ssl_origin] = retry_info;
-
- bool was_bypassed = params.AreProxiesBypassed(retry_map,
- rules,
- tests[i].is_https,
- NULL);
-
- EXPECT_EQ(tests[i].expected_result, was_bypassed);
- }
-}
-
-TEST_F(DataReductionProxyParamsTest, AreProxiesBypassedRetryDelay) {
- std::string origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultOrigin());
- std::string fallback_origin = GetRetryMapKeyFromOrigin(
- TestDataReductionProxyParams::DefaultFallbackOrigin());
-
- net::ProxyConfig::ProxyRules rules;
- std::vector<std::string> proxies;
-
- proxies.push_back(origin);
- proxies.push_back(fallback_origin);
-
- std::string proxy_rules = "http=" + JoinString(proxies, ",") + ",direct://;";
-
- rules.ParseFromString(proxy_rules);
-
- int flags = 0;
- flags |= DataReductionProxyParams::kAllowed;
- flags |= DataReductionProxyParams::kFallbackAllowed;
- unsigned int has_definitions =
- TestDataReductionProxyParams::HAS_EVERYTHING &
- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
- ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN;
- TestDataReductionProxyParams params(flags, has_definitions);
-
- net::ProxyRetryInfoMap retry_map;
- net::ProxyRetryInfo retry_info;
-
- retry_info.bad_until = base::TimeTicks() + base::TimeDelta::Max();
- retry_map[origin] = retry_info;
-
- retry_info.bad_until = base::TimeTicks();
- retry_map[fallback_origin] = retry_info;
-
- bool was_bypassed = params.AreProxiesBypassed(retry_map,
- rules,
- false,
- NULL);
-
- EXPECT_FALSE(was_bypassed);
-
- base::TimeDelta delay = base::TimeDelta::FromHours(2);
- retry_info.bad_until = base::TimeTicks::Now() + delay;
- retry_info.current_delay = delay;
- retry_map[origin] = retry_info;
-
- delay = base::TimeDelta::FromHours(1);
- retry_info.bad_until = base::TimeTicks::Now() + delay;
- retry_info.current_delay = delay;
- retry_map[fallback_origin] = retry_info;
-
- base::TimeDelta min_retry_delay;
- was_bypassed = params.AreProxiesBypassed(retry_map,
- rules,
- false,
- &min_retry_delay);
- EXPECT_TRUE(was_bypassed);
- EXPECT_EQ(delay, min_retry_delay);
-}
-
TEST_F(DataReductionProxyParamsTest, AndroidOnePromoFieldTrial) {
EXPECT_TRUE(DataReductionProxyParams::IsIncludedInAndroidOnePromoFieldTrial(
"google/sprout/sprout:4.4.4/KPW53/1379542:user/release-keys"));
« no previous file with comments | « components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698