admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Move-Item work with its -Include, -Exclude, and -Filter parameters (#3878)

Browse Source 
* Make Move-Item work with its -Include, -Exclude, and -Filter parameters (#2385)

Invoke the correct overload of SessionState.Path.GetResolvedPSPathFromPSPath, passing the cmdlet context object.

* Update tests per code review.

* Changes per code review.

* Remove stray comment
This commit is contained in:
jeffbi
2017-06-22 19:14:51 -07:00
committed by Travis Plunk
parent c549925f67
commit 5ee4ec1e1e
2 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
+1 -1
View File
@@ -3510,7 +3510,7 @@ namespace Microsoft.PowerShell.Commands
Collection<PathInfo> results = new Collection<PathInfo>();
try
{
results = SessionState.Path.GetResolvedPSPathFromPSPath(path);
results = SessionState.Path.GetResolvedPSPathFromPSPath(path, CmdletProviderContext);
}
catch (PSNotSupportedException notSupported)
{
test/powershell/Modules/Microsoft.PowerShell.Management/Move-Item.Tests.ps1
+87
View File
@@ -11,4 +11,91 @@ Describe "Move-Item tests" -Tag "CI" {
test-path $target | Should be $true
"$target" | Should ContainExactly "This is content"
}
Context "Move-Item with filters" {
BeforeAll {
$filterPath = "$TESTDRIVE/filterTests"
$moveToPath = "$TESTDRIVE/dest-dir"
$renameToPath = Join-Path $filterPath "move.txt"
$filePath = Join-Path $filterPath "*"
$fooFile = "foo.txt"
$barFile = "bar.txt"
$booFile = "boo.txt"
$fooPath = Join-Path $filterPath $fooFile
$barPath = Join-Path $filterPath $barFile
$booPath = Join-Path $filterPath $booFile
$newFooPath = Join-Path $moveToPath $fooFile
$newBarPath = Join-Path $moveToPath $barFile
$newBooPath = Join-Path $moveToPath $booFile
$fooContent = "foo content"
$barContent = "bar content"
$booContent = "boo content"
}
BeforeEach {
New-Item -ItemType Directory -Path $filterPath | Out-Null
New-Item -ItemType Directory -Path $moveToPath | Out-Null
New-Item -ItemType File -Path $fooPath -Value $fooContent | Out-Null
New-Item -ItemType File -Path $barPath -Value $barContent | Out-Null
New-Item -ItemType File -Path $booPath -Value $booContent | Out-Null
}
AfterEach {
Remove-Item $filterPath -Recurse -Force -ErrorAction SilentlyContinue
Remove-Item $moveToPath -Recurse -Force -ErrorAction SilentlyContinue
}
It "Can move to different directory, filtered with -Include" {
Move-Item -Path $filePath -Destination $moveToPath -Include "bar*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$barPath | Should Not Exist
$newBarPath | Should Exist
$booPath | Should Exist
$fooPath | Should Exist
$newBarPath | Should ContainExactly $barContent
}
It "Can move to different directory, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $moveToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$fooPath | Should Not Exist
$newFooPath | Should Exist
$booPath | Should Exist
$barPath | Should Exist
$newFooPath | Should ContainExactly $fooContent
}
It "Can move to different directory, filtered with -Filter" {
Move-Item -Path $filePath -Destination $moveToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$booPath | Should Not Exist
$newBooPath | Should Exist
$barPath | Should Exist
$fooPath | Should Exist
$newBooPath | Should ContainExactly $booContent
}
It "Can rename via move, filtered with -Include" {
Move-Item -Path $filePath -Destination $renameToPath -Include "bar*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$barPath | Should Not Exist
$booPath | Should Exist
$fooPath | Should Exist
$renameToPath | Should ContainExactly $barContent
}
It "Can rename via move, filtered with -Exclude" {
Move-Item -Path $filePath -Destination $renameToPath -Exclude "b*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$fooPath | Should Not Exist
$booPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $fooContent
}
It "Can rename via move, filtered with -Filter" {
Move-Item -Path $filePath -Destination $renameToPath -Filter "bo*" -ErrorVariable e -ErrorAction SilentlyContinue
$e | Should BeNullOrEmpty
$renameToPath | Should Exist
$booPath | Should Not Exist
$fooPath | Should Exist
$barPath | Should Exist
$renameToPath | Should ContainExactly $booContent
}
}
}