Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions src/libraries/Common/tests/System/IO/Compression/ZipTestHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,22 @@ public static async Task DirsEqual(string actual, string expected)

public static void DirFileNamesEqual(string actual, string expected)
{
IOrderedEnumerable<string> actualEntries = Directory.EnumerateFileSystemEntries(actual, "*", SearchOption.AllDirectories).Order();
IOrderedEnumerable<string> expectedEntries = Directory.EnumerateFileSystemEntries(expected, "*", SearchOption.AllDirectories).Order();
AssertExtensions.SequenceEqual(expectedEntries.Select(Path.GetFileName).ToArray(), actualEntries.Select(Path.GetFileName).ToArray());
IEnumerable<string> actualEntries = Directory.EnumerateFileSystemEntries(actual, "*", SearchOption.AllDirectories).Select(Path.GetFileName);
IEnumerable<string> expectedEntries = Directory.EnumerateFileSystemEntries(expected, "*", SearchOption.AllDirectories).Select(Path.GetFileName);

if (PlatformDetection.IsiOS || PlatformDetection.IstvOS)
{
// iOS/tvOS filesystems use NFD by default for non-ASCII characters, so we normalize to NFC for cross-platform comparison
actualEntries = actualEntries.Select(name => name.Normalize(NormalizationForm.FormC)).Order();
expectedEntries = expectedEntries.Select(name => name.Normalize(NormalizationForm.FormC)).Order();
}
else
{
actualEntries = actualEntries.Order();
expectedEntries = expectedEntries.Order();
}

AssertExtensions.SequenceEqual(actualEntries.ToArray(), expectedEntries.ToArray());
}

private static async Task ItemEqual(string[] actualList, List<FileData> expectedList, bool isFile)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public async Task ExtractToDirectoryNormal_Unwritable_Unseekable(string file, st

[Theory]
[MemberData(nameof(Get_Booleans_Data))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72951", TestPlatforms.iOS | TestPlatforms.tvOS)]
public async Task ExtractToDirectoryUnicode(bool async)
{
FileStream source = CreateFileStreamRead(async, zfile("unicode.zip"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public async Task ExtractToDirectoryNull(bool async)

[Theory]
[MemberData(nameof(Get_Booleans_Data))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72951", TestPlatforms.iOS | TestPlatforms.tvOS)]
public async Task ExtractToDirectoryUnicode(bool async)
{
string zipFileName = zfile("unicode.zip");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public async Task ExtractToDirectoryExtension(bool async)
await DisposeZipArchive(async, archive);
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/72951", TestPlatforms.iOS | TestPlatforms.tvOS)]
[Theory]
[MemberData(nameof(Get_Booleans_Data))]
public async Task ExtractToDirectoryExtension_Unicode(bool async)
Expand Down
Loading