Skip to content

[libs][Unix] Fix UTC alias lookup #88641

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
merged 9 commits into from
Jul 13, 2023
Merged

[libs][Unix] Fix UTC alias lookup #88641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3be3e1
[libs][Unix] Fix UTC alias lookup
RenderMichael Jul 11, 2023
b00b0df
Add regression test (non-windows)
RenderMichael Jul 11, 2023
8c9c927
Fix TimeZoneInfo equality.
RenderMichael Jul 11, 2023
3f21ef5
Use cleaner TimeZoneInfo.HasSameRules() method
RenderMichael Jul 11, 2023
1091336
Check only BaseUtcOffset and GetAdjustmentRules()
RenderMichael Jul 12, 2023
ad365f3
Turn off build on browser
RenderMichael Jul 12, 2023
58ddb05
Add UTC aliases to SystemTimeZonesTestData
RenderMichael Jul 12, 2023
4e122bd
Add back `UtcAliases_MapToUtc` test
RenderMichael Jul 12, 2023
5d547ea
don't run UTC alias test on browser
RenderMichael Jul 13, 2023
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
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/TimeZoneInfo.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ private static bool IsUtcAlias (string id)
case 69: // e
case 101: // E
return string.Equals(id, "Etc/UTC", StringComparison.OrdinalIgnoreCase) ||
string.Equals(id, "Etc/UCT", StringComparison.OrdinalIgnoreCase) ||
string.Equals(id, "Etc/Universal", StringComparison.OrdinalIgnoreCase) ||
string.Equals(id, "Etc/UTC", StringComparison.OrdinalIgnoreCase) ||
string.Equals(id, "Etc/Zulu", StringComparison.OrdinalIgnoreCase);
case 85: // u
case 117: // U
Expand Down
22 changes: 22 additions & 0 deletions src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2334,6 +2334,14 @@ public static IEnumerable<object[]> SystemTimeZonesTestData()
yield return new object[] { tz };
}
}

if (!PlatformDetection.IsBrowser)
{
foreach (string alias in s_UtcAliases)
{
yield return new object[] { TimeZoneInfo.FindSystemTimeZoneById(alias) };
}
}
}
}

Expand Down Expand Up @@ -2424,6 +2432,20 @@ public static void TimeZoneDisplayNames_Unix(TimeZoneInfo timeZone)
}
}

[Fact]
[PlatformSpecific(~TestPlatforms.Windows & ~TestPlatforms.Browser)]
public static void UtcAliases_MapToUtc()
{
TimeZoneInfo.AdjustmentRule[] expectedAdjustmentRules = TimeZoneInfo.Utc.GetAdjustmentRules();

foreach (var alias in s_UtcAliases)
{
TimeZoneInfo actualUtc = TimeZoneInfo.FindSystemTimeZoneById(alias);
Assert.Equal(TimeZoneInfo.Utc.BaseUtcOffset, actualUtc.BaseUtcOffset);
Assert.Equal(expectedAdjustmentRules, actualUtc.GetAdjustmentRules());
}
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/19794", TestPlatforms.AnyUnix)]
[Theory]
[MemberData(nameof(SystemTimeZonesTestData))]
Expand Down