Skip to content
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

Jump to bottom

Make Measure-Object ignore missing properties unless running in strict mode #16589

Merged
merged 4 commits into from
Jan 13, 2022
Merged

Make Measure-Object ignore missing properties unless running in strict mode #16589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a10f65
Changes: when Measure-Object is used on an empty folder, error thrown…
KiwiThePoodle Dec 10, 2021
91aa83d
Put string errorId in if condition block, adjusted test to include -E…
KiwiThePoodle Dec 10, 2021
7cafad9
Moved afterall to be right after beforeall in tests
KiwiThePoodle Dec 11, 2021
e1847f4
Changed condition checking for strictmode
KiwiThePoodle Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,9 @@ private void WritePropertyNotFoundError(string propertyName, string errorId)
{
Diagnostics.Assert(Property != null, "no property and no InputObject should have been addressed");
ErrorRecord errorRecord = new(
PSTraceSource.NewArgumentException("Property"),
PSTraceSource.NewArgumentException(propertyName),
errorId,
ErrorCategory.InvalidArgument,
ErrorCategory.ObjectNotFound,
null);
errorRecord.ErrorDetails = new ErrorDetails(
this, "MeasureObjectStrings", "PropertyNotFound", propertyName);
Expand All @@ -820,9 +820,12 @@ protected override void EndProcessing()
Statistics stat = _statistics[propertyName];
if (stat.count == 0 && Property != null)
{
// Why are there two different ids for this error?
string errorId = (IsMeasuringGeneric) ? "GenericMeasurePropertyNotFound" : "TextMeasurePropertyNotFound";
WritePropertyNotFoundError(propertyName, errorId);
if (Context.IsStrictVersion(2))
{
string errorId = (IsMeasuringGeneric) ? "GenericMeasurePropertyNotFound" : "TextMeasurePropertyNotFound";
WritePropertyNotFoundError(propertyName, errorId);
}

continue;
}

Expand Down
20 changes: 20 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,26 @@ Describe "Measure-Object" -Tags "CI" {
}
}

Context "Empty folder tests" {
BeforeAll {
$repoPath = Join-Path -Path $TESTDRIVE -ChildPath "my_folder"
$testEmptyFolder = New-Item $repoPath -ItemType "directory"
$propertyName = "Length"
}

AfterAll {
Set-StrictMode -off
}

It "Should not throw an invalid property error when not in StrictMode" {
{ Set-StrictMode -off; Get-Item $testEmptyFolder | Measure-Object $propertyName -ErrorAction Stop -sum } | Should -Not -Throw
}

It "Should throw an invalid property error when in StrictMode" {
{ Set-StrictMode -version 3.0; Get-Item $testEmptyFolder | Measure-Object $propertyName -ErrorAction Stop -sum } | Should -Throw -ErrorId 'GenericMeasurePropertyNotFound,Microsoft.PowerShell.Commands.MeasureObjectCommand'
}
}

Context "String tests" {
BeforeAll {
$nl = [Environment]::NewLine
Expand Down