base::CommandLine: Added optional quoting of placeholder arguments.

base/command_line_unittest.cc

 // 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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 172 matching lines @@
 TEST(CommandLineTest, GetArgumentsString) {
   static const FilePath::CharType kPath1[] =
       FILE_PATH_LITERAL("C:\\Some File\\With Spaces.ggg");
   static const FilePath::CharType kPath2[] =
       FILE_PATH_LITERAL("C:\\no\\spaces.ggg");
 
   static const char kFirstArgName[] = "first-arg";
   static const char kSecondArgName[] = "arg2";
   static const char kThirdArgName[] = "arg with space";
   static const char kFourthArgName[] = "nospace";
+  static const char kFifthArgName[] = "%1";
 
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitchPath(kFirstArgName, FilePath(kPath1));
   cl.AppendSwitchPath(kSecondArgName, FilePath(kPath2));
   cl.AppendArg(kThirdArgName);
   cl.AppendArg(kFourthArgName);
+  cl.AppendArg(kFifthArgName);
 
 #if defined(OS_WIN)
   CommandLine::StringType expected_first_arg(
       base::UTF8ToUTF16(kFirstArgName));
   CommandLine::StringType expected_second_arg(
       base::UTF8ToUTF16(kSecondArgName));
   CommandLine::StringType expected_third_arg(
       base::UTF8ToUTF16(kThirdArgName));
   CommandLine::StringType expected_fourth_arg(
       base::UTF8ToUTF16(kFourthArgName));
+  CommandLine::StringType expected_fifth_arg(base::UTF8ToUTF16(kFifthArgName));
 #elif defined(OS_POSIX)
   CommandLine::StringType expected_first_arg(kFirstArgName);
   CommandLine::StringType expected_second_arg(kSecondArgName);
   CommandLine::StringType expected_third_arg(kThirdArgName);
   CommandLine::StringType expected_fourth_arg(kFourthArgName);
+  CommandLine::StringType expected_fifth_arg(kFifthArgName);
 #endif
 
 #if defined(OS_WIN)
 #define QUOTE_ON_WIN FILE_PATH_LITERAL("\"")
 #else
 #define QUOTE_ON_WIN FILE_PATH_LITERAL("")
 #endif  // OS_WIN
 
   CommandLine::StringType expected_str;
   expected_str.append(FILE_PATH_LITERAL("--"))
               .append(expected_first_arg)
               .append(FILE_PATH_LITERAL("="))
               .append(QUOTE_ON_WIN)
               .append(kPath1)
               .append(QUOTE_ON_WIN)
               .append(FILE_PATH_LITERAL(" "))
               .append(FILE_PATH_LITERAL("--"))
               .append(expected_second_arg)
               .append(FILE_PATH_LITERAL("="))
               .append(QUOTE_ON_WIN)
               .append(kPath2)
               .append(QUOTE_ON_WIN)
               .append(FILE_PATH_LITERAL(" "))
               .append(QUOTE_ON_WIN)
               .append(expected_third_arg)
               .append(QUOTE_ON_WIN)
               .append(FILE_PATH_LITERAL(" "))
-              .append(expected_fourth_arg);
-  EXPECT_EQ(expected_str, cl.GetArgumentsString());
+              .append(expected_fourth_arg)
+              .append(FILE_PATH_LITERAL(" "));
+
+  CommandLine::StringType expected_str_no_quote_placeholders(expected_str);
+  expected_str_no_quote_placeholders.append(expected_fifth_arg);
+  EXPECT_EQ(expected_str_no_quote_placeholders, cl.GetArgumentsString());
+
+#if defined(OS_WIN)
+  CommandLine::StringType expected_str_quote_placeholders(expected_str);
+  expected_str_quote_placeholders.append(QUOTE_ON_WIN)
+                                 .append(expected_fifth_arg)
+                                 .append(QUOTE_ON_WIN);
+  EXPECT_EQ(expected_str_quote_placeholders,
+            cl.GetArgumentsStringWithPlaceholders());
+#endif
 }
 
 // Test methods for appending switches to a command line.
 TEST(CommandLineTest, AppendSwitches) {
   std::string switch1 = "switch1";
   std::string switch2 = "switch2";
   std::string value2 = "value";
   std::string switch3 = "switch3";
   std::string value3 = "a value with spaces";
   std::string switch4 = "switch4";
@@ skipping 89 matching lines @@
 
   const FilePath kProgramPath(L"Program Path");
 
   // Check that quotes are not returned from GetProgram().
   CommandLine cl_program_path(kProgramPath);
   EXPECT_EQ(kProgramPath.value(), cl_program_path.GetProgram().value());
 
   // Check that quotes are added to command line string paths containing spaces.
   CommandLine::StringType cmd_string(cl_program_path.GetCommandLineString());
   EXPECT_EQ(L"\"Program Path\"", cmd_string);
+
+  // Check the optional quoting of placeholders in programs.
+  CommandLine cl_quote_placeholder(base::FilePath(L"%1"));
+  EXPECT_EQ(L"%1", cl_quote_placeholder.GetCommandLineString());
+  EXPECT_EQ(L"\"%1\"",
+            cl_quote_placeholder.GetCommandLineStringWithPlaceholders());
 }
 #endif
 
 // Calling Init multiple times should not modify the previous CommandLine.
 TEST(CommandLineTest, Init) {
   CommandLine* initial = CommandLine::ForCurrentProcess();
   EXPECT_FALSE(CommandLine::Init(0, NULL));
   CommandLine* current = CommandLine::ForCurrentProcess();
   EXPECT_EQ(initial, current);
 }