mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-24 12:11:09 +01:00
## Summary of the Pull Request This PR ensures proper quoting of arguments after normalization. When joining arguments back into a single string, any argument containing whitespace or double quotes must be quoted (because parsing unquoted them). Adjusts unit tests to reflect the correct expected results. Ref: 42016 <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
72 lines
3.2 KiB
C#
72 lines
3.2 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using Microsoft.CmdPal.Ext.Shell.Helpers;
|
|
using Microsoft.CmdPal.Ext.UnitTestBase;
|
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
|
|
|
namespace Microsoft.CmdPal.Ext.Shell.UnitTests;
|
|
|
|
[TestClass]
|
|
public class NormalizeCommandLineTests : CommandPaletteUnitTestBase
|
|
{
|
|
private void NormalizeTestCore(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
ShellListPageHelpers.NormalizeCommandLineAndArgs(input, out var exe, out var args);
|
|
|
|
Assert.AreEqual(expectedExe, exe, ignoreCase: true, culture: System.Globalization.CultureInfo.InvariantCulture);
|
|
Assert.AreEqual(expectedArgs, args);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("ping bing.com", "c:\\Windows\\system32\\ping.exe", "bing.com")]
|
|
[DataRow("curl bing.com", "c:\\Windows\\system32\\curl.exe", "bing.com")]
|
|
[DataRow("ipconfig /all", "c:\\Windows\\system32\\ipconfig.exe", "/all")]
|
|
[DataRow("ipconfig a b \"c d\"", "c:\\Windows\\system32\\ipconfig.exe", "a b \"c d\"")]
|
|
public void NormalizeCommandLineSimple(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("\"C:\\Program Files\\Windows Defender\\MsMpEng.exe\"", "C:\\Program Files\\Windows Defender\\MsMpEng.exe")]
|
|
[DataRow("C:\\Program Files\\Windows Defender\\MsMpEng.exe", "C:\\Program Files\\Windows Defender\\MsMpEng.exe")]
|
|
public void NormalizeCommandLineSpacesInExecutablePath(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("%SystemRoot%\\system32\\cmd.exe", "C:\\Windows\\System32\\cmd.exe")]
|
|
public void NormalizeWithEnvVar(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("cmd --run --test", "C:\\Windows\\System32\\cmd.exe", "--run --test")]
|
|
[DataRow("cmd --run --test ", "C:\\Windows\\System32\\cmd.exe", "--run --test")]
|
|
[DataRow("cmd \"--run --test\" --pass", "C:\\Windows\\System32\\cmd.exe", "\"--run --test\" --pass")]
|
|
public void NormalizeArgsWithSpaces(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("ThereIsNoWayYouHaveAnExecutableNamedThisOnThePipeline", "ThereIsNoWayYouHaveAnExecutableNamedThisOnThePipeline", "")]
|
|
[DataRow("C:\\ThisPathDoesNotExist\\NoExecutable.exe", "C:\\ThisPathDoesNotExist\\NoExecutable.exe", "")]
|
|
public void NormalizeNonExistentExecutable(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
|
|
[TestMethod]
|
|
[DataRow("C:\\Windows", "c:\\Windows", "")]
|
|
[DataRow("C:\\Windows foo /bar", "c:\\Windows", "foo /bar")]
|
|
public void NormalizeDirectoryAsExecutable(string input, string expectedExe, string expectedArgs = "")
|
|
{
|
|
NormalizeTestCore(input, expectedExe, expectedArgs);
|
|
}
|
|
}
|