refactor: use aweXpect in wrapper tests (#1234)

vbreuss · web-flow · commit 606a486bce9f · 2025-03-01T14:29:06.000Z
Use [aweXpect](https://awexpect.com) in `TestableIO.System.IO.Abstractions.Wrappers.Tests`
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -20,6 +20,7 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageVersion Include="PublicApiGenerator" Version="11.4.2"/>
     <PackageVersion Include="aweXpect" Version="1.6.0"/>
+    <PackageVersion Include="aweXpect.Testably" Version="0.7.0"/>
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Nuke.Common" Version="9.0.4"/>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -24,6 +24,8 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="NUnit3TestAdapter" />
+        <PackageReference Include="aweXpect"/>
+        <PackageReference Include="aweXpect.Testably"/>
     </ItemGroup>
 
     <PropertyGroup>
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/ApiAcceptance.cs b/tests/TestableIO.System.IO.Abstractions.Api.Tests/ApiAcceptance.cs
@@ -1,6 +1,4 @@
-﻿using aweXpect;
-
-namespace TestableIO.System.IO.Abstractions.Api.Tests;
+﻿namespace TestableIO.System.IO.Abstractions.Api.Tests;
 
 public sealed class ApiAcceptance
 {
@@ -27,6 +25,6 @@ public async Task AcceptApiChanges()
 			}
 		}
 
-        await Expect.That(assemblyNames).IsNotEmpty();
+        await That(assemblyNames).IsNotEmpty();
 	}
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/ApiApprovalTests.cs b/tests/TestableIO.System.IO.Abstractions.Api.Tests/ApiApprovalTests.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using aweXpect;
 
 namespace TestableIO.System.IO.Abstractions.Api.Tests;
 
@@ -18,7 +17,7 @@ public async Task VerifyPublicApiForWrappers(string framework)
         var publicApi = Helper.CreatePublicApi(framework, assemblyName);
         var expectedApi = Helper.GetExpectedApi(framework, assemblyName);
 
-        await Expect.That(publicApi).IsEqualTo(expectedApi);
+        await That(publicApi).IsEqualTo(expectedApi);
     }
 
     [TestCaseSource(nameof(TargetFrameworksTheoryData))]
@@ -29,7 +28,7 @@ public async Task VerifyPublicApiForTestingHelpers(string framework)
         var publicApi = Helper.CreatePublicApi(framework, assemblyName);
         var expectedApi = Helper.GetExpectedApi(framework, assemblyName);
 
-        await Expect.That(publicApi).IsEqualTo(expectedApi);
+        await That(publicApi).IsEqualTo(expectedApi);
     }
 
     private static IEnumerable<string> TargetFrameworksTheoryData()
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/TestableIO.System.IO.Abstractions.Api.Tests.csproj b/tests/TestableIO.System.IO.Abstractions.Api.Tests/TestableIO.System.IO.Abstractions.Api.Tests.csproj
@@ -11,7 +11,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="PublicApiGenerator"/>
-		<PackageReference Include="aweXpect"/>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/tests/TestableIO.System.IO.Abstractions.Api.Tests/Usings.cs b/tests/TestableIO.System.IO.Abstractions.Api.Tests/Usings.cs
@@ -1,3 +1,5 @@
 ﻿global using System;
 global using System.Threading.Tasks;
 global using NUnit.Framework;
+global using aweXpect;
+global using static aweXpect.Expect;
diff --git a/tests/TestableIO.System.IO.Abstractions.Parity.Tests/ApiParityTests.cs b/tests/TestableIO.System.IO.Abstractions.Parity.Tests/ApiParityTests.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using aweXpect;
+using static aweXpect.Expect;
 using NUnit.Framework;
 using static System.Reflection.BindingFlags;
 
@@ -14,57 +15,57 @@ public class ApiParityTests
         [Test]
         public async Task File() =>
             await AssertParity(
-                typeof(System.IO.File),
-                typeof(System.IO.Abstractions.FileBase)
+                typeof(File),
+                typeof(FileBase)
             );
 
         [Test]
         public async Task FileInfo() =>
             await AssertParity(
-                typeof(System.IO.FileInfo),
-                typeof(System.IO.Abstractions.FileInfoBase)
+                typeof(FileInfo),
+                typeof(FileInfoBase)
             );
 
         [Test]
         public async Task FileVersionInfo() =>
             await AssertParity(
-                typeof(System.Diagnostics.FileVersionInfo),
-                typeof(System.IO.Abstractions.FileVersionInfoBase)
+                typeof(Diagnostics.FileVersionInfo),
+                typeof(FileVersionInfoBase)
             );
 
         [Test]
         public async Task Directory() =>
             await AssertParity(
-                typeof(System.IO.Directory),
-                typeof(System.IO.Abstractions.DirectoryBase)
+                typeof(Directory),
+                typeof(DirectoryBase)
             );
 
         [Test]
         public async Task DirectoryInfo() =>
             await AssertParity(
-                typeof(System.IO.DirectoryInfo),
-                typeof(System.IO.Abstractions.DirectoryInfoBase)
+                typeof(DirectoryInfo),
+                typeof(DirectoryInfoBase)
             );
 
         [Test]
         public async Task DriveInfo() =>
             await AssertParity(
-                typeof(System.IO.DriveInfo),
-                typeof(System.IO.Abstractions.DriveInfoBase)
+                typeof(DriveInfo),
+                typeof(DriveInfoBase)
             );
 
         [Test]
         public async Task Path() =>
             await AssertParity(
-                typeof(System.IO.Path),
-                typeof(System.IO.Abstractions.PathBase)
+                typeof(Path),
+                typeof(PathBase)
             );
 
         [Test]
         public async Task FileSystemWatcher() =>
             await AssertParity(
-                typeof(System.IO.FileSystemWatcher),
-                typeof(System.IO.Abstractions.FileSystemWatcherBase)
+                typeof(FileSystemWatcher),
+                typeof(FileSystemWatcherBase)
             );
 
         private async Task AssertParity(Type referenceType, Type abstractionType)
@@ -97,7 +98,7 @@ static IEnumerable<string> GetMembers(Type type) => type
             var fileName = $"ApiParityTests.{referenceType.Name}_{snapshotSuffix}.snap";
             var fileContent = IO.File.ReadAllText(IO.Path.Combine(snapshotPath, fileName));
 
-            await Expect.That(fileContent).IsEqualTo(serializedDiff)
+            await That(fileContent).IsEqualTo(serializedDiff)
                 .IgnoringNewlineStyle()
                 .IgnoringTrailingWhiteSpace();
         }
diff --git a/tests/TestableIO.System.IO.Abstractions.Parity.Tests/TestableIO.System.IO.Abstractions.Parity.Tests.csproj b/tests/TestableIO.System.IO.Abstractions.Parity.Tests/TestableIO.System.IO.Abstractions.Parity.Tests.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="aweXpect"/>
     <PackageReference Include="System.Text.Json"/>
   </ItemGroup>
   
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryInfoFactoryTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryInfoFactoryTests.cs
@@ -1,18 +1,16 @@
-﻿using NUnit.Framework;
-
-namespace System.IO.Abstractions.Tests
+﻿namespace System.IO.Abstractions.Tests
 {
     [TestFixture]
     public class DirectoryInfoFactoryTests
     {
         [Test]
-        public void Wrap_WithNull_ShouldReturnNull()
+        public async Task Wrap_WithNull_ShouldReturnNull()
         {
             var fileSystem = new FileSystem();
 
             var result = fileSystem.DirectoryInfo.Wrap(null);
-            
-            Assert.That(result, Is.Null);
+
+            await That(result).IsNull();
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryInfoTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryInfoTests.cs
@@ -1,19 +1,18 @@
-﻿using NUnit.Framework;
-
-namespace System.IO.Abstractions.Tests
+﻿namespace System.IO.Abstractions.Tests
 {
     [TestFixture]
     public class DirectoryInfoTests
     {
         [Test]
-        public void Parent_ForRootDirectory_ShouldReturnNull()
+        public async Task Parent_ForRootDirectory_ShouldReturnNull()
         {
             var wrapperFilesystem = new FileSystem();
 
             var current = wrapperFilesystem.Directory.GetCurrentDirectory();
             var root = wrapperFilesystem.DirectoryInfo.New(current).Root;
             var rootsParent = root.Parent;
-            Assert.That(rootsParent, Is.Null);
+
+            await That(rootsParent).IsNull();
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryWrapperTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DirectoryWrapperTests.cs
@@ -1,12 +1,10 @@
-﻿using NUnit.Framework;
-
-namespace System.IO.Abstractions.Tests
+﻿namespace System.IO.Abstractions.Tests
 {
     [TestFixture]
     public class DirectoryWrapperTests
     {
         [Test]
-        public void GetParent_ForRootDirectory_ShouldReturnNull()
+        public async Task GetParent_ForRootDirectory_ShouldReturnNull()
         {
             // Arrange
             var wrapperFilesystem = new FileSystem();
@@ -16,11 +14,11 @@ public void GetParent_ForRootDirectory_ShouldReturnNull()
             var result = wrapperFilesystem.Directory.GetParent(root);
 
             // Assert
-            Assert.That(result, Is.Null);
+            await That(result).IsNull();
         }
 
         [Test]
-        public void GetParent_ForSimpleSubfolderPath_ShouldReturnRoot()
+        public async Task GetParent_ForSimpleSubfolderPath_ShouldReturnRoot()
         {
             // Arrange
             var wrapperFilesystem = new FileSystem();
@@ -31,11 +29,11 @@ public void GetParent_ForSimpleSubfolderPath_ShouldReturnRoot()
             var result = wrapperFilesystem.Directory.GetParent(subfolder);
 
             // Assert
-            Assert.That(result.FullName, Is.EqualTo(root));
+            await That(result.FullName).IsEqualTo(root);
         }
 
         [Test]
-        public void GetParent_ForSimpleFilePath_ShouldReturnSubfolder()
+        public async Task GetParent_ForSimpleFilePath_ShouldReturnSubfolder()
         {
             // Arrange
             var wrapperFilesystem = new FileSystem();
@@ -47,7 +45,7 @@ public void GetParent_ForSimpleFilePath_ShouldReturnSubfolder()
             var result = wrapperFilesystem.Directory.GetParent(file);
 
             // Assert
-            Assert.That(result.FullName, Is.EqualTo(subfolder));
+            await That(result.FullName).IsEqualTo(subfolder);
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DriveInfoFactoryTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/DriveInfoFactoryTests.cs
@@ -1,18 +1,16 @@
-﻿using NUnit.Framework;
-
-namespace System.IO.Abstractions.Tests
+﻿namespace System.IO.Abstractions.Tests
 {
     [TestFixture]
     public class DriveInfoFactoryTests
     {
         [Test]
-        public void Wrap_WithNull_ShouldReturnNull()
+        public async Task Wrap_WithNull_ShouldReturnNull()
         {
             var fileSystem = new FileSystem();
 
             var result = fileSystem.DriveInfo.Wrap(null);
 
-            Assert.That(result, Is.Null);
+            await That(result).IsNull();
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileInfoBaseConversionTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileInfoBaseConversionTests.cs
@@ -1,7 +1,5 @@
 ﻿namespace System.IO.Abstractions.Tests
 {
-    using NUnit.Framework;
-
     /// <summary>
     /// Unit tests for the conversion operators of the <see cref="FileInfoBase"/> class.
     /// </summary>
@@ -11,7 +9,7 @@ public class FileInfoBaseConversionTests
         /// Tests that a <c>null</c> <see cref="FileInfo"/> is correctly converted to a <c>null</c> <see cref="FileInfoBase"/> without exception.
         /// </summary>
         [Test]
-        public void FileInfoBase_FromFileInfo_ShouldReturnNullIfFileInfoIsNull()
+        public async Task FileInfoBase_FromFileInfo_ShouldReturnNullIfFileInfoIsNull()
         {
             // Arrange
             FileInfo fileInfo = null;
@@ -20,7 +18,7 @@ public void FileInfoBase_FromFileInfo_ShouldReturnNullIfFileInfoIsNull()
             FileInfoBase actual = fileInfo;
 
             // Assert
-            Assert.That(actual, Is.Null);
+            await That(actual).IsNull();
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileInfoFactoryTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileInfoFactoryTests.cs
@@ -1,18 +1,16 @@
-﻿using NUnit.Framework;
-
-namespace System.IO.Abstractions.Tests
+﻿namespace System.IO.Abstractions.Tests
 {
     [TestFixture]
     public class FileInfoFactoryTests
     {
         [Test]
-        public void Wrap_WithNull_ShouldReturnNull()
+        public async Task Wrap_WithNull_ShouldReturnNull()
         {
             var fileSystem = new FileSystem();
 
             var result = fileSystem.FileInfo.Wrap(null);
             
-            Assert.That(result, Is.Null);
+            await That(result).IsNull();
         }
     }
 }
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemWatcherFactoryTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemWatcherFactoryTests.cs
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileVersionInfoBaseConversionTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileVersionInfoBaseConversionTests.cs
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/Usings.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/Usings.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using aweXpect;`
`2`		`-`
`3`		`-namespace TestableIO.System.IO.Abstractions.Api.Tests;`
	`1`	`+namespace TestableIO.System.IO.Abstractions.Api.Tests;`
`4`	`2`
`5`	`3`	`public sealed class ApiAcceptance`
`6`	`4`	`{`
`@@ -27,6 +25,6 @@ public async Task AcceptApiChanges()`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`
`30`		`- await Expect.That(assemblyNames).IsNotEmpty();`
	`28`	`+ await That(assemblyNames).IsNotEmpty();`
`31`	`29`	`}`
`32`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,16 @@`
`1`		`-using NUnit.Framework;`
`2`		`-`
`3`		`-namespace System.IO.Abstractions.Tests`
	`1`	`+namespace System.IO.Abstractions.Tests`
`4`	`2`	`{`
`5`	`3`	`[TestFixture]`
`6`	`4`	`public class DirectoryInfoFactoryTests`
`7`	`5`	`{`
`8`	`6`	`[Test]`
`9`		`- public void Wrap_WithNull_ShouldReturnNull()`
	`7`	`+ public async Task Wrap_WithNull_ShouldReturnNull()`
`10`	`8`	`{`
`11`	`9`	`var fileSystem = new FileSystem();`
`12`	`10`
`13`	`11`	`var result = fileSystem.DirectoryInfo.Wrap(null);`
`14`		`-`
`15`		`- Assert.That(result, Is.Null);`
	`12`	`+`
	`13`	`+ await That(result).IsNull();`
`16`	`14`	`}`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,18 @@`
`1`		`-using NUnit.Framework;`
`2`		`-`
`3`		`-namespace System.IO.Abstractions.Tests`
	`1`	`+namespace System.IO.Abstractions.Tests`
`4`	`2`	`{`
`5`	`3`	`[TestFixture]`
`6`	`4`	`public class DirectoryInfoTests`
`7`	`5`	`{`
`8`	`6`	`[Test]`
`9`		`- public void Parent_ForRootDirectory_ShouldReturnNull()`
	`7`	`+ public async Task Parent_ForRootDirectory_ShouldReturnNull()`
`10`	`8`	`{`
`11`	`9`	`var wrapperFilesystem = new FileSystem();`
`12`	`10`
`13`	`11`	`var current = wrapperFilesystem.Directory.GetCurrentDirectory();`
`14`	`12`	`var root = wrapperFilesystem.DirectoryInfo.New(current).Root;`
`15`	`13`	`var rootsParent = root.Parent;`
`16`		`- Assert.That(rootsParent, Is.Null);`
	`14`	`+`
	`15`	`+ await That(rootsParent).IsNull();`
`17`	`16`	`}`
`18`	`17`	`}`
`19`	`18`	`}`