Skip to content

Add CmdletInfo to Command Clone() #12301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 2 commits into from
May 11, 2020
Merged

Add CmdletInfo to Command Clone() #12301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f33ae5d
Add CmdletInfo to Command Clone
TylerLeonhardt Apr 11, 2020
92f35ae
Add a new line after the header
daxian-dbw Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/System.Management.Automation/engine/hostifaces/Command.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ internal Command(Command command)
MergeToResult = command.MergeToResult;
_mergeUnclaimedPreviousCommandResults = command._mergeUnclaimedPreviousCommandResults;
IsEndOfStatement = command.IsEndOfStatement;
CommandInfo = command.CommandInfo;

foreach (CommandParameter param in command.Parameters)
{
Expand Down
71 changes: 71 additions & 0 deletions test/powershell/engine/Api/PSCommand.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

Describe "PSCommand API tests" -Tag "CI" {
BeforeAll {
$shell = [PowerShell]::Create()
}

AfterAll {
$shell.Dispose()
}

BeforeEach {
$psCommand = [System.Management.Automation.PSCommand]::new()
}

AfterEach {
$shell.Commands.Clear()
}

Context "AddCommand method on PSCommand" {
It "Can add a command by name and parameter to a PSCommand" {
$null = $psCommand.AddCommand("Write-Output").AddParameter("InputObject", 5)
$shell.Commands = $psCommand
$result = $shell.Invoke()
$result | Should -Be 5
}

It "Can add a command by Command object and parameter to a PSCommand" {
$command = [System.Management.Automation.Runspaces.Command]::new("Get-Date")
$null = $psCommand.AddCommand($command)
$shell.Commands = $psCommand
$result = $shell.Invoke()
$result | Should -BeOfType System.DateTime
}
}

Context "Cloning PSCommands" {
It "The clone method successfully copies commands" {
$null = $psCommand.AddCommand("Write-Output").AddParameter("InputObject", 5)

$newCommand = $psCommand.Clone()

$newCommand.Commands | Should -Not -BeNullOrEmpty
$newCommand.Commands[0].CommandText | Should -Be "Write-Output"
$newCommand.Commands[0].Parameters | Should -Not -BeNullOrEmpty
$newCommand.Commands[0].Parameters[0].Name | Should -Be "InputObject"
$newCommand.Commands[0].Parameters[0].Value | Should -Be 5
}

It "clones properly when using the setter on the PowerShell type" {
try {
$otherShell = [powershell]::Create('CurrentRunspace')

# We manually create a CmdletInfo here (with an unresolable command) to verify that CmdletInfo's are cloned.
$cmdlet = [System.Management.Automation.CmdletInfo]::new('un-resolvable', [Microsoft.PowerShell.Commands.OutStringCommand])
$null = $otherShell.AddCommand($cmdlet).AddParameter("InputObject", 'test')

# Setter for "Commands" calls PSCommand.Clone()
$shell.Commands = $otherShell.Commands

$result = $shell.Invoke()
$result | Should -Be "test
"
}
finally {
$otherShell.Dispose()
}
}
}
}