starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-05-18 01:39:55 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

add some stubs for tests in the future

Browse Source
This commit is contained in:
Mike Griese
2020-07-07 16:46:31 -05:00
parent 946d710ffe
commit a5eba5ac9c
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cascadia/LocalTests_TerminalApp/CommandTests.cpp
View File

@@ -41,6 +41,10 @@ namespace TerminalAppLocalTests
TEST_METHOD(TestAutogeneratedName);
TEST_METHOD(TestLayerOnAutogeneratedName);
TEST_METHOD(TestIterateCommands);
TEST_METHOD(TestIterateAutogenNamedCommands);
TEST_METHOD(TestIterateOnBadJson);
TEST_CLASS_SETUP(ClassSetup)
{
InitializeJsonReader();
@@ -346,4 +350,22 @@ namespace TerminalAppLocalTests
VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
}
}
void CommandTests::TestIterateCommands()
{
// For this test, put an iterable command with a given `name`,
// containing a ${profile.name} to replace. When we expand it, it should
// have created one command for each profile.
}
void CommandTests::TestIterateAutogenNamedCommands()
{
// For this test, put an iterable command without a given `name` to
// replace. When we expand it, it should still work.
}
void CommandTests::TestIterateOnBadJson()
{
// For this test, put an iterable command with a profile name that would
// cause bad json to be filled in. Something like a profile with a name
// of "Foo\"", so the trailing '"' might break the json parsing.
}
}

28
src/cascadia/TerminalApp/Command.cpp
View File

@@ -112,20 +112,15 @@ namespace winrt::TerminalApp::implementation
{
auto result = winrt::make_self<Command>();
// bool parseActionLater = false;
if (const auto iterateOnJson{ json[JsonKey(IterateOnKey)] })
{
auto s = iterateOnJson.asString();
if (s == IterateOnProfilesValue)
{
result->_IterateOn = ExpandCommandType::Profiles;
// parseActionLater = true;
}
}
// if (!parseActionLater)
// {
// TODO GH#6644: iconPath not implemented quite yet. Can't seem to get
// the binding quite right. Additionally, do we want it to be an image,
// or a FontIcon? I've had difficulty binding either/or.
@@ -146,6 +141,11 @@ namespace winrt::TerminalApp::implementation
return nullptr;
}
// If an iterable command doesn't have a name set, we'll still just
// try and generate a fake name for the command give the string we
// currently have. It'll probably generate something like "New tab,
// profile: ${profile.name}". This string will only be temporarily
// used internally, so there's no problem.
result->_setName(_nameFromJsonOrAction(json, actionAndArgs));
}
else
@@ -154,17 +154,12 @@ namespace winrt::TerminalApp::implementation
// should also be used for unbinding.
return nullptr;
}
// }
// else
// {
// // Just use the current string as the name for now.
// result->_setName(_nameFromJson(json));
result->_originalJson = json;
// }
// TODO: an iterable command might not have a name set at all, and might
// be relying on the command to be expanded, then have the name auto
// generated. Make sure that those types of commands will still work.
// Stash the original json value in this object. If the command is
// iterable, we'll need to re-parse it later, once we know what all the
// values we can iterate on are.
result->_originalJson = json;
if (result->_Name.empty())
{
return nullptr;
@@ -289,7 +284,6 @@ namespace winrt::TerminalApp::implementation
// then re-attempt to parse the action and args.
//
auto newCmd = winrt::make_self<Command>();
// newCmd->_setIconPath(expandable->_IconPath);
newCmd->_setKeyChordText(expandable->_KeyChordText);
newCmd->_setName(_replaceKeyword(expandable->_Name,
ProfileName,
@@ -313,6 +307,8 @@ namespace winrt::TerminalApp::implementation
break;
}
// TODO: We should probably just pass this back though FromJson
// auto actionAndArgs = _getActionAndArgsFromJson(newJsonValue, warnings);
if (const auto actionJson{ newJsonValue[JsonKey(ActionKey)] })