Skip to content

Commit 6dceee2

Browse files
authored
refactor: Convert Classic Assert to Constraint Model (#1065)
Convert NUnit asserts to the constraint model, to simplify the [migration to NUnit v4](https://docs.nunit.org/articles/nunit/release-notes/Nunit4.0-MigrationGuide.html).
1 parent 81f4082 commit 6dceee2

File tree

53 files changed

+470
-513
lines changed

Some content is hidden

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

53 files changed

+470
-513
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void MyComponent_Validate_ShouldThrowNotSupportedExceptionIfTestingIsNotA
7575
catch (NotSupportedException ex)
7676
{
7777
// Assert
78-
Assert.AreEqual("We can't go on together. It's not me, it's you.", ex.Message);
78+
Assert.That(ex.Message, Is.EqualTo("We can't go on together. It's not me, it's you."));
7979
return;
8080
}
8181

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void Operations_ShouldThrowArgumentNullExceptionIfPathIsNull(Action<IDire
3939

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void MockDirectoryInfoFactory_Wrap_WithNull_ShouldReturnNull()
1212

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void MockDirectoryInfo_ResolveLinkTarget_ShouldReturnPathOfTargetLink()
2323

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

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

2929
[Test]
@@ -36,7 +36,7 @@ public void MockDirectoryInfo_ResolveLinkTarget_WithFinalTarget_ShouldReturnPath
3636

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

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

4242
[Test]
@@ -49,7 +49,7 @@ public void MockDirectoryInfo_ResolveLinkTarget_WithoutFinalTarget_ShouldReturnF
4949

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

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

5555
[Test]

tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoTests.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static IEnumerable<object[]> MockDirectoryInfo_GetExtension_Cases
1919
}
2020
}
2121

22-
[TestCaseSource("MockDirectoryInfo_GetExtension_Cases")]
22+
[TestCaseSource(nameof(MockDirectoryInfo_GetExtension_Cases))]
2323
public void MockDirectoryInfo_GetExtension_ShouldReturnEmptyString(string directoryPath)
2424
{
2525
// Arrange
@@ -30,7 +30,7 @@ public void MockDirectoryInfo_GetExtension_ShouldReturnEmptyString(string direct
3030
var result = directoryInfo.Extension;
3131

3232
// Assert
33-
Assert.AreEqual(string.Empty, result);
33+
Assert.That(result, Is.Empty);
3434
}
3535

3636
public static IEnumerable<object[]> MockDirectoryInfo_Exists_Cases
@@ -42,7 +42,7 @@ public static IEnumerable<object[]> MockDirectoryInfo_Exists_Cases
4242
}
4343
}
4444

45-
[TestCaseSource("MockDirectoryInfo_Exists_Cases")]
45+
[TestCaseSource(nameof(MockDirectoryInfo_Exists_Cases))]
4646
public void MockDirectoryInfo_Exists(string path, bool expected)
4747
{
4848
var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
@@ -106,7 +106,7 @@ public void MockDirectoryInfo_GetFiles_ShouldWorkWithUNCPath()
106106
var files = directoryInfo.GetFiles();
107107

108108
// Assert
109-
Assert.AreEqual(fileName, files[0].FullName);
109+
Assert.That(files[0].FullName, Is.EqualTo(fileName));
110110
}
111111

112112
[Test]
@@ -129,7 +129,7 @@ public void MockDirectoryInfo_GetFiles_ShouldWorkWithUNCPath_WhenCurrentDirector
129129
var files = directoryInfo.GetFiles();
130130

131131
// Assert
132-
Assert.AreEqual(fileName, files[0].FullName);
132+
Assert.That(files[0].FullName, Is.EqualTo(fileName));
133133
}
134134

135135
[Test]
@@ -263,7 +263,7 @@ public void MockDirectoryInfo_GetParent_ShouldReturnDirectoriesAndNamesWithSearc
263263
var result = directoryInfo.Parent;
264264

265265
// Assert
266-
Assert.AreEqual(XFS.Path(@"c:\a\b"), result.FullName);
266+
Assert.That(result.FullName, Is.EqualTo(XFS.Path(@"c:\a\b")));
267267
}
268268

269269
[Test]
@@ -287,7 +287,7 @@ public void MockDirectoryInfo_EnumerateFiles_ShouldReturnAllFiles()
287287
var directoryInfo = new MockDirectoryInfo(fileSystem, XFS.Path(@"c:\temp\folder"));
288288

289289
// Assert
290-
Assert.AreEqual(new[] { "b.txt", "c.txt" }, directoryInfo.EnumerateFiles().ToList().Select(x => x.Name).ToArray());
290+
Assert.That(directoryInfo.EnumerateFiles().ToList().Select(x => x.Name).ToArray(), Is.EqualTo(new[] { "b.txt", "c.txt" }));
291291
}
292292

293293
[Test]
@@ -309,7 +309,7 @@ public void MockDirectoryInfo_EnumerateDirectories_ShouldReturnAllDirectories()
309309
var directories = directoryInfo.EnumerateDirectories().Select(a => a.Name).ToArray();
310310

311311
// Assert
312-
Assert.AreEqual(new[] { "b", "c" }, directories);
312+
Assert.That(directories, Is.EqualTo(new[] { "b", "c" }));
313313
}
314314

315315
[TestCase(@"\\unc\folder", @"\\unc\folder")]
@@ -327,7 +327,7 @@ public void MockDirectoryInfo_FullName_ShouldReturnNormalizedUNCPath(string dire
327327
var actualFullName = directoryInfo.FullName;
328328

329329
// Assert
330-
Assert.AreEqual(expectedFullName, actualFullName);
330+
Assert.That(actualFullName, Is.EqualTo(expectedFullName));
331331
}
332332

333333
[TestCase(@"c:\temp\\folder", @"c:\temp\folder")]
@@ -345,7 +345,7 @@ public void MockDirectoryInfo_FullName_ShouldReturnNormalizedPath(string directo
345345
var actualFullName = directoryInfo.FullName;
346346

347347
// Assert
348-
Assert.AreEqual(expectedFullName, actualFullName);
348+
Assert.That(actualFullName, Is.EqualTo(expectedFullName));
349349
}
350350

351351
[TestCase(@"c:\temp\folder ", @"c:\temp\folder")]
@@ -360,7 +360,7 @@ public void MockDirectoryInfo_FullName_ShouldReturnPathWithTrimmedTrailingSpaces
360360
var actualFullName = directoryInfo.FullName;
361361

362362
// Assert
363-
Assert.AreEqual(expectedFullName, actualFullName);
363+
Assert.That(actualFullName, Is.EqualTo(expectedFullName));
364364
}
365365

366366
[Test]
@@ -377,7 +377,7 @@ public void MockDirectoryInfo_MoveTo_ShouldUpdateFullName()
377377
directoryInfo.MoveTo(destination);
378378

379379
// Assert
380-
Assert.AreEqual(destination, directoryInfo.FullName);
380+
Assert.That(directoryInfo.FullName, Is.EqualTo(destination));
381381
}
382382

383383
[TestCase(@"c:\temp\\folder ", @"folder")]
@@ -392,7 +392,7 @@ public void MockDirectoryInfo_Name_ShouldReturnNameWithTrimmedTrailingSpaces(str
392392
var actualName = directoryInfo.Name;
393393

394394
// Assert
395-
Assert.AreEqual(expectedName, actualName);
395+
Assert.That(actualName, Is.EqualTo(expectedName));
396396
}
397397

398398
[TestCase(@"c:\", @"c:\")]
@@ -407,7 +407,7 @@ public void MockDirectoryInfo_Name_ShouldReturnPathRoot_IfDirectoryPathIsPathRoo
407407
var actualName = directoryInfo.Name;
408408

409409
// Assert
410-
Assert.AreEqual(expectedName, actualName);
410+
Assert.That(actualName, Is.EqualTo(expectedName));
411411
}
412412

413413
[Test]
@@ -462,7 +462,7 @@ public void MockDirectoryInfo_ToString_ShouldReturnDirectoryName(string director
462462
var mockDirectoryInfo = new MockDirectoryInfo(new MockFileSystem(), directoryPath);
463463

464464
// Assert
465-
Assert.AreEqual(directoryPath, mockDirectoryInfo.ToString());
465+
Assert.That(mockDirectoryInfo.ToString(), Is.EqualTo(directoryPath));
466466
}
467467

468468
[Test]
@@ -477,7 +477,7 @@ public void MockDirectoryInfo_Exists_ShouldReturnCachedData()
477477
fileSystem.AddDirectory(path);
478478

479479
// Assert
480-
Assert.IsFalse(directoryInfo.Exists);
480+
Assert.That(directoryInfo.Exists, Is.False);
481481
}
482482

483483
[Test]
@@ -493,7 +493,7 @@ public void MockDirectoryInfo_Exists_ShouldUpdateCachedDataOnRefresh()
493493
directoryInfo.Refresh();
494494

495495
// Assert
496-
Assert.IsTrue(directoryInfo.Exists);
496+
Assert.That(directoryInfo.Exists, Is.True);
497497
}
498498

499499
[Test]
@@ -507,7 +507,7 @@ public void Directory_exists_after_creation()
507507
directoryInfo.Create();
508508

509509
// Assert
510-
Assert.IsTrue(directoryInfo.Exists);
510+
Assert.That(directoryInfo.Exists, Is.True);
511511
}
512512

513513
[Test, WindowsOnly(WindowsSpecifics.AccessControlLists)]
@@ -521,7 +521,7 @@ public void Directory_exists_after_creation_with_security()
521521
directoryInfo.Create(new DirectorySecurity());
522522

523523
// Assert
524-
Assert.IsTrue(directoryInfo.Exists);
524+
Assert.That(directoryInfo.Exists, Is.True);
525525
}
526526

527527
[Test]
@@ -535,7 +535,7 @@ public void Directory_does_not_exist_after_delete()
535535
directoryInfo.Delete();
536536

537537
// Assert
538-
Assert.IsFalse(directoryInfo.Exists);
538+
Assert.That(directoryInfo.Exists, Is.False);
539539
}
540540

541541
[Test]
@@ -549,7 +549,7 @@ public void Directory_does_not_exist_after_recursive_delete()
549549
directoryInfo.Delete(true);
550550

551551
// Assert
552-
Assert.IsFalse(directoryInfo.Exists);
552+
Assert.That(directoryInfo.Exists, Is.False);
553553
}
554554

555555
[Test]
@@ -563,7 +563,7 @@ public void Directory_still_exists_after_move()
563563
directoryInfo.MoveTo(XFS.Path(@"c:\abc2"));
564564

565565
// Assert
566-
Assert.IsTrue(directoryInfo.Exists);
566+
Assert.That(directoryInfo.Exists, Is.True);
567567
}
568568

569569
[Test]
@@ -582,7 +582,7 @@ public void MockDirectoryInfo_LastAccessTime_ShouldReflectChangedValue()
582582
directoryInfo.LastAccessTime = lastAccessTime;
583583

584584
// Assert
585-
Assert.AreEqual(lastAccessTime, directoryInfo.LastAccessTime);
585+
Assert.That(directoryInfo.LastAccessTime, Is.EqualTo(lastAccessTime));
586586
}
587587

588588
[Test]

tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectorySymlinkTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public void MockDirectory_CreateSymbolicLink_ShouldReturnFileSystemInfo()
2323
IFileSystemInfo fileSystemInfo = fileSystem.Directory.CreateSymbolicLink(path, pathToTarget);
2424

2525
// Assert
26-
Assert.AreEqual(path, fileSystemInfo.FullName);
27-
Assert.AreEqual(pathToTarget, fileSystemInfo.LinkTarget);
26+
Assert.That(fileSystemInfo.FullName, Is.EqualTo(path));
27+
Assert.That(fileSystemInfo.LinkTarget, Is.EqualTo(pathToTarget));
2828
}
2929

3030
[Test]
@@ -41,8 +41,8 @@ public void MockDirectory_CreateSymbolicLink_ShouldSucceedFromDirectoryInfo()
4141
IDirectoryInfo directoryInfo = fileSystem.DirectoryInfo.New(path);
4242

4343
// Assert
44-
Assert.AreEqual(path, directoryInfo.FullName);
45-
Assert.AreEqual(pathToTarget, directoryInfo.LinkTarget);
44+
Assert.That(directoryInfo.FullName, Is.EqualTo(path));
45+
Assert.That(directoryInfo.LinkTarget, Is.EqualTo(pathToTarget));
4646
}
4747

4848
[Test]
@@ -195,7 +195,7 @@ public void MockDirectory_CreateSymbolicLink_ShouldNotFailIfTargetDoesNotExist()
195195
var fileSystemInfo = fileSystem.Directory.CreateSymbolicLink(path, pathToTarget);
196196

197197
// Assert
198-
Assert.IsTrue(fileSystemInfo.Exists);
198+
Assert.That(fileSystemInfo.Exists, Is.True);
199199
}
200200

201201
[Test]
@@ -209,7 +209,7 @@ public void MockDirectory_CreateSymbolicLink_ShouldSetReparsePointAttribute()
209209
fileSystem.Directory.CreateSymbolicLink(path, pathToTarget);
210210

211211
var attributes = fileSystem.DirectoryInfo.New(path).Attributes;
212-
Assert.IsTrue(attributes.HasFlag(FileAttributes.ReparsePoint));
212+
Assert.That(attributes.HasFlag(FileAttributes.ReparsePoint), Is.True);
213213
}
214214

215215
[Test]
@@ -221,7 +221,7 @@ public void MockDirectory_ResolveLinkTarget_ShouldReturnPathOfTargetLink()
221221

222222
var result = fileSystem.Directory.ResolveLinkTarget("foo", false);
223223

224-
Assert.AreEqual("bar", result.Name);
224+
Assert.That(result.Name, Is.EqualTo("bar"));
225225
}
226226

227227
[Test]
@@ -242,7 +242,7 @@ public void MockDirectory_ResolveLinkTarget_WithFinalTarget_ShouldReturnPathOfTa
242242

243243
var result = fileSystem.Directory.ResolveLinkTarget(previousPath, true);
244244

245-
Assert.AreEqual("bar", result.Name);
245+
Assert.That(result.Name, Is.EqualTo("bar"));
246246
}
247247

248248
[Test]
@@ -275,7 +275,7 @@ public void MockDirectory_ResolveLinkTarget_WithoutFinalTarget_ShouldReturnFirst
275275

276276
var result = fileSystem.Directory.ResolveLinkTarget("foo1", false);
277277

278-
Assert.AreEqual("foo", result.Name);
278+
Assert.That(result.Name, Is.EqualTo("foo"));
279279
}
280280

281281
[Test]

0 commit comments

Comments
 (0)