Skip to content

refactor: Parameter validation in "async"/"await" methods should be wrapped #894

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 1 commit into from
Nov 12, 2025
Merged

refactor: Parameter validation in "async"/"await" methods should be wrapped #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions Source/Testably.Abstractions.Compression/ZipArchiveEntryWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,31 +109,41 @@ public void ExtractToFile(string destinationFileName, bool overwrite)

#if FEATURE_COMPRESSION_ASYNC
/// <inheritdoc cref="IZipArchiveEntry.ExtractToFileAsync(string, CancellationToken)" />
public async Task ExtractToFileAsync(string destinationFileName, CancellationToken cancellationToken = default)
public Task ExtractToFileAsync(string destinationFileName, CancellationToken cancellationToken = default)
{
if (destinationFileName == null)
{
throw new ArgumentNullException(nameof(destinationFileName));
}

await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToFileAsync(destinationFileName, cancellationToken),
() => ZipUtilities.ExtractToFile(this, destinationFileName, false));
return ExtractToFileImplAsync(destinationFileName, cancellationToken);

async Task ExtractToFileImplAsync(string d, CancellationToken c)
{
await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToFileAsync(d, c),
() => ZipUtilities.ExtractToFile(this, d, false));
}
}
#endif

#if FEATURE_COMPRESSION_ASYNC
/// <inheritdoc cref="IZipArchiveEntry.ExtractToFileAsync(string, bool, CancellationToken)" />
public async Task ExtractToFileAsync(string destinationFileName, bool overwrite, CancellationToken cancellationToken = default)
public Task ExtractToFileAsync(string destinationFileName, bool overwrite, CancellationToken cancellationToken = default)
{
if (destinationFileName == null)
{
throw new ArgumentNullException(nameof(destinationFileName));
}

await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToFileAsync(destinationFileName, overwrite, cancellationToken),
() => ZipUtilities.ExtractToFile(this, destinationFileName, overwrite));
return ExtractToFileImplAsync(destinationFileName, overwrite, cancellationToken);

async Task ExtractToFileImplAsync(string d, bool o, CancellationToken c)
{
await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToFileAsync(d, o, c),
() => ZipUtilities.ExtractToFile(this, d, o));
}
}
#endif

Expand Down
49 changes: 28 additions & 21 deletions Source/Testably.Abstractions.Compression/ZipArchiveWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,30 +166,34 @@ public void ExtractToDirectory(string destinationDirectoryName, bool overwriteFi

#if FEATURE_COMPRESSION_ASYNC
/// <inheritdoc cref="IZipArchive.ExtractToDirectoryAsync(string, CancellationToken)" />
public async Task ExtractToDirectoryAsync(string destinationDirectoryName,
public Task ExtractToDirectoryAsync(string destinationDirectoryName,
CancellationToken cancellationToken = default)
{
if (destinationDirectoryName == null)
{
throw new ArgumentNullException(nameof(destinationDirectoryName));
}

await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToDirectoryAsync(destinationDirectoryName,
cancellationToken),
() =>
{
foreach (IZipArchiveEntry entry in Entries)
return ExtractToDirectoryImplAsync(destinationDirectoryName, cancellationToken);

async Task ExtractToDirectoryImplAsync(string d, CancellationToken c)
{
await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToDirectoryAsync(d, c),
() =>
{
entry.ExtractRelativeToDirectory(destinationDirectoryName, overwrite: false);
}
});
foreach (IZipArchiveEntry entry in Entries)
{
entry.ExtractRelativeToDirectory(d, overwrite: false);
}
});
}
}
#endif

#if FEATURE_COMPRESSION_ASYNC
/// <inheritdoc cref="IZipArchive.ExtractToDirectoryAsync(string, bool, CancellationToken)" />
public async Task ExtractToDirectoryAsync(string destinationDirectoryName,
public Task ExtractToDirectoryAsync(string destinationDirectoryName,
bool overwriteFiles,
CancellationToken cancellationToken = default)
{
Expand All @@ -198,17 +202,20 @@ public async Task ExtractToDirectoryAsync(string destinationDirectoryName,
throw new ArgumentNullException(nameof(destinationDirectoryName));
}

await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToDirectoryAsync(destinationDirectoryName,
overwriteFiles, cancellationToken),
() =>
{
foreach (IZipArchiveEntry entry in Entries)
return ExtractToDirectoryImplAsync(destinationDirectoryName, overwriteFiles, cancellationToken);

async Task ExtractToDirectoryImplAsync(string d, bool o, CancellationToken c)
{
await Execute.WhenRealFileSystemAsync(FileSystem,
async () => await _instance.ExtractToDirectoryAsync(d, o, c),
() =>
{
entry.ExtractRelativeToDirectory(destinationDirectoryName,
overwrite: overwriteFiles);
}
});
foreach (IZipArchiveEntry entry in Entries)
{
entry.ExtractRelativeToDirectory(d, overwrite: o);
}
});
}
}
#endif

Expand Down
Loading