refactor: use aweXpect

Directory.Packages.props

@@ -22,6 +22,7 @@
 	<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="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

@@ -24,8 +24,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="aweXpect" />
 		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="FluentAssertions" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="Xunit.SkippableFact" />
 		<PackageReference Include="xunit" />

Tests/Helpers/Testably.Abstractions.TestHelpers/Testably.Abstractions.TestHelpers.csproj

@@ -19,8 +19,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="FluentAssertions" />
 		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
 		<PackageReference Remove="Microsoft.NET.Test.Sdk" />
 		<PackageReference Remove="xunit" />
 		<PackageReference Remove="xunit.runner.visualstudio" />

Tests/Helpers/Testably.Abstractions.Tests.SourceGenerator/ClassGenerators/FileSystemClassGenerator.cs

@@ -91,12 +91,12 @@ public RealFileSystemTests(ITestOutputHelper testOutputHelper, TestSettingsFixtu
 #if DEBUG
 			if (fixture.RealFileSystemTests != TestSettingStatus.AlwaysEnabled)
 			{{
-				throw new SkipException($""Tests against the real file system are {{fixture.RealFileSystemTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.RealFileSystemTests."");
+				throw new Xunit.SkipException($""Tests against the real file system are {{fixture.RealFileSystemTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.RealFileSystemTests."");
 			}}
 #else
 			if (fixture.RealFileSystemTests == TestSettingStatus.AlwaysDisabled)
 			{{
-				throw new SkipException($""Tests against the real file system are {{fixture.RealFileSystemTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.RealFileSystemTests."");
+				throw new Xunit.SkipException($""Tests against the real file system are {{fixture.RealFileSystemTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.RealFileSystemTests."");
 			}}
 #endif
 			_fixture = fixture;
@@ -111,24 +111,24 @@ public void Dispose()
 #if DEBUG
 		/// <inheritdoc cref=""{@class.Name}{{TFileSystem}}.SkipIfBrittleTestsShouldBeSkipped(bool)"" />
 		public override void SkipIfBrittleTestsShouldBeSkipped(bool condition = true)
-			=> Skip.If(condition && _fixture.BrittleTests != TestSettingStatus.AlwaysEnabled,
+			=> Xunit.Skip.If(condition && _fixture.BrittleTests != TestSettingStatus.AlwaysEnabled,
 				$""Brittle tests are {{_fixture.BrittleTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.BrittleTests."");
 #else
 		/// <inheritdoc cref=""{@class.Name}{{TFileSystem}}.SkipIfBrittleTestsShouldBeSkipped(bool)"" />
 		public override void SkipIfBrittleTestsShouldBeSkipped(bool condition = true)
-			=> Skip.If(condition && _fixture.BrittleTests == TestSettingStatus.AlwaysDisabled,
+			=> Xunit.Skip.If(condition && _fixture.BrittleTests == TestSettingStatus.AlwaysDisabled,
 				$""Brittle tests are {{_fixture.BrittleTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.BrittleTests."");
 #endif
 
 #if DEBUG
 		/// <inheritdoc cref=""{@class.Name}{{TFileSystem}}.LongRunningTestsShouldBeSkipped()"" />
 		public override void SkipIfLongRunningTestsShouldBeSkipped()
-			=> Skip.If(_fixture.LongRunningTests != TestSettingStatus.AlwaysEnabled,
+			=> Xunit.Skip.If(_fixture.LongRunningTests != TestSettingStatus.AlwaysEnabled,
 				$""Long-running tests are {{_fixture.LongRunningTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.LongRunningTests."");
 #else
 		/// <inheritdoc cref=""{@class.Name}{{TFileSystem}}.LongRunningTestsShouldBeSkipped()"" />
 		public override void SkipIfLongRunningTestsShouldBeSkipped()
-			=> Skip.If(_fixture.LongRunningTests == TestSettingStatus.AlwaysDisabled,
+			=> Xunit.Skip.If(_fixture.LongRunningTests == TestSettingStatus.AlwaysDisabled,
 				$""Long-running tests are {{_fixture.LongRunningTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.LongRunningTests."");
 #endif
 	}}

Tests/Helpers/Testably.Abstractions.Tests.SourceGenerator/ClassGenerators/TimeSystemClassGenerator.cs

@@ -58,12 +58,12 @@ public RealTimeSystemTests(TestSettingsFixture fixture) : base(new RealTimeSyste
 #if DEBUG
 		/// <inheritdoc cref=""{@class.Name}{{TTimeSystem}}.SkipIfBrittleTestsShouldBeSkipped(bool)"" />
 		public override void SkipIfBrittleTestsShouldBeSkipped(bool condition = true)
-			=> Skip.If(condition && _fixture.BrittleTests != TestSettingStatus.AlwaysEnabled,
+			=> Xunit.Skip.If(condition && _fixture.BrittleTests != TestSettingStatus.AlwaysEnabled,
 				$""Brittle tests are {{_fixture.BrittleTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.BrittleTests."");
 #else
 		/// <inheritdoc cref=""{@class.Name}{{TTimeSystem}}.SkipIfBrittleTestsShouldBeSkipped(bool)"" />
 		public override void SkipIfBrittleTestsShouldBeSkipped(bool condition = true)
-			=> Skip.If(condition && _fixture.BrittleTests == TestSettingStatus.AlwaysDisabled,
+			=> Xunit.Skip.If(condition && _fixture.BrittleTests == TestSettingStatus.AlwaysDisabled,
 				$""Brittle tests are {{_fixture.BrittleTests}}. You can enable them by executing the corresponding tests in Testably.Abstractions.TestSettings.BrittleTests."");
 #endif
 	}}

Tests/Testably.Abstractions.AccessControl.Tests/AccessControlHelperTests.cs

@@ -1,4 +1,6 @@
-using System.IO;
+using aweXpect;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace Testably.Abstractions.AccessControl.Tests;
 
@@ -8,41 +10,26 @@ public abstract partial class AccessControlHelperTests<TFileSystem>
 	where TFileSystem : IFileSystem
 {
 	[SkippableFact]
-	public void GetExtensibilityOrThrow_DirectoryInfo_ShouldNotThrow()
+	public async Task GetExtensibilityOrThrow_DirectoryInfo_ShouldNotThrow()
 	{
 		IDirectoryInfo sut = FileSystem.DirectoryInfo.New("foo");
 
-		Exception? exception = Record.Exception(() =>
-		{
-			sut.GetExtensibilityOrThrow();
-		});
-
-		exception.Should().BeNull();
+		await That(() => sut.GetExtensibilityOrThrow()).Should().NotThrow();
 	}
 
 	[SkippableFact]
-	public void GetExtensibilityOrThrow_FileInfo_ShouldNotThrow()
+	public async Task GetExtensibilityOrThrow_FileInfo_ShouldNotThrow()
 	{
 		IFileInfo sut = FileSystem.FileInfo.New("foo");
 
-		Exception? exception = Record.Exception(() =>
-		{
-			sut.GetExtensibilityOrThrow();
-		});
-
-		exception.Should().BeNull();
+		await That(() => sut.GetExtensibilityOrThrow()).Should().NotThrow();
 	}
 
 	[SkippableFact]
-	public void GetExtensibilityOrThrow_FileSystemStream_ShouldNotThrow()
+	public async Task GetExtensibilityOrThrow_FileSystemStream_ShouldNotThrow()
 	{
 		FileSystemStream sut = FileSystem.FileStream.New("foo", FileMode.Create);
 
-		Exception? exception = Record.Exception(() =>
-		{
-			sut.GetExtensibilityOrThrow();
-		});
-
-		exception.Should().BeNull();
+		await That(() => sut.GetExtensibilityOrThrow()).Should().NotThrow();
 	}
 }

Tests/Testably.Abstractions.AccessControl.Tests/DirectoryAclExtensionsTests.cs

@@ -1,6 +1,8 @@
+using aweXpect;
 using System.Security.AccessControl;
 using System.Threading.Tasks;
 using Testably.Abstractions.AccessControl.Tests.TestHelpers;
+using Skip = Xunit.Skip;
 
 namespace Testably.Abstractions.AccessControl.Tests;
 
@@ -10,25 +12,23 @@ public abstract partial class DirectoryAclExtensionsTests<TFileSystem>
 	where TFileSystem : IFileSystem
 {
 	[SkippableFact]
-	public void CreateDirectory_NullDirectorySecurity_ShouldThrowArgumentNullException()
+	public async Task CreateDirectory_NullDirectorySecurity_ShouldThrowArgumentNullException()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 
 		#pragma warning disable CA1416
-		Exception? exception = Record.Exception(() =>
-		{
+		void Act() =>
 			FileSystem.Directory.CreateDirectory("foo", null!);
-		});
 		#pragma warning restore CA1416
 
-		exception.Should().BeOfType<ArgumentNullException>()
-			.Which.ParamName.Should().Be("directorySecurity");
+		await That(Act).Should().Throw<ArgumentNullException>()
+			.WithParamName("directorySecurity");
 	}
 
 	[SkippableTheory]
 	[InlineData("bar")]
 	[InlineData("bar\\foo")]
-	public void CreateDirectory_ShouldChangeAccessControl(string path)
+	public async Task CreateDirectory_ShouldChangeAccessControl(string path)
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 
@@ -39,12 +39,12 @@ public void CreateDirectory_ShouldChangeAccessControl(string path)
 		DirectorySecurity result = FileSystem.Directory.GetAccessControl(path);
 		#pragma warning restore CA1416
 
-		result.HasSameAccessRightsAs(directorySecurity).Should().BeTrue();
-		FileSystem.Directory.Exists(path).Should().BeTrue();
+		await That(result.HasSameAccessRightsAs(directorySecurity)).Should().BeTrue();
+		await That(FileSystem.Directory.Exists(path)).Should().BeTrue();
 	}
 
 	[SkippableFact]
-	public void GetAccessControl_ShouldBeInitializedWithNotNullValue()
+	public async Task GetAccessControl_ShouldBeInitializedWithNotNullValue()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 
@@ -53,13 +53,13 @@ public void GetAccessControl_ShouldBeInitializedWithNotNullValue()
 		#pragma warning disable CA1416
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo");
-		#pragma warning restore CA1416
 
-		result.Should().NotBeNull();
+		await That(result).Should().NotBeNull();
+		#pragma warning restore CA1416
 	}
 
 	[SkippableFact]
-	public void GetAccessControl_ShouldReturnSetResult()
+	public async Task GetAccessControl_ShouldReturnSetResult()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 		Skip.If(FileSystem is RealFileSystem);
@@ -74,13 +74,13 @@ public void GetAccessControl_ShouldReturnSetResult()
 
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo");
-		#pragma warning restore CA1416
 
-		result.Should().Be(originalResult);
+		await That(result).Should().Be(originalResult);
+		#pragma warning restore CA1416
 	}
 
 	[SkippableFact]
-	public void GetAccessControl_WithAccessControlSections_ShouldBeInitializedWithNotNullValue()
+	public async Task GetAccessControl_WithAccessControlSections_ShouldBeInitializedWithNotNullValue()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 		SkipIfLongRunningTestsShouldBeSkipped();
@@ -90,13 +90,13 @@ public void GetAccessControl_WithAccessControlSections_ShouldBeInitializedWithNo
 		#pragma warning disable CA1416
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo", AccessControlSections.None);
-		#pragma warning restore CA1416
 
-		result.Should().NotBeNull();
+		await That(result).Should().NotBeNull();
+		#pragma warning restore CA1416
 	}
 
 	[SkippableFact]
-	public void GetAccessControl_WithAccessControlSections_ShouldReturnSetResult()
+	public async Task GetAccessControl_WithAccessControlSections_ShouldReturnSetResult()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 		Skip.If(FileSystem is RealFileSystem);
@@ -111,13 +111,13 @@ public void GetAccessControl_WithAccessControlSections_ShouldReturnSetResult()
 
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo", AccessControlSections.None);
-		#pragma warning restore CA1416
 
-		result.Should().Be(originalResult);
+		await That(result).Should().Be(originalResult);
+		#pragma warning restore CA1416
 	}
 
 	[SkippableFact]
-	public void SetAccessControl_ShouldChangeAccessControl()
+	public async Task SetAccessControl_ShouldChangeAccessControl()
 	{
 		Skip.IfNot(Test.RunsOnWindows);
 
@@ -131,7 +131,7 @@ public void SetAccessControl_ShouldChangeAccessControl()
 				AccessControlSections.Access);
 		#pragma warning restore CA1416
 
-		currentAccessControl.HasSameAccessRightsAs(originalAccessControl)
+		await That(currentAccessControl.HasSameAccessRightsAs(originalAccessControl))
 			.Should().BeTrue();
 	}
 
@@ -154,8 +154,8 @@ public async Task SetAccessControl_ShouldNotUpdateTimes()
 		DateTime lastAccessTimeUtc = FileSystem.File.GetLastAccessTimeUtc("foo.txt");
 		DateTime lastWriteTimeUtc = FileSystem.File.GetLastWriteTimeUtc("foo.txt");
 
-		creationTimeUtc.Should().Be(previousCreationTimeUtc);
-		lastAccessTimeUtc.Should().Be(previousLastAccessTimeUtc);
-		lastWriteTimeUtc.Should().Be(previousLastWriteTimeUtc);
+		await That(creationTimeUtc).Should().Be(previousCreationTimeUtc);
+		await That(lastAccessTimeUtc).Should().Be(previousLastAccessTimeUtc);
+		await That(lastWriteTimeUtc).Should().Be(previousLastWriteTimeUtc);
 	}
 }