Skip to content
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

Jump to bottom

Feature: Replace Moq with NSubstitute #30

Merged
merged 1 commit into from
Aug 9, 2023
+42 −38
Merged

Feature: Replace Moq with NSubstitute #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion tests/Engines/Engine.ImagePngToJpgConverter.Tests/Engine.ImagePngToJpgConverter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
Expand Down
12 changes: 7 additions & 5 deletions tests/Engines/Engine.ImagePngToJpgConverter.Tests/PngToJpgEngineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,13 @@ public async Task SuccessfullyConvertedNumberOfFiles()
//Assert
var jpgFilesLength = directoryInfo.GetFiles("*.jpg", SearchOption.AllDirectories).Length;
var pngFilesLength = directoryInfo.GetFiles("*.png", SearchOption.AllDirectories).Length;

Assert.That(progress.PercentageComplete, Is.EqualTo(100));
Assert.That(progress.WorkDescription, Is.EqualTo("Compressing images from PNG to JPEG format finished"));
Assert.That(jpgFilesLength, Is.EqualTo(originalPngFilesLength));
Assert.That(pngFilesLength, Is.EqualTo(0));
Assert.Multiple(() =>
{
Assert.That(progress.PercentageComplete, Is.EqualTo(100));
Assert.That(progress.WorkDescription, Is.EqualTo("Compressing images from PNG to JPEG format finished"));
Assert.That(jpgFilesLength, Is.EqualTo(originalPngFilesLength));
Assert.That(pngFilesLength, Is.EqualTo(0));
});
}

[Test]
Expand Down
65 changes: 34 additions & 31 deletions tests/SongsCompressor.MainManager.Tests/CompressionManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Engine.AudioToOpusConverter;
using Engine.FFmpegProvider;
using Engine.ImagePngToJpgConverter;
using Moq;
using NSubstitute;
using SongCompressor.MainManager;
using SongsCompressor.Common.Enums;
using SongsCompressor.Common.Interfaces.Services;
Expand Down Expand Up @@ -33,15 +33,15 @@ public void SetUp()
[Test]
public void WhenStart_DirectoryNotFound_ThrowDirectoryNotFoundException()
{
var settingsStorageMock = new Mock<ISettingsStorage>();
var settingsStorageMock = Substitute.For<ISettingsStorage>();
var settings = new UserSettings
{
Directories = new List<string> { "not_existing_dir", "same" },
Options = new List<OptionsEnum> { OptionsEnum.ConvertAudioToOpus, OptionsEnum.ConvertPngToJpg }
};
settingsStorageMock.Setup(x => x.SaveSettings(settings)).Returns(Task.CompletedTask);
settingsStorageMock.SaveSettings(settings).Returns(Task.CompletedTask);

var compressionManager = new CompressionManager(settingsStorageMock.Object);
var compressionManager = new CompressionManager(settingsStorageMock);

Assert.ThrowsAsync<DirectoryNotFoundException>(
async () => await compressionManager.Initialize(settings));
Expand All @@ -50,15 +50,15 @@ public void WhenStart_DirectoryNotFound_ThrowDirectoryNotFoundException()
[Test]
public void WhenStart_NoDirectories_ThrowArgumentException()
{
var settingsStorageMock = new Mock<ISettingsStorage>();
var settingsStorageMock = Substitute.For<ISettingsStorage>();
var settings = new UserSettings
{
Directories = new List<string>(),
Options = new List<OptionsEnum> { OptionsEnum.ConvertAudioToOpus, OptionsEnum.ConvertPngToJpg }
};
settingsStorageMock.Setup(x => x.SaveSettings(settings)).Returns(Task.CompletedTask);
settingsStorageMock.SaveSettings(settings).Returns(Task.CompletedTask);

var compressionManager = new CompressionManager(settingsStorageMock.Object);
var compressionManager = new CompressionManager(settingsStorageMock);

Assert.ThrowsAsync<ArgumentException>(
async () => await compressionManager.Initialize(settings));
Expand All @@ -67,15 +67,15 @@ public void WhenStart_NoDirectories_ThrowArgumentException()
[Test]
public void WhenStart_NoOptions_ThrowArgumentException()
{
var settingsStorageMock = new Mock<ISettingsStorage>();
var settingsStorageMock = Substitute.For<ISettingsStorage>();
var settings = new UserSettings
{
Directories = _directories,
Options = new List<OptionsEnum>()
};
settingsStorageMock.Setup(x => x.SaveSettings(settings)).Returns(Task.CompletedTask);
settingsStorageMock.SaveSettings(settings).Returns(Task.CompletedTask);

var compressionManager = new CompressionManager(settingsStorageMock.Object);
var compressionManager = new CompressionManager(settingsStorageMock);

Assert.ThrowsAsync<ArgumentException>(
async () => await compressionManager.Initialize(settings));
Expand All @@ -85,52 +85,55 @@ public void WhenStart_NoOptions_ThrowArgumentException()
[Test]
public async Task InitializeEnginesTest()
{
var settingsStorageMock = new Mock<ISettingsStorage>();
var settingsStorageMock = Substitute.For<ISettingsStorage>();
var settings = new UserSettings
{
Directories = _directories,
Options = new List<OptionsEnum> { OptionsEnum.ConvertAudioToOpus, OptionsEnum.ConvertPngToJpg }
};
settingsStorageMock.Setup(x => x.SaveSettings(settings)).Returns(Task.CompletedTask);
settingsStorageMock.SaveSettings(settings).Returns(Task.CompletedTask);

var compressionManager = new CompressionManager(settingsStorageMock.Object);
var compressionManager = new CompressionManager(settingsStorageMock);
await compressionManager.Initialize(settings);

var progress = await compressionManager.GetCurrentProgressStatus();

Assert.That(compressionManager.Engines.Any(x => x is ProvideFFmpegEngine));
Assert.That(compressionManager.Engines.Any(x => x is PngToJpgEngine));
Assert.That(compressionManager.Engines.Any(x => x is AudioToOpusEngine));
Assert.That(compressionManager.Engines.All(x => x.Completed == false));
Assert.That(progress.EnginesFinished, Is.EqualTo(0));
Assert.That(progress.OverallEnginePercentageComplete, Is.EqualTo(0));
Assert.Multiple(() =>
{
Assert.That(compressionManager.Engines.Any(x => x is ProvideFFmpegEngine));
Assert.That(compressionManager.Engines.Any(x => x is PngToJpgEngine));
Assert.That(compressionManager.Engines.Any(x => x is AudioToOpusEngine));
Assert.That(compressionManager.Engines.All(x => x.Completed == false));
Assert.That(progress.EnginesFinished, Is.EqualTo(0));
Assert.That(progress.OverallEnginePercentageComplete, Is.EqualTo(0));
});
}

[Test]
public async Task StartTest()
{
var settingsStorageMock = new Mock<ISettingsStorage>();
var settingsStorageMock = Substitute.For<ISettingsStorage>();
var settings = new UserSettings
{
Directories = _directories,
Options = new List<OptionsEnum> { OptionsEnum.ConvertAudioToOpus, OptionsEnum.ConvertPngToJpg }
};
settingsStorageMock.Setup(x => x.SaveSettings(settings)).Returns(Task.CompletedTask);
settingsStorageMock.SaveSettings(settings).Returns(Task.CompletedTask);

var compressionManager = new CompressionManager(settingsStorageMock.Object);
var compressionManager = new CompressionManager(settingsStorageMock);
await compressionManager.Initialize(settings);

await compressionManager.Start();

var progress = await compressionManager.GetCurrentProgressStatus();

Assert.That(compressionManager.Engines.Any(x => x is ProvideFFmpegEngine));
Assert.That(compressionManager.Engines.Any(x => x is PngToJpgEngine));
Assert.That(compressionManager.Engines.Any(x => x is AudioToOpusEngine));
Assert.That(compressionManager.Engines.All(x => x.Completed));
Assert.That(progress.EnginesFinished, Is.EqualTo(compressionManager.Engines.Count));
Assert.That(progress.OverallEnginePercentageComplete, Is.EqualTo(100));
Assert.Multiple(() =>
{
Assert.That(compressionManager.Engines.Any(x => x is ProvideFFmpegEngine));
Assert.That(compressionManager.Engines.Any(x => x is PngToJpgEngine));
Assert.That(compressionManager.Engines.Any(x => x is AudioToOpusEngine));
Assert.That(compressionManager.Engines.All(x => x.Completed));
Assert.That(progress.EnginesFinished, Is.EqualTo(compressionManager.Engines.Count));
Assert.That(progress.OverallEnginePercentageComplete, Is.EqualTo(100));
});
}

}
}
2 changes: 1 addition & 1 deletion tests/SongsCompressor.MainManager.Tests/SongsCompressor.MainManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
Expand Down