Skip to content

chore: Migrate NSubstitute to TUnit.Mocks in Tests.Unit #563

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
samtrion merged 2 commits into from
Jul 29, 2026
Merged

chore: Migrate NSubstitute to TUnit.Mocks in Tests.Unit #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
985bd00
chore(tests): migrate NSubstitute to TUnit.Mocks in Tests.Unit
samtrion Jul 29, 2026
3a10fc9
docs: link filed upstream TUnit issue for the DbDataReader mocking ex…
samtrion Jul 29, 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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
<PackageVersion Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.53.3" />
<PackageVersion Include="TUnit" Version="1.62.0" />
<PackageVersion Include="TUnit.Mocks" Version="1.62.0" />
<PackageVersion Include="Verify.TUnit" Version="31.27.0" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion ...etEvolve.Extensions.Data.Tests.PublicApi/NetEvolve.Extensions.Data.Tests.PublicApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<PackageReference Include="PublicApiGenerator" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
<PackageReference Include="NetEvolve.Extensions.TUnit" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="TUnit" />
<PackageReference Include="Verify.TUnit" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/NetEvolve.Extensions.Data.Tests.Unit/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
global using NSubstitute.ExceptionExtensions;
global using TUnit.Assertions;
global using TUnit.Assertions;
global using TUnit.Assertions.Extensions;
global using TUnit.Core;
11 changes: 5 additions & 6 deletions tests/NetEvolve.Extensions.Data.Tests.Unit/IDataReaderExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
namespace NetEvolve.Extensions.Data.Tests.Unit;

using System.Data;
using NSubstitute;

public class IDataReaderExtensionsTests
{
Expand All @@ -20,7 +19,7 @@ public void HasColumn_WhenReaderIsNull_ThrowsArgumentNullException()
public void HasColumn_WhenNameIsNull_ThrowsArgumentNullException()
{
// Arrange
var reader = Substitute.For<IDataReader>();
var reader = IDataReader.Mock();
string name = null!;

// Act
Expand All @@ -31,7 +30,7 @@ public void HasColumn_WhenNameIsNull_ThrowsArgumentNullException()
public void HasColumn_WhenNameIsEmpty_ThrowsArgumentNullException()
{
// Arrange
var reader = Substitute.For<IDataReader>();
var reader = IDataReader.Mock();
var name = string.Empty;

// Act
Expand All @@ -43,12 +42,12 @@ public void HasColumn_WhenNameIsEmpty_ThrowsArgumentNullException()
public async Task HasColumn_Theory_Expected(bool expected, string name)
{
// Arrange
var reader = Substitute.For<IDataReader>();
var reader = IDataReader.Mock();

_ = reader.FieldCount.Returns(2);

_ = reader.GetName(Arg.Is(0)).Returns("Id");
_ = reader.GetName(Arg.Is(1)).Returns("Name");
_ = reader.GetName(0).Returns("Id");
_ = reader.GetName(1).Returns("Name");

// Act
var result = reader.HasColumn(name);
Expand Down
75 changes: 40 additions & 35 deletions tests/NetEvolve.Extensions.Data.Tests.Unit/IDataRecordExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace NetEvolve.Extensions.Data.Tests.Unit;

using System.Data;
using NSubstitute;
using System.Diagnostics.CodeAnalysis;

public class IDataRecordExtensionsTests
{
Expand Down Expand Up @@ -1468,57 +1468,62 @@ public async Task GetNullableValueNamed_Theory_Expected(object? expected, string

private static readonly Guid _guidMax = Guid.NewGuid();

[SuppressMessage(
"Performance",
"CA1859:Use concrete types when possible for improved performance",
Justification = "Return type must stay IDataRecord to keep the mock's setup separate from the record used by callers."
)]
private static IDataRecord CreateTestRecord()
{
var record = Substitute.For<IDataRecord>();
var record = IDataRecord.Mock();

_ = record.GetOrdinal(Arg.Any<string>()).Returns(-1);
_ = record.GetOrdinal(Arg.Is("Id")).Returns(0);
_ = record.GetOrdinal(Arg.Is("Name")).Returns(1);
_ = record.GetOrdinal(Arg.Is("IsActive")).Returns(2);
_ = record.GetOrdinal(Any<string>()).Returns(-1);
_ = record.GetOrdinal("Id").Returns(0);
_ = record.GetOrdinal("Name").Returns(1);
_ = record.GetOrdinal("IsActive").Returns(2);

_ = record.IsDBNull(Arg.Any<int>()).Returns(false);
_ = record.IsDBNull(Arg.Is<int>(i => i < 0)).Throws<IndexOutOfRangeException>();
_ = record.IsDBNull(Arg.Is(0)).Returns(true);
_ = record.IsDBNull(Any<int>()).Returns(false);
_ = record.IsDBNull(i => i < 0).Throws<IndexOutOfRangeException>();
_ = record.IsDBNull(0).Returns(true);

_ = record.GetBoolean(Arg.Any<int>()).Returns(false);
_ = record.GetBoolean(Arg.Is(1)).Returns(true);
_ = record.GetBoolean(Any<int>()).Returns(false);
_ = record.GetBoolean(1).Returns(true);

_ = record.GetByte(Arg.Any<int>()).Returns<byte>(0x00b);
_ = record.GetByte(Arg.Is(1)).Returns<byte>(0x01b);
_ = record.GetByte(Any<int>()).Returns(0x00b);
_ = record.GetByte(1).Returns(0x01b);

_ = record.GetChar(Arg.Any<int>()).Returns(' ');
_ = record.GetChar(Arg.Is(1)).Returns('\t');
_ = record.GetChar(Any<int>()).Returns(' ');
_ = record.GetChar(1).Returns('\t');

_ = record.GetDateTime(Arg.Any<int>()).Returns(DateTime.MinValue);
_ = record.GetDateTime(Arg.Is(1)).Returns(DateTime.FromOADate(0));
_ = record.GetDateTime(Any<int>()).Returns(DateTime.MinValue);
_ = record.GetDateTime(1).Returns(DateTime.FromOADate(0));

_ = record.GetDecimal(Arg.Any<int>()).Returns(decimal.MinValue);
_ = record.GetDecimal(Arg.Is(1)).Returns(decimal.MaxValue);
_ = record.GetDecimal(Any<int>()).Returns(decimal.MinValue);
_ = record.GetDecimal(1).Returns(decimal.MaxValue);

_ = record.GetDouble(Arg.Any<int>()).Returns(double.MinValue);
_ = record.GetDouble(Arg.Is(1)).Returns(double.MaxValue);
_ = record.GetDouble(Any<int>()).Returns(double.MinValue);
_ = record.GetDouble(1).Returns(double.MaxValue);

_ = record.GetFloat(Arg.Any<int>()).Returns(float.MinValue);
_ = record.GetFloat(Arg.Is(1)).Returns(float.MaxValue);
_ = record.GetFloat(Any<int>()).Returns(float.MinValue);
_ = record.GetFloat(1).Returns(float.MaxValue);

_ = record.GetGuid(Arg.Any<int>()).Returns(Guid.Empty);
_ = record.GetGuid(Arg.Is(1)).Returns(_guidMax);
_ = record.GetGuid(Any<int>()).Returns(Guid.Empty);
_ = record.GetGuid(1).Returns(_guidMax);

_ = record.GetInt16(Arg.Any<int>()).Returns(short.MinValue);
_ = record.GetInt16(Arg.Is(1)).Returns(short.MaxValue);
_ = record.GetInt16(Any<int>()).Returns(short.MinValue);
_ = record.GetInt16(1).Returns(short.MaxValue);

_ = record.GetInt32(Arg.Any<int>()).Returns(int.MinValue);
_ = record.GetInt32(Arg.Is(1)).Returns(int.MaxValue);
_ = record.GetInt32(Any<int>()).Returns(int.MinValue);
_ = record.GetInt32(1).Returns(int.MaxValue);

_ = record.GetInt64(Arg.Any<int>()).Returns(long.MinValue);
_ = record.GetInt64(Arg.Is(1)).Returns(long.MaxValue);
_ = record.GetInt64(Any<int>()).Returns(long.MinValue);
_ = record.GetInt64(1).Returns(long.MaxValue);

_ = record.GetString(Arg.Any<int>()).Returns(string.Empty);
_ = record.GetString(Arg.Is(1)).Returns("Hello World!");
_ = record.GetString(Any<int>()).Returns(string.Empty);
_ = record.GetString(1).Returns("Hello World!");

_ = record.GetValue(Arg.Any<int>()).Returns(string.Empty);
_ = record.GetValue(Arg.Is(1)).Returns("Hello World!");
_ = record.GetValue(Any<int>()).Returns(string.Empty);
_ = record.GetValue(1).Returns("Hello World!");

return record;
}
Expand Down
9 changes: 9 additions & 0 deletions tests/NetEvolve.Extensions.Data.Tests.Unit/NetEvolve.Extensions.Data.Tests.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
<PackageReference Include="NetEvolve.Extensions.TUnit" />
<!--
NSubstitute is retained solely for DbDataReaderExtensionsTests.cs: TUnit.Mocks 1.62.0's
source generator emits "Cannot call an abstract base member" (CS0205) for
DbDataReader.this[int]/this[string] when generating a mock for the abstract DbDataReader
class, because those indexers are abstract with no base implementation to forward to.
Remove once TUnit.Mocks fixes generating mocks for abstract classes with abstract indexers.
https://github.com/thomhurst/TUnit/issues/6516
-->
<PackageReference Include="NSubstitute" />
<PackageReference Include="TUnit" />
<PackageReference Include="TUnit.Mocks" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\NetEvolve.Extensions.Data\NetEvolve.Extensions.Data.csproj" />
Expand Down
Loading