Skip to content

Commit c202893

Browse files
vbreussvbreuss
authored
refactor: use aweXpect in testinghelper tests (#1235)
Use [aweXpect](https://awexpect.com) in `TestableIO.System.IO.Abstractions.TestingHelpers.Tests`.
1 parent 606a486 commit c202893

File tree

57 files changed

+2079
-2067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2079
-2067
lines changed

‎tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryArgumentPathTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ private static IEnumerable<Action<IDirectory>> GetFileSystemActionsForArgumentNu
2929
}
3030

3131
[TestCaseSource(nameof(GetFileSystemActionsForArgumentNullException))]
32-
public void Operations_ShouldThrowArgumentNullExceptionIfPathIsNull(Action<IDirectory> action)
32+
public async Task Operations_ShouldThrowArgumentNullExceptionIfPathIsNull(Action<IDirectory> action)
3333
{
3434
// Arrange
3535
var fileSystem = new MockFileSystem();
3636

3737
// Act
38-
TestDelegate wrapped = () => action(fileSystem.Directory);
38+
Action wrapped = () => action(fileSystem.Directory);
3939

4040
// Assert
41-
var exception = Assert.Throws<ArgumentNullException>(wrapped);
42-
Assert.That(exception.ParamName, Is.EqualTo("path"));
41+
var exception = await That(wrapped).Throws<ArgumentNullException>();
42+
await That(exception.ParamName).IsEqualTo("path");
4343
}
4444
}
4545
}

‎tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryGetAccessControlTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ public class MockDirectoryGetAccessControlTests
1313
{
1414
[TestCase(" ")]
1515
[TestCase(" ")]
16-
public void MockDirectory_GetAccessControl_ShouldThrowArgumentExceptionIfPathContainsOnlyWhitespaces(string path)
16+
public async Task MockDirectory_GetAccessControl_ShouldThrowArgumentExceptionIfPathContainsOnlyWhitespaces(string path)
1717
{
1818
// Arrange
1919
var fileSystem = new MockFileSystem();
2020

2121
// Act
22-
TestDelegate action = () => fileSystem.Directory.GetAccessControl(path);
22+
Action action = () => fileSystem.Directory.GetAccessControl(path);
2323

2424
// Assert
25-
var exception = Assert.Throws<ArgumentException>(action);
26-
Assert.That(exception.ParamName, Is.EqualTo("path"));
25+
var exception = await That(action).Throws<ArgumentException>();
26+
await That(exception.ParamName).IsEqualTo("path");
2727
}
2828

2929
[Test]
30-
public void MockDirectory_GetAccessControl_ShouldThrowDirectoryNotFoundExceptionIfDirectoryDoesNotExistInMockData()
30+
public async Task MockDirectory_GetAccessControl_ShouldThrowDirectoryNotFoundExceptionIfDirectoryDoesNotExistInMockData()
3131
{
3232
// Arrange
3333
var fileSystem = new MockFileSystem();
3434
var expectedDirectoryName = XFS.Path(@"c:\a");
3535

3636
// Act
37-
TestDelegate action = () => fileSystem.Directory.GetAccessControl(expectedDirectoryName);
37+
Action action = () => fileSystem.Directory.GetAccessControl(expectedDirectoryName);
3838

3939
// Assert
40-
Assert.Throws<DirectoryNotFoundException>(action);
40+
await That(action).Throws<DirectoryNotFoundException>();
4141
}
4242

4343
[Test]
44-
public void MockDirectory_GetAccessControl_ShouldReturnAccessControlOfDirectoryData()
44+
public async Task MockDirectory_GetAccessControl_ShouldReturnAccessControlOfDirectoryData()
4545
{
4646
// Arrange
4747
var expectedDirectorySecurity = new DirectorySecurity();
@@ -62,7 +62,7 @@ public void MockDirectory_GetAccessControl_ShouldReturnAccessControlOfDirectoryD
6262
var directorySecurity = fileSystem.Directory.GetAccessControl(filePath);
6363

6464
// Assert
65-
Assert.That(directorySecurity, Is.EqualTo(expectedDirectorySecurity));
65+
await That(directorySecurity).IsEqualTo(expectedDirectorySecurity);
6666
}
6767
}
6868
}

‎tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoAccessControlTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace System.IO.Abstractions.TestingHelpers.Tests
1212
public class MockDirectoryInfoAccessControlTests
1313
{
1414
[Test]
15-
public void MockDirectoryInfo_GetAccessControl_ShouldReturnAccessControlOfDirectoryData()
15+
public async Task MockDirectoryInfo_GetAccessControl_ShouldReturnAccessControlOfDirectoryData()
1616
{
1717
// Arrange
1818
var expectedDirectorySecurity = new DirectorySecurity();
@@ -35,11 +35,11 @@ public void MockDirectoryInfo_GetAccessControl_ShouldReturnAccessControlOfDirect
3535
var directorySecurity = directorInfo.GetAccessControl();
3636

3737
// Assert
38-
Assert.That(directorySecurity, Is.EqualTo(expectedDirectorySecurity));
38+
await That(directorySecurity).IsEqualTo(expectedDirectorySecurity);
3939
}
4040

4141
[Test]
42-
public void MockDirectoryInfo_SetAccessControl_ShouldSetAccessControlOfDirectoryData()
42+
public async Task MockDirectoryInfo_SetAccessControl_ShouldSetAccessControlOfDirectoryData()
4343
{
4444
// Arrange
4545
var filePath = XFS.Path(@"c:\a\");
@@ -59,7 +59,7 @@ public void MockDirectoryInfo_SetAccessControl_ShouldSetAccessControlOfDirectory
5959

6060
// Assert
6161
var accessControl = directorInfo.GetAccessControl();
62-
Assert.That(accessControl, Is.EqualTo(expectedAccessControl));
62+
await That(accessControl).IsEqualTo(expectedAccessControl);
6363
}
6464
}
6565
}

‎tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoFactoryTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ namespace System.IO.Abstractions.TestingHelpers.Tests
66
public class MockDirectoryInfoFactoryTests
77
{
88
[Test]
9-
public void MockDirectoryInfoFactory_Wrap_WithNull_ShouldReturnNull()
9+
public async Task MockDirectoryInfoFactory_Wrap_WithNull_ShouldReturnNull()
1010
{
1111
var fileSystem = new MockFileSystem();
1212

1313
var result = fileSystem.DirectoryInfo.Wrap(null);
1414

15-
Assert.That(result, Is.Null);
15+
await That(result).IsNull();
1616
}
1717

1818
[Test]
19-
public void MockDirectoryInfoFactory_Wrap_ShouldKeepNameAndFullName()
19+
public async Task MockDirectoryInfoFactory_Wrap_ShouldKeepNameAndFullName()
2020
{
2121
var fs = new MockFileSystem();
2222
var directoryInfo = new DirectoryInfo(@"C:\subfolder\file");
2323
var wrappedDirectoryInfo = fs.DirectoryInfo.Wrap(directoryInfo);
2424

25-
Assert.That(wrappedDirectoryInfo.FullName, Is.EqualTo(directoryInfo.FullName));
26-
Assert.That(wrappedDirectoryInfo.Name, Is.EqualTo(directoryInfo.Name));
25+
await That(wrappedDirectoryInfo.FullName).IsEqualTo(directoryInfo.FullName);
26+
await That(wrappedDirectoryInfo.Name).IsEqualTo(directoryInfo.Name);
2727
}
2828
}
2929
}

‎tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoSymlinkTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ public class MockDirectoryInfoSymlinkTests
1515
#if FEATURE_CREATE_SYMBOLIC_LINK
1616

1717
[Test]
18-
public void MockDirectoryInfo_ResolveLinkTarget_ShouldReturnPathOfTargetLink()
18+
public async Task MockDirectoryInfo_ResolveLinkTarget_ShouldReturnPathOfTargetLink()
1919
{
2020
var fileSystem = new MockFileSystem();
2121
fileSystem.Directory.CreateDirectory("bar");
2222
fileSystem.Directory.CreateSymbolicLink("foo", "bar");
2323

2424
var result = fileSystem.DirectoryInfo.New("foo").ResolveLinkTarget(false);
2525

26-
Assert.That(result.Name, Is.EqualTo("bar"));
26+
await That(result.Name).IsEqualTo("bar");
2727
}
2828

2929
[Test]
30-
public void MockDirectoryInfo_ResolveLinkTarget_WithFinalTarget_ShouldReturnPathOfTargetLink()
30+
public async Task MockDirectoryInfo_ResolveLinkTarget_WithFinalTarget_ShouldReturnPathOfTargetLink()
3131
{
3232
var fileSystem = new MockFileSystem();
3333
fileSystem.Directory.CreateDirectory("bar");
@@ -36,11 +36,11 @@ public void MockDirectoryInfo_ResolveLinkTarget_WithFinalTarget_ShouldReturnPath
3636

3737
var result = fileSystem.DirectoryInfo.New("foo1").ResolveLinkTarget(true);
3838

39-
Assert.That(result.Name, Is.EqualTo("bar"));
39+
await That(result.Name).IsEqualTo("bar");
4040
}
4141

4242
[Test]
43-
public void MockDirectoryInfo_ResolveLinkTarget_WithoutFinalTarget_ShouldReturnFirstLink()
43+
public async Task MockDirectoryInfo_ResolveLinkTarget_WithoutFinalTarget_ShouldReturnFirstLink()
4444
{
4545
var fileSystem = new MockFileSystem();
4646
fileSystem.Directory.CreateDirectory("bar");
@@ -49,20 +49,20 @@ public void MockDirectoryInfo_ResolveLinkTarget_WithoutFinalTarget_ShouldReturnF
4949

5050
var result = fileSystem.DirectoryInfo.New("foo1").ResolveLinkTarget(false);
5151

52-
Assert.That(result.Name, Is.EqualTo("foo"));
52+
await That(result.Name).IsEqualTo("foo");
5353
}
5454

5555
[Test]
56-
public void MockDirectoryInfo_ResolveLinkTarget_WithoutTargetLink_ShouldThrowIOException()
56+
public async Task MockDirectoryInfo_ResolveLinkTarget_WithoutTargetLink_ShouldThrowIOException()
5757
{
5858
var fileSystem = new MockFileSystem();
5959
fileSystem.Directory.CreateDirectory("bar");
6060
fileSystem.Directory.CreateSymbolicLink("foo", "bar");
6161

62-
Assert.Throws<IOException>(() =>
62+
await That(() =>
6363
{
6464
fileSystem.DirectoryInfo.New("bar").ResolveLinkTarget(false);
65-
});
65+
}).Throws<IOException>();
6666
}
6767
#endif
6868
}

0 commit comments

Comments
 (0)