@@ -87,7 +87,7 @@ public static void Names()
87
87
// Name abbreviations, if available, are used instead
88
88
public static IEnumerable < object [ ] > Platform_TimeZoneNamesTestData ( )
89
89
{
90
- if ( PlatformDetection . IsBrowser )
90
+ if ( PlatformDetection . IsBrowser || PlatformDetection . IsiOS || PlatformDetection . IstvOS )
91
91
return new TheoryData < TimeZoneInfo , string , string , string >
92
92
{
93
93
{ TimeZoneInfo . FindSystemTimeZoneById ( s_strPacific ) , "(UTC-08:00) America/Los_Angeles" , "PST" , "PDT" } ,
@@ -125,7 +125,6 @@ public static IEnumerable<object []> Platform_TimeZoneNamesTestData()
125
125
// We test the existence of a specific English time zone name to avoid failures on non-English platforms.
126
126
[ ConditionalTheory ( nameof ( IsEnglishUILanguage ) ) ]
127
127
[ MemberData ( nameof ( Platform_TimeZoneNamesTestData ) ) ]
128
- [ ActiveIssue ( "https://github.com/dotnet/runtime/issues/52072" , TestPlatforms . iOS | TestPlatforms . tvOS | TestPlatforms . MacCatalyst ) ]
129
128
public static void Platform_TimeZoneNames ( TimeZoneInfo tzi , string displayName , string standardName , string daylightName )
130
129
{
131
130
// Edge case - Optionally allow some characters to be absent in the display name.
@@ -2623,10 +2622,9 @@ public static void EnsureUtcObjectSingleton()
2623
2622
[ InlineData ( "Argentina Standard Time" , "America/Argentina/Catamarca" ) ]
2624
2623
[ InlineData ( "Newfoundland Standard Time" , "America/St_Johns" ) ]
2625
2624
[ InlineData ( "Iran Standard Time" , "Asia/Tehran" ) ]
2626
- [ ActiveIssue ( "https://github.com/dotnet/runtime/issues/52072" , TestPlatforms . iOS | TestPlatforms . tvOS | TestPlatforms . MacCatalyst ) ]
2627
2625
public static void UsingAlternativeTimeZoneIdsTest ( string windowsId , string ianaId )
2628
2626
{
2629
- if ( PlatformDetection . ICUVersion . Major >= 52 )
2627
+ if ( PlatformDetection . ICUVersion . Major >= 52 && ! PlatformDetection . IsiOS && ! PlatformDetection . IstvOS )
2630
2628
{
2631
2629
TimeZoneInfo tzi1 = TimeZoneInfo . FindSystemTimeZoneById ( ianaId ) ;
2632
2630
TimeZoneInfo tzi2 = TimeZoneInfo . FindSystemTimeZoneById ( windowsId ) ;
@@ -2644,7 +2642,6 @@ public static void UsingAlternativeTimeZoneIdsTest(string windowsId, string iana
2644
2642
public static bool SupportIanaNamesConversion => PlatformDetection . IsNotBrowser && PlatformDetection . ICUVersion . Major >= 52 ;
2645
2643
2646
2644
[ ConditionalFact ( nameof ( SupportIanaNamesConversion ) ) ]
2647
- [ ActiveIssue ( "https://github.com/dotnet/runtime/issues/52072" , TestPlatforms . iOS | TestPlatforms . tvOS | TestPlatforms . MacCatalyst ) ]
2648
2645
public static void IsIanaIdTest ( )
2649
2646
{
2650
2647
bool expected = ! s_isWindows ;
@@ -2654,7 +2651,8 @@ public static void IsIanaIdTest()
2654
2651
Assert . True ( ( expected || tzi . Id . Equals ( "Utc" , StringComparison . OrdinalIgnoreCase ) ) == tzi . HasIanaId , $ "`{ tzi . Id } ` has wrong IANA Id indicator") ;
2655
2652
}
2656
2653
2657
- Assert . False ( TimeZoneInfo . FindSystemTimeZoneById ( "Pacific Standard Time" ) . HasIanaId , $ "`Pacific Standard Time` should not be IANA Id.") ;
2654
+ string timeZoneIdNotIANAId = PlatformDetection . IsiOS || PlatformDetection . IstvOS ? "America/Buenos_Aires" : "Pacific Standard Time" ;
2655
+ Assert . False ( TimeZoneInfo . FindSystemTimeZoneById ( timeZoneIdNotIANAId ) . HasIanaId , $ " should not be IANA Id.") ;
2658
2656
Assert . True ( TimeZoneInfo . FindSystemTimeZoneById ( "America/Los_Angeles" ) . HasIanaId , $ "'America/Los_Angeles' should be IANA Id") ;
2659
2657
}
2660
2658
@@ -2674,7 +2672,7 @@ public static void IsIanaIdTest()
2674
2672
[ InlineData ( "Argentina Standard Time" , "America/Buenos_Aires" ) ]
2675
2673
[ InlineData ( "Newfoundland Standard Time" , "America/St_Johns" ) ]
2676
2674
[ InlineData ( "Iran Standard Time" , "Asia/Tehran" ) ]
2677
- [ ActiveIssue ( "https://github.com/dotnet/runtime/issues/52072" , TestPlatforms . iOS | TestPlatforms . tvOS | TestPlatforms . MacCatalyst ) ]
2675
+ [ SkipOnPlatform ( TestPlatforms . iOS | TestPlatforms . MacCatalyst | TestPlatforms . tvOS , "Not supported on iOS/ MacCatalyst/tvOS." ) ]
2678
2676
public static void IdsConversionsTest ( string windowsId , string ianaId )
2679
2677
{
2680
2678
Assert . True ( TimeZoneInfo . TryConvertIanaIdToWindowsId ( ianaId , out string winId ) ) ;
@@ -2709,7 +2707,7 @@ public static void IdsConversionsTest(string windowsId, string ianaId)
2709
2707
[ InlineData ( "GMT Standard Time" , "Europe/Dublin" , "ie" ) ]
2710
2708
[ InlineData ( "W. Europe Standard Time" , "Europe/Rome" , "it" ) ]
2711
2709
[ InlineData ( "New Zealand Standard Time" , "Pacific/Auckland" , "nz" ) ]
2712
- [ ActiveIssue ( "https://github.com/dotnet/runtime/issues/52072" , TestPlatforms . iOS | TestPlatforms . tvOS | TestPlatforms . MacCatalyst ) ]
2710
+ [ SkipOnPlatform ( TestPlatforms . iOS | TestPlatforms . MacCatalyst | TestPlatforms . tvOS , "Not supported on iOS/ MacCatalyst/tvOS." ) ]
2713
2711
public static void IdsConversionsWithRegionTest ( string windowsId , string ianaId , string region )
2714
2712
{
2715
2713
Assert . True ( TimeZoneInfo . TryConvertWindowsIdToIanaId ( windowsId , region , out string ianaConvertedId ) ) ;
0 commit comments