| Index: net/proxy/proxy_config_service_android_unittest.cc
|
| diff --git a/net/proxy/proxy_config_service_android_unittest.cc b/net/proxy/proxy_config_service_android_unittest.cc
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..84449f0d020d578d779115f2c78f4a4402bc96c9
|
| --- /dev/null
|
| +++ b/net/proxy/proxy_config_service_android_unittest.cc
|
| @@ -0,0 +1,353 @@
|
| +// 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 <map>
|
| +#include <string>
|
| +
|
| +#include "base/bind.h"
|
| +#include "base/compiler_specific.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "base/message_loop.h"
|
| +#include "net/proxy/proxy_config.h"
|
| +#include "net/proxy/proxy_config_service_android.h"
|
| +#include "net/proxy/proxy_info.h"
|
| +#include "testing/gtest/include/gtest/gtest.h"
|
| +
|
| +namespace net {
|
| +
|
| +namespace {
|
| +
|
| +class TestObserver : public ProxyConfigService::Observer {
|
| + public:
|
| + TestObserver() : availability_(ProxyConfigService::CONFIG_UNSET) {}
|
| +
|
| + // ProxyConfigService::Observer:
|
| + virtual void OnProxyConfigChanged(
|
| + const ProxyConfig& config,
|
| + ProxyConfigService::ConfigAvailability availability) OVERRIDE {
|
| + config_ = config;
|
| + availability_ = availability;
|
| + }
|
| +
|
| + ProxyConfigService::ConfigAvailability availability() const {
|
| + return availability_;
|
| + }
|
| +
|
| + const ProxyConfig& config() const {
|
| + return config_;
|
| + }
|
| +
|
| + private:
|
| + ProxyConfig config_;
|
| + ProxyConfigService::ConfigAvailability availability_;
|
| +};
|
| +
|
| +} // namespace
|
| +
|
| +typedef std::map<std::string, std::string> StringMap;
|
| +
|
| +class ProxyConfigServiceAndroidTestBase : public testing::Test {
|
| + protected:
|
| + // Note that the current thread's message loop is initialized by the test
|
| + // suite (see net/base/net_test_suite.cc).
|
| + ProxyConfigServiceAndroidTestBase(const StringMap& initial_configuration)
|
| + : configuration_(initial_configuration),
|
| + message_loop_(MessageLoop::current()),
|
| + service_(
|
| + message_loop_->message_loop_proxy(),
|
| + message_loop_->message_loop_proxy(),
|
| + base::Bind(&ProxyConfigServiceAndroidTestBase::GetProperty,
|
| + base::Unretained(this))) {}
|
| +
|
| + virtual ~ProxyConfigServiceAndroidTestBase() {}
|
| +
|
| + // testing::Test:
|
| + virtual void SetUp() OVERRIDE {
|
| + message_loop_->RunAllPending();
|
| + service_.AddObserver(&observer_);
|
| + }
|
| +
|
| + virtual void TearDown() OVERRIDE {
|
| + service_.RemoveObserver(&observer_);
|
| + }
|
| +
|
| + void ClearConfiguration() {
|
| + configuration_.clear();
|
| + }
|
| +
|
| + void AddProperty(const std::string& key, const std::string& value) {
|
| + configuration_[key] = value;
|
| + }
|
| +
|
| + std::string GetProperty(const std::string& key) {
|
| + StringMap::const_iterator it = configuration_.find(key);
|
| + if (it == configuration_.end())
|
| + return std::string();
|
| + return it->second;
|
| + }
|
| +
|
| + void ProxySettingsChanged() {
|
| + service_.ProxySettingsChanged();
|
| + message_loop_->RunAllPending();
|
| + }
|
| +
|
| + void TestMapping(const std::string& url, const std::string& expected) {
|
| + ProxyConfigService::ConfigAvailability availability;
|
| + ProxyConfig proxy_config;
|
| + availability = service_.GetLatestProxyConfig(&proxy_config);
|
| + EXPECT_EQ(ProxyConfigService::CONFIG_VALID, availability);
|
| + ProxyInfo proxy_info;
|
| + proxy_config.proxy_rules().Apply(GURL(url), &proxy_info);
|
| + EXPECT_EQ(expected, proxy_info.ToPacString());
|
| + }
|
| +
|
| + StringMap configuration_;
|
| + TestObserver observer_;
|
| + MessageLoop* const message_loop_;
|
| + ProxyConfigServiceAndroid service_;
|
| +};
|
| +
|
| +class ProxyConfigServiceAndroidTest : public ProxyConfigServiceAndroidTestBase {
|
| + public:
|
| + ProxyConfigServiceAndroidTest()
|
| + : ProxyConfigServiceAndroidTestBase(StringMap()) {}
|
| +};
|
| +
|
| +class ProxyConfigServiceAndroidWithInitialConfigTest
|
| + : public ProxyConfigServiceAndroidTestBase {
|
| + public:
|
| + ProxyConfigServiceAndroidWithInitialConfigTest()
|
| + : ProxyConfigServiceAndroidTestBase(MakeInitialConfiguration()) {}
|
| +
|
| + private:
|
| + StringMap MakeInitialConfiguration() {
|
| + StringMap initial_configuration;
|
| + initial_configuration["http.proxyHost"] = "httpproxy.com";
|
| + initial_configuration["http.proxyPort"] = "8080";
|
| + return initial_configuration;
|
| + }
|
| +};
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, TestChangePropertiesNotification) {
|
| + // Set up a non-empty configuration
|
| + AddProperty("http.proxyHost", "localhost");
|
| + ProxySettingsChanged();
|
| + EXPECT_EQ(ProxyConfigService::CONFIG_VALID, observer_.availability());
|
| + EXPECT_FALSE(observer_.config().proxy_rules().empty());
|
| +
|
| + // Set up an empty configuration
|
| + ClearConfiguration();
|
| + ProxySettingsChanged();
|
| + EXPECT_EQ(ProxyConfigService::CONFIG_VALID, observer_.availability());
|
| + EXPECT_TRUE(observer_.config().proxy_rules().empty());
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidWithInitialConfigTest, TestInitialConfig) {
|
| + // Make sure that the initial config is set.
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:8080");
|
| +
|
| + // Override the initial configuration.
|
| + ClearConfiguration();
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:80");
|
| +}
|
| +
|
| +// !! The following test cases are automatically generated from
|
| +// !! net/android/tools/proxy_test_cases.py.
|
| +// !! Please edit that file instead of editing the test cases below and
|
| +// !! update also the corresponding Java unit tests in
|
| +// !! AndroidProxySelectorTest.java
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, NoProxy) {
|
| + // Test direct mapping when no proxy defined.
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyHostAndPort) {
|
| + // Test http.proxyHost and http.proxyPort works.
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyHostOnly) {
|
| + // We should get the default port (80) for proxied hosts.
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:80");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyPortOnly) {
|
| + // http.proxyPort only should not result in any hosts being proxied.
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpNonProxyHosts1) {
|
| + // Test that HTTP non proxy hosts are mapped correctly
|
| + AddProperty("http.nonProxyHosts", "slashdot.org");
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://slashdot.org/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpNonProxyHosts2) {
|
| + // Test that | pattern works.
|
| + AddProperty("http.nonProxyHosts", "slashdot.org|freecode.net");
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://freecode.net/", "DIRECT");
|
| + TestMapping("http://slashdot.org/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpNonProxyHosts3) {
|
| + // Test that * pattern works.
|
| + AddProperty("http.nonProxyHosts", "*example.com");
|
| + AddProperty("http.proxyHost", "httpproxy.com");
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("http://slashdot.org/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://www.example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, FtpNonProxyHosts) {
|
| + // Test that FTP non proxy hosts are mapped correctly
|
| + AddProperty("ftp.nonProxyHosts", "slashdot.org");
|
| + AddProperty("ftp.proxyHost", "httpproxy.com");
|
| + AddProperty("ftp.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, FtpProxyHostAndPort) {
|
| + // Test ftp.proxyHost and ftp.proxyPort works.
|
| + AddProperty("ftp.proxyHost", "httpproxy.com");
|
| + AddProperty("ftp.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, FtpProxyHostOnly) {
|
| + // Test ftp.proxyHost and default port.
|
| + AddProperty("ftp.proxyHost", "httpproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "PROXY httpproxy.com:80");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpsProxyHostAndPort) {
|
| + // Test https.proxyHost and https.proxyPort works.
|
| + AddProperty("https.proxyHost", "httpproxy.com");
|
| + AddProperty("https.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "HTTPS httpproxy.com:8080");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpsProxyHostOnly) {
|
| + // Test https.proxyHost and default port.
|
| + AddProperty("https.proxyHost", "httpproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| + TestMapping("https://example.com/", "HTTPS httpproxy.com:443");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyHostIPv6) {
|
| + // Test IPv6 https.proxyHost and default port.
|
| + AddProperty("http.proxyHost", "a:b:c::d:1");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "PROXY [a:b:c::d:1]:80");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyHostAndPortIPv6) {
|
| + // Test IPv6 http.proxyHost and http.proxyPort works.
|
| + AddProperty("http.proxyHost", "a:b:c::d:1");
|
| + AddProperty("http.proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "PROXY [a:b:c::d:1]:8080");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxyHostAndInvalidPort) {
|
| + // Test invalid http.proxyPort does not crash.
|
| + AddProperty("http.proxyHost", "a:b:c::d:1");
|
| + AddProperty("http.proxyPort", "65536");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "DIRECT");
|
| + TestMapping("http://example.com/", "DIRECT");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, DefaultProxyExplictPort) {
|
| + // Default http proxy is used if a scheme-specific one is not found.
|
| + AddProperty("ftp.proxyHost", "httpproxy.com");
|
| + AddProperty("ftp.proxyPort", "8080");
|
| + AddProperty("proxyHost", "defaultproxy.com");
|
| + AddProperty("proxyPort", "8080");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com/", "PROXY httpproxy.com:8080");
|
| + TestMapping("http://example.com/", "PROXY defaultproxy.com:8080");
|
| + TestMapping("https://example.com/", "HTTPS defaultproxy.com:8080");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, DefaultProxyDefaultPort) {
|
| + // Check that the default proxy port is as expected.
|
| + AddProperty("proxyHost", "defaultproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "PROXY defaultproxy.com:80");
|
| + TestMapping("https://example.com/", "HTTPS defaultproxy.com:443");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, FallbackToSocks) {
|
| + // SOCKS proxy is used if scheme-specific one is not found.
|
| + AddProperty("http.proxyHost", "defaultproxy.com");
|
| + AddProperty("socksProxyHost", "socksproxy.com");
|
| + ProxySettingsChanged();
|
| + TestMapping("ftp://example.com", "SOCKS5 socksproxy.com:1080");
|
| + TestMapping("http://example.com/", "PROXY defaultproxy.com:80");
|
| + TestMapping("https://example.com/", "SOCKS5 socksproxy.com:1080");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, SocksExplicitPort) {
|
| + // SOCKS proxy port is used if specified
|
| + AddProperty("socksProxyHost", "socksproxy.com");
|
| + AddProperty("socksProxyPort", "9000");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "SOCKS5 socksproxy.com:9000");
|
| +}
|
| +
|
| +TEST_F(ProxyConfigServiceAndroidTest, HttpProxySupercedesSocks) {
|
| + // SOCKS proxy is ignored if default HTTP proxy defined.
|
| + AddProperty("proxyHost", "defaultproxy.com");
|
| + AddProperty("socksProxyHost", "socksproxy.com");
|
| + AddProperty("socksProxyPort", "9000");
|
| + ProxySettingsChanged();
|
| + TestMapping("http://example.com/", "PROXY defaultproxy.com:80");
|
| +}
|
| +
|
| +} // namespace net
|
|
|