Response to PR review

Author: KathleenDollard

src/System.CommandLine.Subsystems.Tests/ValueSubsystemTests.cs

@@ -34,61 +34,61 @@ public void Value_is_always_activated()
     public void ValueSubsystem_returns_values_that_are_entered()
     {
         var consoleHack = new ConsoleHack().RedirectToBuffer(true);
-        CliOption<int> option1 = new CliOption<int>("--intValue");
+        CliOption<int> option = new CliOption<int>("--intValue");
         CliRootCommand rootCommand = [
             new CliCommand("x")
             {
-                option1
+                option
             }];
         var configuration = new CliConfiguration(rootCommand);
         var pipeline = Pipeline.CreateEmpty();
         pipeline.Value = new ValueSubsystem();
-        const int expected1 = 42;
-        var input = $"x --intValue {expected1}";
+        const int expected = 42;
+        var input = $"x --intValue {expected}";
 
         var parseResult = pipeline.Parse(configuration, input); // assigned for debugging
         pipeline.Execute(configuration, input, consoleHack);
 
-        pipeline.Value.GetValue<int>(option1).Should().Be(expected1);
+        pipeline.Value.GetValue<int>(option).Should().Be(expected);
     }
 
     [Fact]
     public void ValueSubsystem_returns_default_value_when_no_value_is_entered()
     {
         var consoleHack = new ConsoleHack().RedirectToBuffer(true);
-        CliOption<int> option1 = new CliOption<int>("--intValue");
-        CliRootCommand rootCommand = [option1];
+        CliOption<int> option = new CliOption<int>("--intValue");
+        CliRootCommand rootCommand = [option];
         var configuration = new CliConfiguration(rootCommand);
         var pipeline = Pipeline.CreateEmpty();
         pipeline.Value = new ValueSubsystem();
-        pipeline.Value.DefaultValue.Set(option1, 43);
-        const int expected1 = 43;
+        pipeline.Value.DefaultValue.Set(option, 43);
+        const int expected = 43;
         var input = $"";
 
         var parseResult = pipeline.Parse(configuration, input); // assigned for debugging
         pipeline.Execute(configuration, input, consoleHack);
 
-        pipeline.Value.GetValue<int>(option1).Should().Be(expected1);
+        pipeline.Value.GetValue<int>(option).Should().Be(expected);
     }
 
 
     [Fact]
     public void ValueSubsystem_returns_calculated_default_value_when_no_value_is_entered()
     {
         var consoleHack = new ConsoleHack().RedirectToBuffer(true);
-        CliOption<int> option1 = new CliOption<int>("--intValue");
-        CliRootCommand rootCommand = [option1];
+        CliOption<int> option = new CliOption<int>("--intValue");
+        CliRootCommand rootCommand = [option];
         var configuration = new CliConfiguration(rootCommand);
         var pipeline = Pipeline.CreateEmpty();
         pipeline.Value = new ValueSubsystem();
         var x = 42;
-        pipeline.Value.DefaultValueCalculation.Set(option1, () => x + 2);
-        const int expected1 = 44;
+        pipeline.Value.DefaultValueCalculation.Set(option, () => x + 2);
+        const int expected = 44;
         var input = $"";
 
         var parseResult = pipeline.Parse(configuration, input); // assigned for debugging
         pipeline.Execute(configuration, input, consoleHack);
 
-        pipeline.Value.GetValue<int>(option1).Should().Be(expected1);
+        pipeline.Value.GetValue<int>(option).Should().Be(expected);
     }
 }

src/System.CommandLine.Tests/ParseResultValueTests.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 using FluentAssertions;
+using FluentAssertions.Execution;
 using Xunit;
 
 namespace System.CommandLine.Tests;
@@ -26,8 +26,11 @@ public void Symbol_found_by_name()
 
         var symbol1 = parseResult.GetSymbolByName("--opt1");
         var symbol2 = parseResult.GetSymbolByName("--opt2");
-        symbol1.Should().Be(option1);
-        symbol2.Should().Be(option2);
+        using (new AssertionScope())
+        {
+            symbol1.Should().Be(option1);
+            symbol2.Should().Be(option2);
+        }
     }
 
     [Fact]

src/System.CommandLine.Tests/ParserTests.cs

@@ -1883,7 +1883,7 @@ public void Locations_correct_for_collection()
                     {
                         option1
                     };
-            var expectedOuterLocation = new Location("testhost", Location.User, -1, null);
+            var expectedOuterLocation = new Location(CliExecutable.ExecutableName, Location.User, -1, null);
             var expectedLocation1 = new Location("Kirk", Location.User, 2, expectedOuterLocation);
             var expectedLocation2 = new Location("Spock", Location.User, 3, expectedOuterLocation);
             var expectedLocation3 = new Location("Uhura", Location.User, 4, expectedOuterLocation);

src/System.CommandLine/ParseResult.cs

@@ -17,7 +17,7 @@ public sealed class ParseResult
         private readonly IReadOnlyDictionary<CliSymbol, ValueResult> valueResultDictionary = new Dictionary<CliSymbol, ValueResult>();
         private SymbolLookupByName? symbolLookupByName = null;
 
-        private readonly CommandResult? _rootCommandResult;
+        private readonly CommandResult _rootCommandResult;
         // TODO: unmatched tokens, invocation, completion
         /*
         private readonly IReadOnlyList<CliToken> _unmatchedTokens;