diff --git a/src/TUnit.Assertions/Extensions/Assert.cs b/src/TUnit.Assertions/Extensions/Assert.cs index a4eeabe6156..3e434d41e15 100644 --- a/src/TUnit.Assertions/Extensions/Assert.cs +++ b/src/TUnit.Assertions/Extensions/Assert.cs @@ -241,9 +241,16 @@ public static HashSetAssertion That( /// Example: await Assert.That(nonGenericCollection).Contains("item"); /// public static CollectionAssertion That( - IEnumerable value, + IEnumerable? value, [CallerArgumentExpression(nameof(value))] string? expression = null) { + // A null source must reach the assertion chain so IsNull() can pass and other + // assertions fail normally; Cast<>() would throw ArgumentNullException here. + if (value is null) + { + return new CollectionAssertion(null!, expression); + } + // Cast to IEnumerable directly without calling Cast<>() to preserve reference identity // This allows IsSameReferenceAs to work correctly on non-generic IEnumerables if (value is IEnumerable genericEnumerable) diff --git a/tests/TUnit.Assertions.Tests/Bugs/Tests7698.cs b/tests/TUnit.Assertions.Tests/Bugs/Tests7698.cs new file mode 100644 index 00000000000..c37920a8dd6 --- /dev/null +++ b/tests/TUnit.Assertions.Tests/Bugs/Tests7698.cs @@ -0,0 +1,55 @@ +using System.Collections; +using TUnit.Assertions.Exceptions; + +namespace TUnit.Assertions.Tests.Bugs; + +/// +/// Regression tests for https://github.com/thomhurst/TUnit/issues/7698: +/// Assert.That on a null non-generic IEnumerable threw ArgumentNullException, +/// so IsNull() could never pass. +/// +public class Tests7698 +{ + [Test] + public async Task IsNull_Passes_For_Null_NonGeneric_IEnumerable() + { + IEnumerable? value = null; + + await Assert.That(value).IsNull(); + } + + [Test] + public async Task IsNotNull_Fails_With_AssertionException_For_Null_NonGeneric_IEnumerable() + { + IEnumerable? value = null; + + await Assert.That(async () => await Assert.That(value).IsNotNull()) + .Throws(); + } + + [Test] + public async Task IsEmpty_Fails_With_AssertionException_For_Null_NonGeneric_IEnumerable() + { + IEnumerable? value = null; + + await Assert.That(async () => await Assert.That(value).IsEmpty()) + .Throws(); + } + + [Test] + public async Task Contains_Fails_With_AssertionException_For_Null_NonGeneric_IEnumerable() + { + IEnumerable? value = null; + + await Assert.That(async () => await Assert.That(value).Contains(1)) + .Throws(); + } + + [Test] + public async Task IsNotNull_Passes_For_NonNull_NonGeneric_IEnumerable() + { + IEnumerable value = new ArrayList { 1, 2, 3 }; + + await Assert.That(value).IsNotNull(); + } +} diff --git a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet10_0.verified.txt b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet10_0.verified.txt index beaee2fe321..aa415d32707 100644 --- a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet10_0.verified.txt +++ b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet10_0.verified.txt @@ -185,7 +185,7 @@ namespace public static .<.RaisedEvent> RaisesAsync(<> attach, <> detach, <.> action) where T : { } public static . That( action, [.("action")] string? expression = null) { } - public static . That(.IEnumerable value, [.("value")] string? expression = null) { } + public static . That(.IEnumerable? value, [.("value")] string? expression = null) { } public static . That(<.> action, [.("action")] string? expression = null) { } public static . That(. task, [.("task")] string? expression = null) { } [.(1)] diff --git a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet8_0.verified.txt b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet8_0.verified.txt index caec26de69b..7e78d55b183 100644 --- a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet8_0.verified.txt +++ b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet8_0.verified.txt @@ -185,7 +185,7 @@ namespace public static .<.RaisedEvent> RaisesAsync(<> attach, <> detach, <.> action) where T : { } public static . That( action, [.("action")] string? expression = null) { } - public static . That(.IEnumerable value, [.("value")] string? expression = null) { } + public static . That(.IEnumerable? value, [.("value")] string? expression = null) { } public static . That(<.> action, [.("action")] string? expression = null) { } public static . That(. task, [.("task")] string? expression = null) { } public static . That(? value, [.("value")] string? expression = null) { } diff --git a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet9_0.verified.txt b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet9_0.verified.txt index 6c7d15ecfb7..f9c6e8e2930 100644 --- a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet9_0.verified.txt +++ b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.DotNet9_0.verified.txt @@ -185,7 +185,7 @@ namespace public static .<.RaisedEvent> RaisesAsync(<> attach, <> detach, <.> action) where T : { } public static . That( action, [.("action")] string? expression = null) { } - public static . That(.IEnumerable value, [.("value")] string? expression = null) { } + public static . That(.IEnumerable? value, [.("value")] string? expression = null) { } public static . That(<.> action, [.("action")] string? expression = null) { } public static . That(. task, [.("task")] string? expression = null) { } [.(1)] diff --git a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.Net4_7.verified.txt b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.Net4_7.verified.txt index 5091dcc607d..6fe14791f8b 100644 --- a/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.Net4_7.verified.txt +++ b/tests/TUnit.PublicAPI/Tests.Assertions_Library_Has_No_API_Changes.Net4_7.verified.txt @@ -148,7 +148,7 @@ namespace public static .<.RaisedEvent> RaisesAsync(<> attach, <> detach, <.> action) where T : { } public static . That( action, [.("action")] string? expression = null) { } - public static . That(.IEnumerable value, [.("value")] string? expression = null) { } + public static . That(.IEnumerable? value, [.("value")] string? expression = null) { } public static . That(<.> action, [.("action")] string? expression = null) { } public static . That(. task, [.("task")] string? expression = null) { } public static . That(? value, [.("value")] string? expression = null) { }