ignore null value in proxy servers and bypass list capabilities

chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc

 // Copyright (c) 2011 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 "base/base64.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 162 matching lines @@
   DictionaryValue dict;
   DictionaryValue* options = new DictionaryValue();
   dict.Set("proxy", options);
 
   options->SetString("proxyType", "manual");
 
   CapabilitiesParser parser(&dict, FilePath(), &caps);
   ASSERT_TRUE(parser.Parse());
 }
 
+TEST(CapabilitiesParser, ProxyTypeCapNullValue) {
+  Capabilities caps;
+  DictionaryValue dict;
+  DictionaryValue* options = new DictionaryValue();
+  dict.Set("proxy", options);
+
+  options->Set("proxyType", Value::CreateNullValue());
+
+  CapabilitiesParser parser(&dict, FilePath(), &caps);
+  ASSERT_TRUE(parser.Parse());
+}
+
 TEST(CapabilitiesParser, ProxyTypeManualCap) {
   const char kProxyServers[] = "ftp=localhost:9001;http=localhost:8001";
   Capabilities caps;
   DictionaryValue dict;
   DictionaryValue* options = new DictionaryValue();
   dict.Set("proxy", options);
 
   options->SetString("proxyType", "manual");
   options->SetString("httpProxy", "localhost:8001");
   options->SetString("ftpProxy", "localhost:9001");
 
   CapabilitiesParser parser(&dict, FilePath(), &caps);
   ASSERT_FALSE(parser.Parse());
   EXPECT_STREQ(kProxyServers,
       caps.command.GetSwitchValueASCII(switches::kProxyServer).c_str());
 }
 
 TEST(CapabilitiesParser, ProxyBypassListCap) {
   const char kBypassList[] = "google.com, youtube.com";
   Capabilities caps;
   DictionaryValue dict;
-  DictionaryValue* proxy_options = new DictionaryValue();
-  dict.Set("proxy", proxy_options);
+  DictionaryValue* options = new DictionaryValue();
+  dict.Set("proxy", options);
 
-  proxy_options->SetString("proxyType", "manual");
-  proxy_options->SetString("noProxy", kBypassList);
+  options->SetString("proxyType", "manual");
+  options->SetString("noProxy", kBypassList);
 
   CapabilitiesParser parser(&dict, FilePath(), &caps);
   ASSERT_FALSE(parser.Parse());
   EXPECT_STREQ(kBypassList,
       caps.command.GetSwitchValueASCII(switches::kProxyBypassList).c_str());
 }
 
+TEST(CapabilitiesParser, ProxyBypassListCapNullValue) {
+  Capabilities caps;
+  DictionaryValue dict;
+  DictionaryValue* options = new DictionaryValue();
+  dict.Set("proxy", options);
+
+  options->SetString("proxyType", "manual");
+  options->Set("noProxy", Value::CreateNullValue());
+  options->SetString("httpProxy", "localhost:8001");
+
+  CapabilitiesParser parser(&dict, FilePath(), &caps);
+  ASSERT_FALSE(parser.Parse());
+  EXPECT_STREQ("",
+      caps.command.GetSwitchValueASCII(switches::kProxyBypassList).c_str());

[kkania, 2011/12/19 23:53:20]

EXPECT_FALSE(caps.command.HasSwitch...

[Huyen, 2011/12/19 23:59:12]

Done.

+}
+
 TEST(CapabilitiesParser, UnknownProxyCap) {
   Capabilities caps;
   DictionaryValue dict;
   DictionaryValue* options = new DictionaryValue();
   dict.Set("proxy", options);
 
   options->SetString("proxyType", "DIRECT");
   options->SetString("badProxyCap", "error");
 
   CapabilitiesParser parser(&dict, FilePath(), &caps);
-  ASSERT_TRUE(parser.Parse());
+  ASSERT_FALSE(parser.Parse());
+}
+
+TEST(CapabilitiesParser, ProxyFtpServerCapNullValue) {
+  Capabilities caps;
+  DictionaryValue dict;
+  DictionaryValue* options = new DictionaryValue();
+  dict.Set("proxy", options);
+
+  options->SetString("proxyType", "manual");
+  options->SetString("httpProxy", "localhost:8001");
+  options->Set("ftpProxy", Value::CreateNullValue());
+
+  CapabilitiesParser parser(&dict, FilePath(), &caps);
+  ASSERT_FALSE(parser.Parse());
+  EXPECT_STREQ("http=localhost:8001",
+      caps.command.GetSwitchValueASCII(switches::kProxyServer).c_str());
 }
 
 }  // namespace webdriver