Skip to content

Commit c13f310

Browse files
borisahrensBoris Ahrens
andauthored
Replace Moq with NSubstitute (#332)
Co-authored-by: Boris Ahrens <boris.ahrens@gdata.de>
1 parent a6456c8 commit c13f310

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/MalwareSampleExchange.Console/MalwareSampleExchange.Console.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.Web">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
4-
<Version>0.8.1</Version>
4+
<Version>0.8.2</Version>
55
<Nullable>enable</Nullable>
66
<LangVersion>12</LangVersion>
77
<ImplicitUsings>enable</ImplicitUsings>

test/MalwareSampleExchange.Console_Test/MalwareSampleExchange.Console_Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
8-
<PackageReference Include="Moq" Version="4.17.2" />
8+
<PackageReference Include="NSubstitute" Version="5.1.0" />
99
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
1010
<PackageReference Include="Testcontainers" Version="3.7.0" />
1111
<PackageReference Include="xunit" Version="2.7.0" />

test/MalwareSampleExchange.Console_Test/MongoDockerFixture.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
using Microsoft.Extensions.Configuration;
88
using Microsoft.Extensions.Logging;
99
using Microsoft.Extensions.Options;
10-
using Moq;
1110
using MalwareSampleExchange.Console.Database;
1211
using MalwareSampleExchange.Console.Models;
1312
using MalwareSampleExchange.Console.SampleStorage;
1413
using MongoDB.Driver;
14+
using NSubstitute;
1515
using Xunit;
1616

1717
namespace MalwareSampleExchange.Console_Test;
@@ -39,7 +39,9 @@ public MongoDockerFixture()
3939
.WithPortBinding(27017, true)
4040
.Build();
4141

42-
_storageHandler = new FileSampleStorageHandler(Mock.Of<ILogger<FileSampleStorageHandler>>(),
42+
var logger = Substitute.For<ILogger<FileSampleStorageHandler>>();
43+
44+
_storageHandler = new FileSampleStorageHandler(logger,
4345
new OptionsWrapper<FileStorageOptions>(new FileStorageOptions
4446
{
4547
Path = Configuration["Storage:Path"]

test/MalwareSampleExchange.Console_Test/SampleExchangeTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using JWT.Builder;
99
using Microsoft.Extensions.Configuration;
1010
using Microsoft.Extensions.Logging;
11-
using Moq;
1211
using MalwareSampleExchange.Console.ListRequester;
1312
using Xunit;
1413
using JWT.Algorithms;
@@ -17,6 +16,7 @@
1716
using MalwareSampleExchange.Console.Partner;
1817
using MalwareSampleExchange.Console.SampleStorage;
1918
using Microsoft.Extensions.Hosting;
19+
using NSubstitute;
2020

2121
namespace MalwareSampleExchange.Console_Test;
2222

@@ -38,26 +38,26 @@ public SampleExchangeTest(MongoDockerFixture mongoDockerFixture)
3838

3939
private static PartnerProvider CreatePartnerProvider()
4040
{
41-
return new PartnerProvider(Mock.Of<ILogger<PartnerProvider>>(),
41+
return new PartnerProvider(Substitute.For<ILogger<PartnerProvider>>(),
4242
new OptionsWrapper<PartnerProviderOptions>(new PartnerProviderOptions
4343
{
4444
FilePath = Configuration["Config:FilePath"]!
45-
}), Mock.Of<IHostApplicationLifetime>(), new HttpClient());
45+
}), Substitute.For<IHostApplicationLifetime>(), new HttpClient());
4646
}
4747

4848
private static ISampleStorageHandler CreateSampleGetter()
4949
{
5050
var options = new FileStorageOptions();
5151
Configuration.GetSection("Storage").Bind(options);
5252

53-
var sampleGetter = new FileSampleStorageHandler(Mock.Of<ILogger<FileSampleStorageHandler>>(),
53+
var sampleGetter = new FileSampleStorageHandler(Substitute.For<ILogger<FileSampleStorageHandler>>(),
5454
new OptionsWrapper<FileStorageOptions>(options));
5555
return sampleGetter;
5656
}
5757

5858
private ListRequester CreateListRequester(ISampleMetadataHandler? sampleMetadataReader = null)
5959
{
60-
sampleMetadataReader ??= Mock.Of<ISampleMetadataHandler>();
60+
sampleMetadataReader ??= Substitute.For<ISampleMetadataHandler>();
6161
var options = new ListRequesterOptions();
6262
Configuration.GetSection("Token").Bind(options);
6363
return new ListRequester(new OptionsWrapper<ListRequesterOptions>(options),

0 commit comments

Comments
 (0)