From 8e43c9d8ce93ca3d60e0c45b566dc89bfb3b7a4a Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Mon, 15 Nov 2021 11:22:41 -0600 Subject: [PATCH] more tests --- .../TerminalApp.LocalTests.vcxproj | 2 +- .../TrustCommandlineTests.cpp | 23 ++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj index e7ebfbedb..1e00c19c8 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj @@ -44,7 +44,7 @@ - + Create diff --git a/src/cascadia/LocalTests_TerminalApp/TrustCommandlineTests.cpp b/src/cascadia/LocalTests_TerminalApp/TrustCommandlineTests.cpp index 55a46e6d4..c44c46b31 100644 --- a/src/cascadia/LocalTests_TerminalApp/TrustCommandlineTests.cpp +++ b/src/cascadia/LocalTests_TerminalApp/TrustCommandlineTests.cpp @@ -39,6 +39,7 @@ namespace TerminalAppLocalTests TEST_METHOD(SimpleTests); TEST_METHOD(TestCommandlineWithArgs); TEST_METHOD(TestCommandlineWithSpaces); + TEST_METHOD(TestCommandlineWithEnvVars); TEST_METHOD(WslTests); TEST_METHOD(TestPwshLocation); @@ -68,14 +69,30 @@ namespace TerminalAppLocalTests void TrustCommandlineTests::TestCommandlineWithSpaces() { - VERIFY_IS_TRUE(false, L"TODO! implement me."); + VERIFY_IS_TRUE(trust(L"C:\\Program Files\\PowerShell\\7\\pwsh.exe")); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System 32\\cmd.exe")); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System32\\ cmd.exe")); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System32\\cmd.exe /c cmd.exe")); } + + void TrustCommandlineTests::TestCommandlineWithEnvVars() + { + VERIFY_IS_TRUE(trust(L"%WINDIR%\\system32\\cmd.exe")); + VERIFY_IS_TRUE(trust(L"%WINDIR%\\system32\\WindowsPowerShell\\v1.0\\powershell.exe")); + VERIFY_IS_TRUE(trust(L"%ProgramFiles%\\PowerShell\\7\\pwsh.exe")); + } + void TrustCommandlineTests::WslTests() { - VERIFY_IS_TRUE(false, L"TODO! implement me."); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System32\\wsl")); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System32\\wsl.exe")); + VERIFY_IS_FALSE(trust(L"C:\\Windows\\System32\\wsl.exe -d Ubuntu")); + VERIFY_IS_FALSE(trust(L"wsl.exe")); } + void TrustCommandlineTests::TestPwshLocation() { - VERIFY_IS_TRUE(false, L"TODO! implement me."); + VERIFY_IS_TRUE(trust(L"%ProgramFiles%\\PowerShell\\7\\pwsh.exe")); + VERIFY_IS_TRUE(trust(L"%LOCALAPPDATA%\\Microsoft\\WindowsApps\\pwsh.exe")); } }