Use aweXpect for Compression project

Directory.Packages.props

@@ -22,7 +22,8 @@
 	<ItemGroup>
 		<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
 		<PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
-		<PackageVersion Include="aweXpect" Version="0.7.0" />
+		<PackageVersion Include="aweXpect" Version="0.10.0" />
+		<PackageVersion Include="aweXpect.Testably" Version="0.2.0" />
 		<PackageVersion Include="FluentAssertions" Version="7.0.0" />
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />

Tests/Directory.Build.props

@@ -25,6 +25,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="aweXpect" />
+		<PackageReference Include="aweXpect.Testably" />
 		<PackageReference Include="AutoFixture.Xunit2" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="Xunit.SkippableFact" />

Tests/Testably.Abstractions.Compression.Tests/Internal/ExecuteTests.cs

@@ -5,7 +5,7 @@ namespace Testably.Abstractions.Compression.Tests.Internal;
 public sealed class ExecuteTests
 {
 	[Fact]
-	public void WhenRealFileSystem_MockFileSystem_WithActionCallback_ShouldExecuteOnMockFileSystem()
+	public async Task WhenRealFileSystem_MockFileSystem_WithActionCallback_ShouldExecuteOnMockFileSystem()
 	{
 		bool onRealFileSystemExecuted = false;
 		bool onMockFileSystemExecuted = false;
@@ -20,12 +20,12 @@ public void WhenRealFileSystem_MockFileSystem_WithActionCallback_ShouldExecuteOn
 				onMockFileSystemExecuted = true;
 			});
 
-		onRealFileSystemExecuted.Should().BeFalse();
-		onMockFileSystemExecuted.Should().BeTrue();
+		await That(onRealFileSystemExecuted).Should().BeFalse();
+		await That(onMockFileSystemExecuted).Should().BeTrue();
 	}
 
 	[Fact]
-	public void WhenRealFileSystem_MockFileSystem_WithFuncCallback_ShouldExecuteOnMockFileSystem()
+	public async Task WhenRealFileSystem_MockFileSystem_WithFuncCallback_ShouldExecuteOnMockFileSystem()
 	{
 		bool onRealFileSystemExecuted = false;
 		bool onMockFileSystemExecuted = false;
@@ -40,12 +40,12 @@ public void WhenRealFileSystem_MockFileSystem_WithFuncCallback_ShouldExecuteOnMo
 				return onMockFileSystemExecuted = true;
 			});
 
-		onRealFileSystemExecuted.Should().BeFalse();
-		onMockFileSystemExecuted.Should().BeTrue();
+		await That(onRealFileSystemExecuted).Should().BeFalse();
+		await That(onMockFileSystemExecuted).Should().BeTrue();
 	}
 
 	[Fact]
-	public void WhenRealFileSystem_RealFileSystem_WithActionCallback_ShouldExecuteOnRealFileSystem()
+	public async Task WhenRealFileSystem_RealFileSystem_WithActionCallback_ShouldExecuteOnRealFileSystem()
 	{
 		bool onRealFileSystemExecuted = false;
 		bool onMockFileSystemExecuted = false;
@@ -60,12 +60,12 @@ public void WhenRealFileSystem_RealFileSystem_WithActionCallback_ShouldExecuteOn
 				onMockFileSystemExecuted = true;
 			});
 
-		onRealFileSystemExecuted.Should().BeTrue();
-		onMockFileSystemExecuted.Should().BeFalse();
+		await That(onRealFileSystemExecuted).Should().BeTrue();
+		await That(onMockFileSystemExecuted).Should().BeFalse();
 	}
 
 	[Fact]
-	public void WhenRealFileSystem_RealFileSystem_WithFuncCallback_ShouldExecuteOnRealFileSystem()
+	public async Task WhenRealFileSystem_RealFileSystem_WithFuncCallback_ShouldExecuteOnRealFileSystem()
 	{
 		bool onRealFileSystemExecuted = false;
 		bool onMockFileSystemExecuted = false;
@@ -80,7 +80,7 @@ public void WhenRealFileSystem_RealFileSystem_WithFuncCallback_ShouldExecuteOnRe
 				return onMockFileSystemExecuted = true;
 			});
 
-		onRealFileSystemExecuted.Should().BeTrue();
-		onMockFileSystemExecuted.Should().BeFalse();
+		await That(onRealFileSystemExecuted).Should().BeTrue();
+		await That(onMockFileSystemExecuted).Should().BeFalse();
 	}
 }

Tests/Testably.Abstractions.Compression.Tests/Internal/ZipUtilitiesTests.cs

@@ -7,33 +7,33 @@ public sealed class ZipUtilitiesTests
 {
 	[Theory]
 	[AutoData]
-	public void ExtractRelativeToDirectory_FileWithTrailingSlash_ShouldThrowIOException(
+	public async Task ExtractRelativeToDirectory_FileWithTrailingSlash_ShouldThrowIOException(
 		byte[] bytes)
 	{
 		MockFileSystem fileSystem = new();
 		using MemoryStream stream = new(bytes);
 		DummyZipArchiveEntry zipArchiveEntry = new(fileSystem, fullName: "foo/", stream: stream);
 
-		Exception? exception = Record.Exception(() =>
+		void Act()
 		{
 			zipArchiveEntry.ExtractRelativeToDirectory("foo", false);
-		});
+		}
 
-		exception.Should().BeException<IOException>(
-			messageContains:
-			"Zip entry name ends in directory separator character but contains data");
+		await That(Act).Should().Throw<IOException>()
+			.WithMessage("*Zip entry name ends in directory separator character but contains data*")
+			.AsWildcard();
 	}
 
 	[Fact]
-	public void ExtractRelativeToDirectory_WithSubdirectory_ShouldCreateSubdirectory()
+	public async Task ExtractRelativeToDirectory_WithSubdirectory_ShouldCreateSubdirectory()
 	{
 		MockFileSystem fileSystem = new();
 		DummyZipArchiveEntry zipArchiveEntry = new(fileSystem, fullName: "foo/");
 
 		zipArchiveEntry.ExtractRelativeToDirectory("bar", false);
 
-		fileSystem.Directory.Exists("bar").Should().BeTrue();
-		fileSystem.Directory.Exists("bar/foo").Should().BeTrue();
+		await That(fileSystem).Should().HaveDirectory("bar");
+		await That(fileSystem).Should().HaveDirectory("bar/foo");
 	}
 
 	private sealed class DummyZipArchiveEntry(
@@ -46,17 +46,14 @@ private sealed class DummyZipArchiveEntry(
 		Stream? stream = null)
 		: IZipArchiveEntry
 	{
-		/// <inheritdoc cref="IZipArchiveEntry.Comment" />
-		public string Comment { get; set; } = comment;
-
-		/// <inheritdoc cref="IZipArchiveEntry.IsEncrypted" />
-		public bool IsEncrypted { get; } = isEncrypted;
-
 		#region IZipArchiveEntry Members
 
 		/// <inheritdoc cref="IZipArchiveEntry.Archive" />
 		public IZipArchive Archive => archive ?? throw new NotSupportedException();
 
+		/// <inheritdoc cref="IZipArchiveEntry.Comment" />
+		public string Comment { get; set; } = comment;
+
 		/// <inheritdoc cref="IZipArchiveEntry.CompressedLength" />
 		public long CompressedLength => stream?.Length ?? 0L;
 
@@ -72,6 +69,9 @@ private sealed class DummyZipArchiveEntry(
 		/// <inheritdoc cref="IZipArchiveEntry.FullName" />
 		public string FullName { get; } = fullName ?? "";
 
+		/// <inheritdoc cref="IZipArchiveEntry.IsEncrypted" />
+		public bool IsEncrypted { get; } = isEncrypted;
+
 		/// <inheritdoc cref="IZipArchiveEntry.LastWriteTime" />
 		public DateTimeOffset LastWriteTime { get; set; }
 

Tests/Testably.Abstractions.Compression.Tests/TestHelpers/Usings.cs

@@ -1,7 +1,11 @@
 global using AutoFixture.Xunit2;
 global using FluentAssertions;
 global using System;
+global using System.Threading.Tasks;
 global using System.IO.Abstractions;
 global using Testably.Abstractions.TestHelpers;
 global using Testably.Abstractions.Testing;
 global using Xunit;
+global using aweXpect;
+global using aweXpect.Testably;
+global using static aweXpect.Expect;