Skip to content

Remove all [Obsolete] members and migrate callers #5384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomhurst merged 5 commits into from
Apr 4, 2026
Merged

Remove all [Obsolete] members and migrate callers #5384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1357984
Remove all [Obsolete] members and migrate callers to current APIs
thomhurst Apr 4, 2026
7a828ed
Extract shared inline assertion helper and propagate inner failure me…
thomhurst Apr 4, 2026
b11329e
Fix tests to use Length(lambda) for string-context-preserving chaining
thomhurst Apr 4, 2026
322604b
Regenerate public API snapshots after removing obsolete members
thomhurst Apr 4, 2026
78a5a19
Address PR review: delete dead wrappers, improve inline assertion mes…
thomhurst Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TUnit.Analyzers.CodeFixers/TwoPhase/XUnitTwoPhaseAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ private bool IsXUnitAssertion(InvocationExpressionSyntax invocation)

var inspectorSummary = string.Join("; ", inspectors);
var todoComment = $"// TODO: TUnit migration - Assert.Collection element inspectors were dropped and need manual conversion: {inspectorSummary}";
return (AssertionConversionKind.Collection, $"await Assert.That({collection}).HasCount({inspectorCount})", true, todoComment);
return (AssertionConversionKind.Collection, $"await Assert.That({collection}).Count().IsEqualTo({inspectorCount})", true, todoComment);
}

private string? TryConvertActionToPredicate(ExpressionSyntax actionExpression)
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Analyzers.Tests/XUnitMigrationAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ public async Task MyTest()
{
var items = new[] { 1, 2, 3 };
// TODO: TUnit migration - Assert.Collection element inspectors were dropped and need manual conversion: [0]: x => Assert.Equal(1, x); [1]: x => Assert.Equal(2, x); [2]: x => Assert.Equal(3, x)
await Assert.That(items).HasCount(3);
await Assert.That(items).Count().IsEqualTo(3);
}
}
""",
Expand Down
20 changes: 10 additions & 10 deletions TUnit.Assertions.SourceGenerator.Tests/AssertionExtensionGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public Task NonGenericAssertion() => RunTest(
"NonGenericAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsEmpty"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsEmpty");
Expand All @@ -27,7 +27,7 @@ public Task SingleGenericParameter() => RunTest(
"SingleGenericParameterAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsNull"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsNull");
Expand All @@ -42,7 +42,7 @@ public Task MultipleGenericParameters() => RunTest(
"MultipleGenericParametersAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsAssignableTo"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsAssignableTo");
Expand All @@ -57,7 +57,7 @@ public Task AssertionWithOptionalParameter() => RunTest(
"OptionalParameterAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsNotEqualTo"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsNotEqualTo");
Expand All @@ -72,7 +72,7 @@ public Task AssertionWithGenericConstraints() => RunTest(
"GenericConstraintsAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsGreaterThan"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsGreaterThan");
Expand All @@ -87,7 +87,7 @@ public Task AssertionWithMultipleConstructors() => RunTest(
"MultipleConstructorsAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsEqualTo"));
await Assert.That(extensionFile).IsNotNull();
// Should generate multiple overloads
Expand All @@ -103,7 +103,7 @@ public Task AssertionWithNegatedMethod() => RunTest(
"NegatedMethodAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsTrue"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsTrue");
Expand All @@ -118,7 +118,7 @@ public Task AssertionWithDefaultValues() => RunTest(
"DefaultValuesAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("= true"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("= true");
Expand All @@ -134,7 +134,7 @@ public Task AssertionWithEnumDefault() => RunTest(
"EnumDefaultAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("StringComparison"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("StringComparison.");
Expand All @@ -148,7 +148,7 @@ public Task AssertionWithMultipleParameters() => RunTest(
"MultipleParametersAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);
var extensionFile = generatedFiles.FirstOrDefault(f => f.Contains("IsBetween"));
await Assert.That(extensionFile).IsNotNull();
await Assert.That(extensionFile!).Contains("IsBetween");
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions.SourceGenerator.Tests/DateOnlyAssertionGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public Task GeneratesDateOnlyAssertions() => RunTest(
"DateOnlyAssertionExtensions.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(0);
await Assert.That(generatedFiles).Count().IsEqualTo(0);
});
}
30 changes: 15 additions & 15 deletions TUnit.Assertions.SourceGenerator.Tests/MethodAssertionGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public Task BoolMethod() => RunTest(
"BoolMethodAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("IsPositive_Assertion"));
await Assert.That(mainFile).IsNotNull();
Expand All @@ -30,7 +30,7 @@ public Task AssertionResultMethod() => RunTest(
"AssertionResultMethodAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("IsEven_Assertion"));
await Assert.That(mainFile).IsNotNull();
Expand All @@ -47,7 +47,7 @@ public Task AsyncBoolMethod() => RunTest(
"AsyncBoolAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("IsPositiveAsync_Assertion"));
await Assert.That(mainFile).IsNotNull();
Expand All @@ -63,7 +63,7 @@ public Task AsyncAssertionResultMethod() => RunTest(
"AsyncAssertionResultAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("IsEvenAsync_Assertion"));
await Assert.That(mainFile).IsNotNull();
Expand All @@ -79,7 +79,7 @@ public Task GenericMethodWithNonInferableTypeParameter() => RunTest(
"GenericMethodWithNonInferableTypeParameter.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("IsErrorOfType"));
await Assert.That(mainFile).IsNotNull();
Expand All @@ -99,7 +99,7 @@ public Task MethodWithComparableConstraint() => RunTest(
"MethodWithComparableConstraint.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand All @@ -122,7 +122,7 @@ public Task MethodWithMultipleConstraints() => RunTest(
"MethodWithMultipleConstraints.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand All @@ -141,7 +141,7 @@ public Task MethodWithReferenceTypeConstraint() => RunTest(
"MethodWithReferenceTypeConstraint.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand All @@ -160,7 +160,7 @@ public Task MethodWithValueTypeConstraint() => RunTest(
"MethodWithValueTypeConstraint.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand All @@ -179,7 +179,7 @@ public Task MethodWithNotNullConstraint() => RunTest(
"MethodWithNotNullConstraint.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand Down Expand Up @@ -210,7 +210,7 @@ public Task MethodWithDefaultValues() => RunTest(
"MethodWithDefaultValues.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand All @@ -229,7 +229,7 @@ public Task RefStructParameter() => RunTest(
new RunTestOptions { PreprocessorSymbols = ["NET6_0_OR_GREATER"] },
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).IsNotNull();
Expand Down Expand Up @@ -261,7 +261,7 @@ public Task AssertionResultOfTMethod() => RunTest(
"AssertionResultOfTMethodAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).Contains("IEnumerableString_ContainsMatch_String_Assertion");
Expand All @@ -282,7 +282,7 @@ public Task AsyncAssertionResultOfTMethod() => RunTest(
"AsyncAssertionResultOfTAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.First();
await Assert.That(mainFile).Contains("IEnumerableString_ContainsMatchAsync_String_Assertion");
Expand All @@ -303,7 +303,7 @@ public Task ArrayTargetType() => RunTest(
"ArrayTargetAssertion.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(1);
await Assert.That(generatedFiles).Count().IsEqualTo(1);

var mainFile = generatedFiles.FirstOrDefault(f => f.Contains("ContainsMessage"));
await Assert.That(mainFile).IsNotNull();
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions.SourceGenerator.Tests/RangeAssertionGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public Task GeneratesRangeAssertions() => RunTest(
"RangeAssertionExtensions.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(0);
await Assert.That(generatedFiles).Count().IsEqualTo(0);
});
}
2 changes: 1 addition & 1 deletion TUnit.Assertions.SourceGenerator.Tests/TimeOnlyAssertionGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public Task GeneratesTimeOnlyAssertions() => RunTest(
"TimeOnlyAssertionExtensions.cs"),
async generatedFiles =>
{
await Assert.That(generatedFiles).HasCount(0);
await Assert.That(generatedFiles).Count().IsEqualTo(0);
});
}
6 changes: 3 additions & 3 deletions TUnit.Assertions.Tests/AssertionBuilders/AndAssertionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ await Assert.That(value)
return _ < 10;
});

await Assert.That(evaluationOrder).HasCount(2);
await Assert.That(evaluationOrder).Count().IsEqualTo(2);
await Assert.That(evaluationOrder[0]).IsEqualTo(1);
await Assert.That(evaluationOrder[1]).IsEqualTo(2);
}
Expand All @@ -294,7 +294,7 @@ public async Task And_With_Collection_Assertions()
await Assert.That(collection)
.Contains(3)
.And
.HasCount(5);
.Count().IsEqualTo(5);
}

[Test]
Expand All @@ -305,6 +305,6 @@ public async Task And_With_String_Assertions()
await Assert.That(text)
.Contains("Hello")
.And
.HasLength(11);
.Length().IsEqualTo(11);
}
}
8 changes: 4 additions & 4 deletions TUnit.Assertions.Tests/AssertionBuilders/OrAssertionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ await Assert.That(value)
return _ < 10; // Passes
});

await Assert.That(evaluationOrder).HasCount(2);
await Assert.That(evaluationOrder).Count().IsEqualTo(2);
await Assert.That(evaluationOrder[0]).IsEqualTo(1);
await Assert.That(evaluationOrder[1]).IsEqualTo(2);
}
Expand All @@ -374,7 +374,7 @@ await Assert.That(value)
return _ < 10;
});

await Assert.That(evaluationOrder).HasCount(1);
await Assert.That(evaluationOrder).Count().IsEqualTo(1);
await Assert.That(evaluationOrder[0]).IsEqualTo(1);
}

Expand All @@ -386,7 +386,7 @@ public async Task Or_With_Collection_Assertions()
await Assert.That(collection)
.Contains(5)
.Or
.HasCount(3);
.Count().IsEqualTo(3);
}

[Test]
Expand All @@ -397,7 +397,7 @@ public async Task Or_With_String_Assertions()
await Assert.That(text)
.Contains("Goodbye")
.Or
.HasLength(11);
.Length(l => l.IsEqualTo(11));
}

// [Test]
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Assertions.Tests/Bugs/Issue4446Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public async Task ICollection_Should_Support_Contains()
public async Task ICollection_Should_Support_Count()
{
ICollection<int> collection = new List<int> { 1, 2, 3 };
await Assert.That(collection).HasCount().EqualTo(3);
await Assert.That(collection).Count().IsEqualTo(3);
}

[Test]
Expand Down Expand Up @@ -73,7 +73,7 @@ public async Task IReadOnlyCollection_Should_Support_Contains()
public async Task IReadOnlyCollection_Should_Support_Count()
{
IReadOnlyCollection<int> collection = new List<int> { 1, 2, 3 };
await Assert.That(collection).HasCount().EqualTo(3);
await Assert.That(collection).Count().IsEqualTo(3);
}

[Test]
Expand Down
8 changes: 4 additions & 4 deletions TUnit.Assertions.Tests/DictionaryCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public async Task Dictionary_HasCount_Works()
["key3"] = 3
};

await Assert.That(dictionary).HasCount(3);
await Assert.That(dictionary).Count().IsEqualTo(3);
}

[Test]
Expand Down Expand Up @@ -130,7 +130,7 @@ await Assert.That(dictionary)
// Collection methods work on dictionaries
await Assert.That(dictionary)
.IsNotEmpty()
.And.HasCount(2)
.And.Count().IsEqualTo(2)
.And.Contains(new KeyValuePair<string, int>("key2", 2));
}

Expand Down Expand Up @@ -159,7 +159,7 @@ public async Task IReadOnlyDictionary_Collection_Methods_Work()
// Collection methods work on IReadOnlyDictionary
await Assert.That(dictionary)
.IsNotEmpty()
.And.HasCount(2);
.And.Count().IsEqualTo(2);

// Dictionary-specific methods also work
await Assert.That(dictionary)
Expand Down Expand Up @@ -612,7 +612,7 @@ public async Task IDictionary_Collection_Methods_Work()
// IDictionary should also have access to collection methods
await Assert.That(dictionary)
.IsNotEmpty()
.And.HasCount(2);
.And.Count().IsEqualTo(2);
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions.Tests/ListAssertionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public async Task Test_List_InheritsCollectionMethods()
{
IList<int> list = new List<int> { 1, 2, 3, 4, 5 };

await Assert.That(list).HasCount(5);
await Assert.That(list).Count().IsEqualTo(5);
await Assert.That(list).All(x => x > 0);
await Assert.That(list).Any(x => x == 3);
}
Expand Down
Loading
Loading