Tyrrrz#13 - Add tests - suggest takes cursor positioning into account…

…. Tidy up.
mauricel · Mar 31, 2021 · f34bc00 · f34bc00
1 parent f7c79e0
commit f34bc00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/CliFx.Tests/SuggestDirectiveSpecs.cs b/CliFx.Tests/SuggestDirectiveSpecs.cs
@@ -93,22 +93,24 @@ private string FormatExpectedOutput(string [] s)
 
         [Theory]
         [InlineData("supply all commands if nothing supplied",                    
-                        "clifx.exe", new[] { "cmd", "cmd02" })]
+                        "clifx.exe", 0, new[] { "cmd", "cmd02" })]
         [InlineData("supply all commands that match partially",
-                        "clifx.exe c", new[] { "cmd", "cmd02" })]
+                        "clifx.exe c", 0, new[] { "cmd", "cmd02" })]
         [InlineData("supply command options if match found, regardles of other partial matches (no options defined)",
-                        "clifx.exe cmd", new string[] { })]
+                        "clifx.exe cmd", 0, new string[] { })]
         [InlineData("supply nothing if no partial match applies",
-                        "clifx.exe cmd2", new string[] { })]
-        public async Task Suggest_directive_accepts_command_line_by_environment_variable(string usecase, string variableContents, string[] expected)
+                        "clifx.exe cmd2", 0, new string[] { })]
+        [InlineData("supply all commands that match partially, allowing for cursor position",
+                        "clifx.exe cmd", -2, new[] { "cmd", "cmd02" })]
+        public async Task Suggest_directive_suggests_commands_by_environment_variables(string usecase, string variableContents, int cursorOffset, string[] expected)
         {
             // Arrange
             var application = TestApplicationFactory(_cmdCommandCs, _cmd2CommandCs)
                 .Build();
 
             // Act
             var exitCode = await application.RunAsync(
-                new[] { "[suggest]", "--envvar", "CLIFX-{GUID}", "--cursor", variableContents.Length.ToString() },
+                new[] { "[suggest]", "--envvar", "CLIFX-{GUID}", "--cursor", (variableContents.Length + cursorOffset).ToString() },
                 new Dictionary<string, string>()
                 {
                     ["CLIFX-{GUID}"] = variableContents
@@ -142,26 +144,5 @@ public async Task Suggest_directive_suggests_commands_by_command_line_only(strin
             exitCode.Should().Be(0);
             stdOut.Should().Be(FormatExpectedOutput(expected), usecase);
         }
-
-        //[Theory]
-        //[InlineData("happy case", "clifx.exe c", "")]
-        //public async Task Suggest_directive_generates_suggestions(string because, string commandline, string expectedResult)
-        //{
-        //    // Arrange
-        //    var application = TestApplicationFactory(_cmdCommandCs)
-        //        .Build();
-
-        //    // Act
-        //    var exitCode = await application.RunAsync(
-        //        new[] { "[suggest]", commandline }
-        //    );
-
-        //    var stdOut = FakeConsole.ReadOutputString();
-
-        //    // Assert
-        //    exitCode.Should().Be(0);
-
-        //    stdOut.Should().Be(expectedResult + "\r\n", because);
-        //}
     }
 }
diff --git a/CliFx/SuggestionService.cs b/CliFx/SuggestionService.cs
@@ -48,7 +48,7 @@ private string ExtractCommandText(CommandInput input)
 
             if (commandCacheVariable == null)
             {
-                // ignore cursor position as we don't know what the original user input string is
+                // ignore cursor position as we don't know what the original user input string really is
                 return string.Join(" ", input.OriginalCommandLine.Where(arg => !IsDirective(arg)));
             }