Whenever proxy configurations contain socks and http/https/ftp proxies, socks...

net/proxy/proxy_config_service_win_unittest.cc

Index: net/proxy/proxy_config_service_win_unittest.cc
===================================================================
--- net/proxy/proxy_config_service_win_unittest.cc	(revision 20189)
+++ net/proxy/proxy_config_service_win_unittest.cc	(working copy)
@@ -173,4 +173,47 @@
   }
 }
 
+#if defined(NOT_DEFINED_VALUE)

[Arindam, 2009/07/10 19:25:17]

I believe this is the test you wanted. However, as mentioned earlier, this
probably is a repeat of what is happening in proxy_service_unittest.cc and
proxy_config_unittest.cc

[eroman, 2009/07/10 21:24:46]

The test I was thinking of is to add an extra block to the existing
"ProxyConfigServiceWinTest.SetFromIEConfig" test, similar to the existing
"Per-scheme proxy rules." test in that file (see code block below).

Although the winhttp-based config service happens to share code with the
ProxyRules parser, this is just a coincidence (I just happens that the formats
are close enough to be compatible).

But It could well be that in the future, a change is made to the format for
ProxyRules, and this could break the winhttp parser which has a fixed input
format. If we have tests for ProxyConfigServiceWin however, such a policy change
would not go unnoticed, since we verify that the format we care about works.



    {
      { // Input.
        FALSE,                                            // fAutoDetect
        NULL,                                             // lpszAutoConfigUrl
       
L"http=httpproxy:80;https=httpsproxy:70;ftp=ftpproxy:20;socks=foopy:130",  //
lpszProxy
        NULL,                                             // lpszProxy_bypass
      },

      // Expected result.
      false,                                   // auto_detect
      GURL(),                                  // pac_url
      MakeProxyPerSchemeRules("httpproxy:80", "httpsproxy:70", "ftpproxy:20",
"foopy:130"),
      "",                                      // proxy_bypass_list
      false,                                   // bypass_local_names
    },

[Arindam, 2009/07/11 00:53:35]

Now I get it. Done.

+TEST(ProxyConfigServiceWin, FallbackToSOCKSProxy) {
+  WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_config =
+      {                                                  // Input
+        TRUE,                                            // fAutoDetect
+        NULL,                                            // lpszAutoConfigUrl
+        L"http=httpproxy:80;socks=socksproxy:1080",      // lpszProxy
+        NULL,                                            // lpszProxy_bypass
+      };
+  ProxyConfig config;
+  ProxyConfigServiceWin::SetFromIEConfig(&config, ie_config);
+
+  EXPECT_EQ(true, config.auto_detect);
+  EXPECT_EQ(GURL(), config.pac_url);
+  EXPECT_EQ("", FlattenProxyBypass(config.proxy_bypass));
+  EXPECT_EQ(false, config.proxy_bypass_local_names);
+  EXPECT_EQ(MakeProxyPerSchemeRules("httpproxy:80", "", "", "socksproxy:1080"),
+            config.proxy_rules);
+
+  {
+    SyncProxyService service(new MockProxyConfigService(config),
+                             new MockProxyResolver);
+    GURL test_url("http://www.msn.com");
+    net::ProxyInfo info;
+    int rv = service.ResolveProxy(test_url, &info);
+    EXPECT_EQ(net::OK, rv);
+    EXPECT_FALSE(info.is_direct());
+    EXPECT_EQ("httpproxy:80", info.proxy_server().ToURI());
+  }
+
+  {
+    SyncProxyService service(new MockProxyConfigService(config),
+                             new MockProxyResolver);
+    GURL test_url("https://www.msn.com");
+    net::ProxyInfo info;
+    int rv = service.ResolveProxy(test_url, &info);
+    EXPECT_EQ(net::OK, rv);
+    EXPECT_FALSE(info.is_direct());
+    EXPECT_EQ("socks4://socksproxy:1080", info.proxy_server().ToURI());
+  }
+}
+#endif
+
 }  // namespace net