Fixing a bug in the restore option where specifying verbosity through /v was not entirely honored.

Adding tests for implicit restore for all the affected commands. Fixing an issue where the command target was being passed to the restore command during implicit restore. Adding restore params to all commands with implicit restore. Also, implicitly set the restore output to quiet. Adding tests for the no-restore option.
2017-06-02 23:32:53 -07:00 · 2017-06-02 23:32:53 -07:00 · 3231295acf
commit 3231295acf
parent dd76fec564
14 changed files with 475 additions and 179 deletions
--- a/src/dotnet/commands/dotnet-test/TestCommandParser.cs
+++ b/src/dotnet/commands/dotnet-test/TestCommandParser.cs
@ -1,3 +1,6 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
@ -15,74 +18,89 @@ namespace Microsoft.DotNet.Cli
                        .With(name: LocalizableStrings.CmdArgProject,
                              description: LocalizableStrings.CmdArgDescription),
                  false,
-                  CommonOptions.HelpOption(),
-                  Create.Option(
-                        "-s|--settings",
-                        LocalizableStrings.CmdSettingsDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdSettingsFile)
-                              .ForwardAsSingle(o => $"/p:VSTestSetting={o.Arguments.Single()}")),
-                  Create.Option(
-                        "-t|--list-tests",
-                        LocalizableStrings.CmdListTestsDescription,
-                        Accept.NoArguments()
-                              .ForwardAsSingle(o => "/p:VSTestListTests=true")),
-                  Create.Option(
-                        "--filter",
-                        LocalizableStrings.CmdTestCaseFilterDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdTestCaseFilterExpression)
-                              .ForwardAsSingle(o => $"/p:VSTestTestCaseFilter={o.Arguments.Single()}")),
-                  Create.Option(
-                        "-a|--test-adapter-path",
-                        LocalizableStrings.CmdTestAdapterPathDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdTestAdapterPath)
-                              .ForwardAsSingle(o => $"/p:VSTestTestAdapterPath={o.Arguments.Single()}")),
-                  Create.Option(
-                        "-l|--logger",
-                        LocalizableStrings.CmdLoggerDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdLoggerOption)
-                              .ForwardAsSingle(o => 
-                                    {
-                                          var loggersString = string.Join(";", GetSemiColonEscapedArgs(o.Arguments)); 
-                                          
-                                          return $"/p:VSTestLogger={loggersString}";
-                                    })),
-                  CommonOptions.ConfigurationOption(),
-                  CommonOptions.FrameworkOption(),
-                  Create.Option(
-                        "-o|--output",
-                        LocalizableStrings.CmdOutputDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdOutputDir)
-                              .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
-                  Create.Option(
-                        "-d|--diag",
-                        LocalizableStrings.CmdPathTologFileDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdPathToLogFile)
-                              .ForwardAsSingle(o => $"/p:VSTestDiag={o.Arguments.Single()}")),
-                  Create.Option(
-                        "--no-build",
-                        LocalizableStrings.CmdNoBuildDescription,
-                        Accept.NoArguments()
-                              .ForwardAsSingle(o => "/p:VSTestNoBuild=true")),
-                  Create.Option(
-                        "-r|--results-directory",
-                        LocalizableStrings.CmdResultsDirectoryDescription,
-                        Accept.ExactlyOneArgument()
-                              .With(name: LocalizableStrings.CmdPathToResultsDirectory)
-                              .ForwardAsSingle(o => $"/p:VSTestResultsDirectory={o.Arguments.Single()}")),
-                  Create.Option(
-                        "--collect",
-                        LocalizableStrings.cmdCollectDescription,
-                        Accept.OneOrMoreArguments()
-                              .With(name: LocalizableStrings.cmdCollectFriendlyName)
-                              .ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")),
-                  CommonOptions.NoRestoreOption(),
-                  CommonOptions.VerbosityOption());
+                  FullTestOptions);
+
+        private static Option[] FullTestOptions
+        {
+            get
+            {
+                var fullTestOptions = new List<Option>
+                {
+                    CommonOptions.HelpOption(),
+                      Create.Option(
+                            "-s|--settings",
+                            LocalizableStrings.CmdSettingsDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdSettingsFile)
+                                  .ForwardAsSingle(o => $"/p:VSTestSetting={o.Arguments.Single()}")),
+                      Create.Option(
+                            "-t|--list-tests",
+                            LocalizableStrings.CmdListTestsDescription,
+                            Accept.NoArguments()
+                                  .ForwardAsSingle(o => "/p:VSTestListTests=true")),
+                      Create.Option(
+                            "--filter",
+                            LocalizableStrings.CmdTestCaseFilterDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdTestCaseFilterExpression)
+                                  .ForwardAsSingle(o => $"/p:VSTestTestCaseFilter={o.Arguments.Single()}")),
+                      Create.Option(
+                            "-a|--test-adapter-path",
+                            LocalizableStrings.CmdTestAdapterPathDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdTestAdapterPath)
+                                  .ForwardAsSingle(o => $"/p:VSTestTestAdapterPath={o.Arguments.Single()}")),
+                      Create.Option(
+                            "-l|--logger",
+                            LocalizableStrings.CmdLoggerDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdLoggerOption)
+                                  .ForwardAsSingle(o =>
+                                        {
+                                              var loggersString = string.Join(";", GetSemiColonEscapedArgs(o.Arguments));
+
+                                              return $"/p:VSTestLogger={loggersString}";
+                                        })),
+                      CommonOptions.ConfigurationOption(),
+                      CommonOptions.FrameworkOption(),
+                      Create.Option(
+                            "-o|--output",
+                            LocalizableStrings.CmdOutputDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdOutputDir)
+                                  .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
+                      Create.Option(
+                            "-d|--diag",
+                            LocalizableStrings.CmdPathTologFileDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdPathToLogFile)
+                                  .ForwardAsSingle(o => $"/p:VSTestDiag={o.Arguments.Single()}")),
+                      Create.Option(
+                            "--no-build",
+                            LocalizableStrings.CmdNoBuildDescription,
+                            Accept.NoArguments()
+                                  .ForwardAsSingle(o => "/p:VSTestNoBuild=true")),
+                      Create.Option(
+                            "-r|--results-directory",
+                            LocalizableStrings.CmdResultsDirectoryDescription,
+                            Accept.ExactlyOneArgument()
+                                  .With(name: LocalizableStrings.CmdPathToResultsDirectory)
+                                  .ForwardAsSingle(o => $"/p:VSTestResultsDirectory={o.Arguments.Single()}")),
+                      Create.Option(
+                            "--collect",
+                            LocalizableStrings.cmdCollectDescription,
+                            Accept.OneOrMoreArguments()
+                                  .With(name: LocalizableStrings.cmdCollectFriendlyName)
+                                  .ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")),
+                      CommonOptions.NoRestoreOption(),
+                      CommonOptions.VerbosityOption()
+                };
+
+                RestoreCommandParser.AddImplicitRestoreOptions(fullTestOptions);
+
+                return fullTestOptions.ToArray();
+            }
+        }

        private static string GetSemiColonEsacpedstring(string arg)
        {