Skip to content

Commit

Permalink
(chocolatey#2893) Switch from Should to FluentAssertions
Browse files Browse the repository at this point in the history 
This switches chocolatey.tests and chocolatey.tests.integration
to use FluentAssertions instead of Should. This is because Should
is no longer actively maintained, so it is time to replace it.

As per the FluentAssertions api, various calls needed to be adjusted,
mostly in the pattern Shouldxxxx() to Should().xxxx()
  • Loading branch information
@TheCakeIsNaOH
TheCakeIsNaOH committed Nov 18, 2022
1 parent 924a785 commit 6d578dc
Show file tree
Hide file tree
Showing 56 changed files with 1,637 additions and 1,548 deletions.
42 changes: 39 additions & 3 deletions src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions, Version=6.8.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<HintPath>..\packages\FluentAssertions.6.8.0\lib\net47\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
</Reference>
Expand All @@ -85,15 +88,23 @@
<Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.13.3\lib\net40\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Should, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Should.1.1.20\lib\Should.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector, Version=2.8.3.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
<HintPath>..\packages\SimpleInjector.2.8.3\lib\net45\SimpleInjector.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll</HintPath>
</Reference>
Expand All @@ -103,6 +114,31 @@
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
4 changes: 2 additions & 2 deletions src/chocolatey.tests.integration/infrastructure.app/services/FilesServiceSpecs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace chocolatey.tests.integration.infrastructure.app.services
using chocolatey.infrastructure.services;
using Moq;
using NUnit.Framework;
using Should;
using FluentAssertions;

public class FilesServiceSpecs
{
Expand Down Expand Up @@ -101,7 +101,7 @@ public void should_log_a_warning_about_locked_files()
[Fact]
public void should_return_a_special_code_for_locked_files()
{
_result.Files.FirstOrDefault(x => x.Path == _theLockedFile).Checksum.ShouldEqual(ApplicationParameters.HashProviderFileLocked);
_result.Files.FirstOrDefault(x => x.Path == _theLockedFile).Checksum.Should().Be(ApplicationParameters.HashProviderFileLocked);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/chocolatey.tests.integration/infrastructure/commands/CommandExecutorSpecs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace chocolatey.tests.integration.infrastructure.commands
using chocolatey.infrastructure.commands;
using chocolatey.infrastructure.filesystem;
using NUnit.Framework;
using Should;
using FluentAssertions;

public class CommandExecutorSpecs
{
Expand Down Expand Up @@ -64,19 +64,19 @@ public override void Because()
[Fact]
public void should_not_return_an_exit_code_of_zero()
{
result.ShouldNotEqual(0);
result.Should().NotBe(0);
}

[Fact]
public void should_contain_error_output()
{
errorOutput.ShouldNotBeNull();
errorOutput.Should().NotBeNull();
}

[Fact]
public void should_message_the_error()
{
errorOutput.ShouldEqual("'bob123123' is not recognized as an internal or external command,operable program or batch file.");
errorOutput.Should().Be("'bob123123' is not recognized as an internal or external command,operable program or batch file.");
}
}

Expand All @@ -102,7 +102,7 @@ public override void Because()
[Fact]
public void should_have_an_error_message()
{
result.ShouldNotBeNull();
result.Should().NotBeNull();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/chocolatey.tests.integration/infrastructure/cryptography/CryptoHashProviderSpecs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace chocolatey.tests.integration.infrastructure.cryptography
using System.Security.Cryptography;
using chocolatey.infrastructure.cryptography;
using chocolatey.infrastructure.filesystem;
using Should;
using FluentAssertions;

public class CryptoHashProviderSpecs
{
Expand Down Expand Up @@ -60,7 +60,7 @@ public void should_provide_the_correct_hash_based_on_a_checksum()
{
var expected = BitConverter.ToString(SHA256.Create().ComputeHash(File.ReadAllBytes(filePath))).Replace("-", string.Empty);

result.ShouldEqual(expected);
result.Should().Be(expected);
}
}
}
Expand Down
58 changes: 28 additions & 30 deletions src/chocolatey.tests.integration/infrastructure/filesystem/DotNetFileSystemSpecs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace chocolatey.tests.integration.infrastructure.filesystem
using chocolatey.infrastructure.filesystem;
using chocolatey.infrastructure.platforms;
using NUnit.Framework;
using Should;
using FluentAssertions;

public class DotNetFileSystemSpecs
{
Expand Down Expand Up @@ -60,41 +60,39 @@ public override void Because()
[Fact]
public void GetExecutablePath_should_find_existing_executable()
{
FileSystem.get_executable_path("cmd").ShouldEqual(
FileSystem.get_executable_path("cmd").Should().BeEquivalentTo(
Platform.get_platform() == PlatformType.Windows
? "C:\\Windows\\system32\\cmd.exe"
: "cmd",
StringComparer.OrdinalIgnoreCase
: "cmd"
);
}

[Fact]
public void GetExecutablePath_should_find_existing_executable_with_extension()
{
FileSystem.get_executable_path("cmd.exe").ShouldEqual(
FileSystem.get_executable_path("cmd.exe").Should().BeEquivalentTo(
Platform.get_platform() == PlatformType.Windows
? "c:\\windows\\system32\\cmd.exe"
: "cmd.exe",
StringComparer.OrdinalIgnoreCase
: "cmd.exe"
);
}

[Fact]
public void GetExecutablePath_should_return_same_value_when_executable_is_not_found()
{
FileSystem.get_executable_path("daslakjsfdasdfwea").ShouldEqual("daslakjsfdasdfwea");
FileSystem.get_executable_path("daslakjsfdasdfwea").Should().Be("daslakjsfdasdfwea");
}

[Fact]
public void GetExecutablePath_should_return_empty_string_when_value_is_null()
{
FileSystem.get_executable_path(null).ShouldEqual(string.Empty);
FileSystem.get_executable_path(null).Should().Be(string.Empty);
}

[Fact]
public void GetExecutablePath_should_return_empty_string_when_value_is_empty_string()
{
FileSystem.get_executable_path(string.Empty).ShouldEqual(string.Empty);
FileSystem.get_executable_path(string.Empty).Should().Be(string.Empty);
}
}

Expand Down Expand Up @@ -122,7 +120,7 @@ public override void Because()
[Fact]
public void GetFiles_should_return_string_array_of_files()
{
FileSystem.get_files(ContextPath, "*lipsum*", SearchOption.AllDirectories).ShouldEqual(FileArray);
FileSystem.get_files(ContextPath, "*lipsum*", SearchOption.AllDirectories).Should().BeEquivalentTo(FileArray);
}

[Fact]
Expand All @@ -134,8 +132,8 @@ public void GetFiles_should_return_files_that_meet_the_pattern()
var actual = FileSystem.get_files(ContextPath, "chocolateyInstall.ps1", SearchOption.AllDirectories).ToList();
FileSystem.delete_file(filePath);

actual.ShouldNotBeEmpty();
actual.Count().ShouldEqual(1);
actual.Should().NotBeEmpty();
actual.Count().Should().Be(1);
}

[Fact]
Expand All @@ -149,44 +147,44 @@ public void GetFiles_should_return_files_that_meet_the_pattern_regardless_of_cas
var actual = FileSystem.get_files(ContextPath, "chocolateyinstall.ps1", SearchOption.AllDirectories).ToList();
FileSystem.delete_file(filePath);

actual.ShouldNotBeEmpty();
actual.Count().ShouldEqual(1);
actual.Should().NotBeEmpty();
actual.Count().Should().Be(1);
}

[Fact]
public void FileExists_should_return_true_if_file_exists()
{
FileSystem.file_exists(TheTestFile).ShouldBeTrue();
FileSystem.file_exists(TheTestFile).Should().BeTrue();
}

[Fact]
public void FileExists_should_return_false_if_file_does_not_exists()
{
FileSystem.file_exists(Path.Combine(ContextPath, "IDontExist.txt")).ShouldBeFalse();
FileSystem.file_exists(Path.Combine(ContextPath, "IDontExist.txt")).Should().BeFalse();
}

[Fact]
public void DirectoryExists_should_return_true_if_directory_exists()
{
FileSystem.directory_exists(ContextPath).ShouldBeTrue();
FileSystem.directory_exists(ContextPath).Should().BeTrue();
}

[Fact]
public void DirectoryExists_should_return_false_if_directory_does_not_exist()
{
FileSystem.directory_exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "IDontExist")).ShouldBeFalse();
FileSystem.directory_exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "IDontExist")).Should().BeFalse();
}

[Fact]
public void GetFileSize_should_return_correct_file_size()
{
FileSystem.get_file_size(TheTestFile).ShouldEqual(5377);
FileSystem.get_file_size(TheTestFile).Should().Be(5377);
}

[Fact]
public void GetDirectories_should_return_a_string_array_with_directories()
{
FileSystem.get_directories(ContextPath).ShouldEqual(DirectoryArray);
FileSystem.get_directories(ContextPath).Should().BeEquivalentTo(DirectoryArray);
}
}

Expand All @@ -210,7 +208,7 @@ public override void Because()
[Fact]
public void visible_file_should_now_be_hidden()
{
((FileAttributes)FileSystem.get_file_info_for(SourceFile).Attributes & FileAttributes.Hidden).ShouldEqual(FileAttributes.Hidden);
((FileAttributes)FileSystem.get_file_info_for(SourceFile).Attributes & FileAttributes.Hidden).Should().Be(FileAttributes.Hidden);
}

public override void AfterObservations()
Expand Down Expand Up @@ -238,7 +236,7 @@ public override void Because()
[Fact]
public void readonly_file_should_no_longer_be_readonly()
{
((FileAttributes)FileSystem.get_file_info_for(SourceFile).Attributes & FileAttributes.ReadOnly).ShouldNotEqual(FileAttributes.ReadOnly);
((FileAttributes)FileSystem.get_file_info_for(SourceFile).Attributes & FileAttributes.ReadOnly).Should().NotBe(FileAttributes.ReadOnly);
}
}

Expand All @@ -263,13 +261,13 @@ public override void Because()
[Fact]
public void Move_me_text_file_should_not_exist_in_the_source_path()
{
FileSystem.file_exists(SourceFile).ShouldBeFalse();
FileSystem.file_exists(SourceFile).Should().BeFalse();
}

[Fact]
public void Move_me_text_file_should_exist_in_destination_path()
{
FileSystem.file_exists(DestFile).ShouldBeTrue();
FileSystem.file_exists(DestFile).Should().BeTrue();
}
}

Expand Down Expand Up @@ -297,13 +295,13 @@ public override void Because()
[Fact]
public void Copy_me_text_file_should_exist_in_context_path()
{
FileSystem.file_exists(SourceFile).ShouldBeTrue();
FileSystem.file_exists(SourceFile).Should().BeTrue();
}

[Fact]
public void Move_me_text_file_should_exist_in_destination_path()
{
FileSystem.file_exists(DestFile).ShouldBeTrue();
FileSystem.file_exists(DestFile).Should().BeTrue();
}
}

Expand All @@ -326,7 +324,7 @@ public override void Because()
[Fact]
public void delete_me_text_file_should_not_exist()
{
FileSystem.file_exists(DeleteFile).ShouldBeFalse();
FileSystem.file_exists(DeleteFile).Should().BeFalse();
}
}

Expand All @@ -346,7 +344,7 @@ public override void Because()
[Fact]
public void test_directory_should_exist()
{
FileSystem.directory_exists(TestDirectory).ShouldBeTrue();
FileSystem.directory_exists(TestDirectory).Should().BeTrue();
}
}

Expand All @@ -362,7 +360,7 @@ public override void Because()
[Fact]
public void should_have_correct_modified_date()
{
FileSystem.get_file_modified_date(TheTestFile).ToShortDateString().ShouldEqual(DateTime.Now.AddDays(-1).ToShortDateString());
FileSystem.get_file_modified_date(TheTestFile).ToShortDateString().Should().Be(DateTime.Now.AddDays(-1).ToShortDateString());
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/chocolatey.tests.integration/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="6.8.0" targetFramework="net48" />
<package id="log4net" version="2.0.12" targetFramework="net48" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
Expand All @@ -8,6 +9,12 @@
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net48" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net48" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net48" />
<package id="Should" version="1.1.20" targetFramework="net48" />
<package id="SimpleInjector" version="2.8.3" targetFramework="net48" />
<package id="System.IO" version="4.3.0" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
</packages>
Loading

0 comments on commit 6d578dc

Please sign in to comment.