Skip to content

Commit 3031e19

Browse files
ikesnowyikesnowy
authored
Merge pull request #140 from cnblogs/drop-moq
test: drop moq
2 parents cbf728a + d45e64c commit 3031e19

File tree

16 files changed

+293
-298
lines changed

16 files changed

+293
-298
lines changed

‎src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/EventBusOptions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Microsoft.Extensions.DependencyInjection;
2-
31
namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions;
42

53
/// <summary>

‎src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="MongoDB.Driver" Version="2.20.0" />
13+
<PackageReference Include="MongoDB.Driver" Version="2.21.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="Cnblogs.Serilog.Extensions" Version="1.1.0" />
4-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
4+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.10" />
55
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
66
<PackageReference Include="xunit" Version="2.5.0" />
77
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">

‎test/Cnblogs.Architecture.IntegrationTests/IntegrationEventPublishTests.cs‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
using Microsoft.AspNetCore.Mvc.Testing;
99
using Microsoft.Extensions.DependencyInjection;
1010
using Microsoft.Extensions.DependencyInjection.Extensions;
11-
using Moq;
11+
using NSubstitute;
12+
using NSubstitute.ExceptionExtensions;
1213

1314
namespace Cnblogs.Architecture.IntegrationTests;
1415

@@ -20,13 +21,13 @@ public async Task EventBus_PublishEvent_SuccessAsync()
2021
// Arrange
2122
const string data = "hello";
2223
var builder = new WebApplicationFactory<Program>();
23-
var eventBusMock = new Mock<IEventBusProvider>();
24+
var eventBusMock = Substitute.For<IEventBusProvider>();
2425
builder = builder.WithWebHostBuilder(
2526
b => b.ConfigureServices(
2627
services =>
2728
{
2829
services.RemoveAll<IEventBusProvider>();
29-
services.AddScoped<IEventBusProvider>(_ => eventBusMock.Object);
30+
services.AddScoped<IEventBusProvider>(_ => eventBusMock);
3031
}));
3132

3233
// Act
@@ -39,9 +40,9 @@ public async Task EventBus_PublishEvent_SuccessAsync()
3940
// Assert
4041
response.Should().BeSuccessful();
4142
content.Should().BeNullOrEmpty();
42-
eventBusMock.Verify(
43-
x => x.PublishAsync(It.IsAny<string>(), It.Is<TestIntegrationEvent>(t => t.Message == data)),
44-
Times.Once);
43+
await eventBusMock.Received(1).PublishAsync(
44+
Arg.Any<string>(),
45+
Arg.Is<TestIntegrationEvent>(t => t.Message == data));
4546
}
4647

4748
[Fact]
@@ -50,21 +51,21 @@ public async Task EventBus_Downgrading_DowngradeAsync()
5051
// Arrange
5152
const string data = "hello";
5253
var builder = new WebApplicationFactory<Program>();
53-
var eventBusMock = new Mock<IEventBusProvider>();
54+
var eventBusMock = Substitute.For<IEventBusProvider>();
5455
builder = builder.WithWebHostBuilder(
5556
b => b.ConfigureServices(
5657
services =>
5758
{
5859
services.RemoveAll<IEventBusProvider>();
59-
services.AddScoped<IEventBusProvider>(_ => eventBusMock.Object);
60+
services.AddScoped<IEventBusProvider>(_ => eventBusMock);
6061
services.Configure<EventBusOptions>(
6162
o =>
6263
{
6364
o.FailureCountBeforeDowngrade = 1;
6465
o.DowngradeInterval = 3000;
6566
});
6667
}));
67-
eventBusMock.Setup(x => x.PublishAsync(It.IsAny<string>(), It.IsAny<IntegrationEvent>()))
68+
eventBusMock.PublishAsync(Arg.Any<string>(), Arg.Any<IntegrationEvent>())
6869
.ThrowsAsync(new InvalidOperationException());
6970

7071
// Act
@@ -77,9 +78,9 @@ public async Task EventBus_Downgrading_DowngradeAsync()
7778
// Assert
7879
response.Should().BeSuccessful();
7980
content.Should().BeNullOrEmpty();
80-
eventBusMock.Verify(
81-
x => x.PublishAsync(It.IsAny<string>(), It.Is<TestIntegrationEvent>(t => t.Message == data)),
82-
Times.Exactly(2));
81+
await eventBusMock.Received(2).PublishAsync(
82+
Arg.Any<string>(),
83+
Arg.Is<TestIntegrationEvent>(t => t.Message == data));
8384
}
8485

8586
[Fact]
@@ -88,13 +89,13 @@ public async Task EventBus_MaximumBufferSizeReached_ThrowAsync()
8889
// Arrange
8990
const string data = "hello";
9091
var builder = new WebApplicationFactory<Program>();
91-
var eventBusMock = new Mock<IEventBusProvider>();
92+
var eventBusMock = Substitute.For<IEventBusProvider>();
9293
builder = builder.WithWebHostBuilder(
9394
b => b.ConfigureServices(
9495
services =>
9596
{
9697
services.RemoveAll<IEventBusProvider>();
97-
services.AddScoped<IEventBusProvider>(_ => eventBusMock.Object);
98+
services.AddScoped<IEventBusProvider>(_ => eventBusMock);
9899
services.Configure<EventBusOptions>(
99100
o =>
100101
{
@@ -103,7 +104,7 @@ public async Task EventBus_MaximumBufferSizeReached_ThrowAsync()
103104
o.DowngradeInterval = 3000;
104105
});
105106
}));
106-
eventBusMock.Setup(x => x.PublishAsync(It.IsAny<string>(), It.IsAny<IntegrationEvent>()))
107+
eventBusMock.PublishAsync(Arg.Any<string>(), Arg.Any<IntegrationEvent>())
107108
.ThrowsAsync(new InvalidOperationException());
108109
var client = builder.CreateClient();
109110
await client.PostAsJsonAsync(
@@ -123,13 +124,13 @@ public async Task EventBus_MaximumBatchSize_OneBatchAsync()
123124
// Arrange
124125
const string data = "hello";
125126
var builder = new WebApplicationFactory<Program>();
126-
var eventBusMock = new Mock<IEventBusProvider>();
127+
var eventBusMock = Substitute.For<IEventBusProvider>();
127128
builder = builder.WithWebHostBuilder(
128129
b => b.ConfigureServices(
129130
services =>
130131
{
131132
services.RemoveAll<IEventBusProvider>();
132-
services.AddScoped<IEventBusProvider>(_ => eventBusMock.Object);
133+
services.AddScoped<IEventBusProvider>(_ => eventBusMock);
133134
services.Configure<EventBusOptions>(
134135
o =>
135136
{
@@ -149,7 +150,7 @@ public async Task EventBus_MaximumBatchSize_OneBatchAsync()
149150
await Task.Delay(1000);
150151

151152
// Assert
152-
eventBusMock.Verify(x => x.PublishAsync(It.IsAny<string>(), It.IsAny<IntegrationEvent>()), Times.Once);
153+
await eventBusMock.Received(1).PublishAsync(Arg.Any<string>(), Arg.Any<IntegrationEvent>());
153154
}
154155

155156
[Fact]
@@ -158,38 +159,38 @@ public async Task EventBus_DowngradeThenRecover_RecoverAsync()
158159
// Arrange
159160
const string data = "hello";
160161
var builder = new WebApplicationFactory<Program>();
161-
var eventBusMock = new Mock<IEventBusProvider>();
162+
var eventBusMock = Substitute.For<IEventBusProvider>();
162163
builder = builder.WithWebHostBuilder(
163164
b => b.ConfigureServices(
164165
services =>
165166
{
166167
services.RemoveAll<IEventBusProvider>();
167-
services.AddScoped<IEventBusProvider>(_ => eventBusMock.Object);
168+
services.AddScoped<IEventBusProvider>(_ => eventBusMock);
168169
services.Configure<EventBusOptions>(
169170
o =>
170171
{
171172
o.FailureCountBeforeDowngrade = 1;
172173
o.DowngradeInterval = 4000;
173174
});
174175
}));
175-
eventBusMock.Setup(x => x.PublishAsync(It.IsAny<string>(), It.IsAny<IntegrationEvent>()))
176+
eventBusMock.PublishAsync(Arg.Any<string>(), Arg.Any<IntegrationEvent>())
176177
.ThrowsAsync(new InvalidOperationException());
177178
await builder.CreateClient().PostAsJsonAsync(
178179
"/api/v1/strings",
179180
new CreatePayload(false, data));
180181
await Task.Delay(1000); // failed, now it is downgraded
181182

182183
// Act
183-
eventBusMock.Reset();
184+
eventBusMock.PublishAsync(Arg.Any<string>(), Arg.Any<IntegrationEvent>()).Returns(Task.CompletedTask);
185+
eventBusMock.ClearReceivedCalls();
184186
await Task.Delay(2000); // recover
185187
await builder.CreateClient().PostAsJsonAsync(
186188
"/api/v1/strings",
187189
new CreatePayload(false, data));
188190
await Task.Delay(1000);
189191

190192
// Assert
191-
eventBusMock.Verify(
192-
x => x.PublishAsync(It.IsAny<string>(), It.Is<TestIntegrationEvent>(t => t.Message == data)),
193-
Times.Exactly(2));
193+
await eventBusMock.Received(2)
194+
.PublishAsync(Arg.Any<string>(), Arg.Is<TestIntegrationEvent>(t => t.Message == data));
194195
}
195196
}

‎test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="FluentAssertions" Version="6.11.0" />
4-
<PackageReference Include="Moq" Version="4.20.2" />
4+
<PackageReference Include="NSubstitute" Version="5.0.0" />
55
</ItemGroup>
66
</Project>

‎test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
4+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.10" />
55
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
66
<PackageReference Include="xunit" Version="2.5.0" />
77
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">

0 commit comments

Comments
 (0)