Skip to content

#4750 Fix Get-Date -UFormat %G and %g behavior #14555

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
anmenaga merged 5 commits into from
Mar 2, 2021
Merged

#4750 Fix Get-Date -UFormat %G and %g behavior #14555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbf1528
Issue #4750 Fix Get-Date -UFormat %G and %g behavior
brianary Jan 7, 2021
e3d7948
Use correct naming convention
brianary Jan 8, 2021
778b075
Finish renaming local vars
brianary Jan 8, 2021
b11a036
#4750 Fix Get-Date -UFormat %G and %g behavior
brianary Feb 7, 2021
8a27bb2
Remove redundant ISO week calendar year code
brianary Feb 18, 2021
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
5 changes: 3 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,12 @@ private string UFormatDateString(DateTime dateTime)
break;

case 'G':
sb.Append("{0:yyyy}");
sb.Append(StringUtil.Format("{0:0000}", ISOWeek.GetYear(dateTime)));
break;

case 'g':
sb.Append("{0:yy}");
int isoYearWithoutCentury = ISOWeek.GetYear(dateTime) % 100;
sb.Append(StringUtil.Format("{0:00}", isoYearWithoutCentury));
break;

case 'H':
Expand Down
91 changes: 90 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,96 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
Get-Date -Date $date -UFormat %V | Should -BeExactly $week
}

# Using the same test cases as V for ISO week date component parity, plus some more esoteric ones
It "using -uformat 'G' produces the correct output" -TestCases @(
@{date="0055-12-31"; year = "0055"},
@{date="0325-01-01"; year = "0325"},
@{date="0777-01-01"; year = "0776"},
@{date="1998-01-02"; year = "1998"},
@{date="1998-01-03"; year = "1998"},
@{date="2003-01-03"; year = "2003"},
@{date="2004-01-02"; year = "2004"},
@{date="2004-01-03"; year = "2004"},
@{date="2005-01-01"; year = "2004"},
@{date="2005-01-02"; year = "2004"},
@{date="2005-12-31"; year = "2005"},
@{date="2006-01-01"; year = "2005"},
@{date="2006-01-02"; year = "2006"},
@{date="2006-12-31"; year = "2006"},
@{date="2007-01-01"; year = "2007"},
@{date="2007-12-30"; year = "2007"},
@{date="2007-12-31"; year = "2008"},
@{date="2008-01-01"; year = "2008"},
@{date="2008-12-28"; year = "2008"},
@{date="2008-12-29"; year = "2009"},
@{date="2008-12-30"; year = "2009"},
@{date="2008-12-31"; year = "2009"},
@{date="2009-01-01"; year = "2009"},
@{date="2009-01-02"; year = "2009"},
@{date="2009-01-03"; year = "2009"},
@{date="2009-12-31"; year = "2009"},
@{date="2010-01-01"; year = "2009"},
@{date="2010-01-02"; year = "2009"},
@{date="2010-01-03"; year = "2009"},
@{date="2010-01-04"; year = "2010"},
@{date="2014-01-03"; year = "2014"},
@{date="2015-01-02"; year = "2015"},
@{date="2015-01-03"; year = "2015"},
@{date="2020-01-03"; year = "2020"},
@{date="2025-01-03"; year = "2025"},
@{date="2026-01-02"; year = "2026"},
@{date="2026-01-03"; year = "2026"},
@{date="2031-01-03"; year = "2031"}
) {
param($date, $year)
Get-Date -Date $date -UFormat %G | Should -BeExactly $year
}

# Using the same test cases as V for ISO week date component parity, plus some more esoteric ones
It "using -uformat 'g' produces the correct output" -TestCases @(
@{date="0055-12-31"; yy = "55"},
@{date="0325-01-01"; yy = "25"},
@{date="0777-01-01"; yy = "76"},
@{date="1998-01-02"; yy = "98"},
@{date="1998-01-03"; yy = "98"},
@{date="2003-01-03"; yy = "03"},
@{date="2004-01-02"; yy = "04"},
@{date="2004-01-03"; yy = "04"},
@{date="2005-01-01"; yy = "04"},
@{date="2005-01-02"; yy = "04"},
@{date="2005-12-31"; yy = "05"},
@{date="2006-01-01"; yy = "05"},
@{date="2006-01-02"; yy = "06"},
@{date="2006-12-31"; yy = "06"},
@{date="2007-01-01"; yy = "07"},
@{date="2007-12-30"; yy = "07"},
@{date="2007-12-31"; yy = "08"},
@{date="2008-01-01"; yy = "08"},
@{date="2008-12-28"; yy = "08"},
@{date="2008-12-29"; yy = "09"},
@{date="2008-12-30"; yy = "09"},
@{date="2008-12-31"; yy = "09"},
@{date="2009-01-01"; yy = "09"},
@{date="2009-01-02"; yy = "09"},
@{date="2009-01-03"; yy = "09"},
@{date="2009-12-31"; yy = "09"},
@{date="2010-01-01"; yy = "09"},
@{date="2010-01-02"; yy = "09"},
@{date="2010-01-03"; yy = "09"},
@{date="2010-01-04"; yy = "10"},
@{date="2014-01-03"; yy = "14"},
@{date="2015-01-02"; yy = "15"},
@{date="2015-01-03"; yy = "15"},
@{date="2020-01-03"; yy = "20"},
@{date="2025-01-03"; yy = "25"},
@{date="2026-01-02"; yy = "26"},
@{date="2026-01-03"; yy = "26"},
@{date="2031-01-03"; yy = "31"}
) {
param($date, $yy)
Get-Date -Date $date -UFormat %g | Should -BeExactly $yy
}

# Using the same test cases as V for ISO week date component parity
It "using -uformat 'u' produces the correct output" -TestCases @(
@{date="1998-01-02"; dayOfWeek = "5"},
Expand Down Expand Up @@ -138,7 +228,6 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
param($date, $dayOfWeek)
Get-Date -Date $date -UFormat %u | Should -BeExactly $dayOfWeek
}

It "Passing '<name>' to -uformat produces a descriptive error" -TestCases @(
@{ name = "`$null" ; value = $null; errorId = "ParameterArgumentValidationErrorNullNotAllowed" }
@{ name = "empty string"; value = ""; errorId = "ParameterArgumentValidationErrorEmptyStringNotAllowed" }
Expand Down