Merge pull request #3371 from icsharpcode/fix/fabegone

siegfriedpammer · web-flow · commit 15d8ed1ffede · 2025-01-16T09:52:59.000+01:00
Switch from FA to Shouldly
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,7 +9,6 @@
     <PackageVersion Include="DataGridExtensions" Version="2.6.0" />
     <PackageVersion Include="DiffLib" Version="2025.0.0" />
     <PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
-    <PackageVersion Include="FluentAssertions" Version="7.0.0" /><!-- License change from 7 to 8, we need to stay on 7 -->
     <PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="9.0.1-rtm.24557.9" />
     <PackageVersion Include="Iced" Version="1.21.0" />
     <PackageVersion Include="JunitXml.TestLogger" Version="5.0.0" />
@@ -39,6 +38,7 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
+    <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="System.Composition.AttributedModel" Version="9.0.1" />
     <PackageVersion Include="System.Collections.Immutable" Version="9.0.1" />
     <PackageVersion Include="System.Memory" Version="4.6.0" />
diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -67,7 +67,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit" />
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Shouldly" />
     <PackageReference Include="JunitXml.TestLogger" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Memory" />
diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
@@ -39,7 +39,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Shouldly" />
     <PackageReference Include="JunitXml.TestLogger" />
     <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
diff --git a/ILSpy.Tests/CommandLineArgumentsTests.cs b/ILSpy.Tests/CommandLineArgumentsTests.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-using FluentAssertions;
+using Shouldly;
 
 using ICSharpCode.ILSpy.AppEnv;
 
@@ -16,88 +16,89 @@ public void VerifyEmptyArgumentsArray()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { });
 
-			cmdLineArgs.AssembliesToLoad.Should().BeEmpty();
-			cmdLineArgs.SingleInstance.Should().BeNull();
-			cmdLineArgs.NavigateTo.Should().BeNull();
-			cmdLineArgs.Search.Should().BeNull();
-			cmdLineArgs.Language.Should().BeNull();
-			cmdLineArgs.NoActivate.Should().BeFalse();
-			cmdLineArgs.ConfigFile.Should().BeNull();
+			cmdLineArgs.AssembliesToLoad.ShouldBeEmpty();
+			cmdLineArgs.SingleInstance.ShouldBeNull();
+			cmdLineArgs.NavigateTo.ShouldBeNull();
+			cmdLineArgs.Search.ShouldBeNull();
+			cmdLineArgs.Language.ShouldBeNull();
+			cmdLineArgs.NoActivate.ShouldBeFalse();
+			cmdLineArgs.ConfigFile.ShouldBeNull();
 		}
 
 		[Test]
 		public void VerifyHelpOption()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--help" });
-			cmdLineArgs.ArgumentsParser.IsShowingInformation.Should().BeTrue();
+			cmdLineArgs.ArgumentsParser.IsShowingInformation.ShouldBeTrue();
 		}
 
 		[Test]
 		public void VerifyForceNewInstanceOption()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--newinstance" });
-			cmdLineArgs.SingleInstance.Should().BeFalse();
+			cmdLineArgs.SingleInstance.ShouldNotBeNull();
+			cmdLineArgs.SingleInstance.Value.ShouldBeFalse();
 		}
 
 		[Test]
 		public void VerifyNavigateToOption()
 		{
 			const string navigateTo = "MyNamespace.MyClass";
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateto", navigateTo });
-			cmdLineArgs.NavigateTo.Should().BeEquivalentTo(navigateTo);
+			cmdLineArgs.NavigateTo.ShouldBe(navigateTo);
 		}
 
 		[Test]
 		public void VerifyNavigateToOption_NoneTest_Matching_VSAddin()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateto:none" });
-			cmdLineArgs.NavigateTo.Should().BeEquivalentTo("none");
+			cmdLineArgs.NavigateTo.ShouldBe("none");
 		}
 
 		[Test]
 		public void VerifyCaseSensitivityOfOptionsDoesntThrow()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateTo:none" });
 
-			cmdLineArgs.ArgumentsParser.RemainingArguments.Should().HaveCount(1);
+			cmdLineArgs.ArgumentsParser.RemainingArguments.Count.ShouldBe(1);
 		}
 
 		[Test]
 		public void VerifySearchOption()
 		{
 			const string searchWord = "TestContainers";
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--search", searchWord });
-			cmdLineArgs.Search.Should().BeEquivalentTo(searchWord);
+			cmdLineArgs.Search.ShouldBe(searchWord);
 		}
 
 		[Test]
 		public void VerifyLanguageOption()
 		{
 			const string language = "csharp";
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--language", language });
-			cmdLineArgs.Language.Should().BeEquivalentTo(language);
+			cmdLineArgs.Language.ShouldBe(language);
 		}
 
 		[Test]
 		public void VerifyConfigOption()
 		{
 			const string configFile = "myilspyoptions.xml";
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--config", configFile });
-			cmdLineArgs.ConfigFile.Should().BeEquivalentTo(configFile);
+			cmdLineArgs.ConfigFile.ShouldBe(configFile);
 		}
 
 		[Test]
 		public void VerifyNoActivateOption()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "--noactivate" });
-			cmdLineArgs.NoActivate.Should().BeTrue();
+			cmdLineArgs.NoActivate.ShouldBeTrue();
 		}
 
 		[Test]
 		public void MultipleAssembliesAsArguments()
 		{
 			var cmdLineArgs = CommandLineArguments.Create(new string[] { "assembly1", "assembly2", "assembly3" });
-			cmdLineArgs.AssembliesToLoad.Should().HaveCount(3);
+			cmdLineArgs.AssembliesToLoad.Count.ShouldBe(3);
 		}
 
 		[Test]
@@ -117,9 +118,10 @@ public void PassAtFileArguments()
 			{
 			}
 
-			cmdLineArgs.SingleInstance.Should().BeFalse();
-			cmdLineArgs.NoActivate.Should().BeTrue();
-			cmdLineArgs.AssembliesToLoad.Should().HaveCount(3);
+			cmdLineArgs.SingleInstance.ShouldNotBeNull();
+			cmdLineArgs.SingleInstance.Value.ShouldBeFalse();
+			cmdLineArgs.NoActivate.ShouldBeTrue();
+			cmdLineArgs.AssembliesToLoad.Count.ShouldBe(3);
 		}
 	}
 }
diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj
@@ -74,7 +74,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit" />
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Shouldly" />
     <PackageReference Include="JunitXml.TestLogger" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-using FluentAssertions;`
	`3`	`+using Shouldly;`
`4`	`4`
`5`	`5`	`using ICSharpCode.ILSpy.AppEnv;`
`6`	`6`
`@@ -16,88 +16,89 @@ public void VerifyEmptyArgumentsArray()`
`16`	`16`	`{`
`17`	`17`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { });`
`18`	`18`
`19`		`- cmdLineArgs.AssembliesToLoad.Should().BeEmpty();`
`20`		`- cmdLineArgs.SingleInstance.Should().BeNull();`
`21`		`- cmdLineArgs.NavigateTo.Should().BeNull();`
`22`		`- cmdLineArgs.Search.Should().BeNull();`
`23`		`- cmdLineArgs.Language.Should().BeNull();`
`24`		`- cmdLineArgs.NoActivate.Should().BeFalse();`
`25`		`- cmdLineArgs.ConfigFile.Should().BeNull();`
	`19`	`+ cmdLineArgs.AssembliesToLoad.ShouldBeEmpty();`
	`20`	`+ cmdLineArgs.SingleInstance.ShouldBeNull();`
	`21`	`+ cmdLineArgs.NavigateTo.ShouldBeNull();`
	`22`	`+ cmdLineArgs.Search.ShouldBeNull();`
	`23`	`+ cmdLineArgs.Language.ShouldBeNull();`
	`24`	`+ cmdLineArgs.NoActivate.ShouldBeFalse();`
	`25`	`+ cmdLineArgs.ConfigFile.ShouldBeNull();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[Test]`
`29`	`29`	`public void VerifyHelpOption()`
`30`	`30`	`{`
`31`	`31`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--help" });`
`32`		`- cmdLineArgs.ArgumentsParser.IsShowingInformation.Should().BeTrue();`
	`32`	`+ cmdLineArgs.ArgumentsParser.IsShowingInformation.ShouldBeTrue();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[Test]`
`36`	`36`	`public void VerifyForceNewInstanceOption()`
`37`	`37`	`{`
`38`	`38`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--newinstance" });`
`39`		`- cmdLineArgs.SingleInstance.Should().BeFalse();`
	`39`	`+ cmdLineArgs.SingleInstance.ShouldNotBeNull();`
	`40`	`+ cmdLineArgs.SingleInstance.Value.ShouldBeFalse();`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`[Test]`
`43`	`44`	`public void VerifyNavigateToOption()`
`44`	`45`	`{`
`45`	`46`	`const string navigateTo = "MyNamespace.MyClass";`
`46`	`47`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateto", navigateTo });`
`47`		`- cmdLineArgs.NavigateTo.Should().BeEquivalentTo(navigateTo);`
	`48`	`+ cmdLineArgs.NavigateTo.ShouldBe(navigateTo);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`[Test]`
`51`	`52`	`public void VerifyNavigateToOption_NoneTest_Matching_VSAddin()`
`52`	`53`	`{`
`53`	`54`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateto:none" });`
`54`		`- cmdLineArgs.NavigateTo.Should().BeEquivalentTo("none");`
	`55`	`+ cmdLineArgs.NavigateTo.ShouldBe("none");`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`[Test]`
`58`	`59`	`public void VerifyCaseSensitivityOfOptionsDoesntThrow()`
`59`	`60`	`{`
`60`	`61`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--navigateTo:none" });`
`61`	`62`
`62`		`- cmdLineArgs.ArgumentsParser.RemainingArguments.Should().HaveCount(1);`
	`63`	`+ cmdLineArgs.ArgumentsParser.RemainingArguments.Count.ShouldBe(1);`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`[Test]`
`66`	`67`	`public void VerifySearchOption()`
`67`	`68`	`{`
`68`	`69`	`const string searchWord = "TestContainers";`
`69`	`70`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--search", searchWord });`
`70`		`- cmdLineArgs.Search.Should().BeEquivalentTo(searchWord);`
	`71`	`+ cmdLineArgs.Search.ShouldBe(searchWord);`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`[Test]`
`74`	`75`	`public void VerifyLanguageOption()`
`75`	`76`	`{`
`76`	`77`	`const string language = "csharp";`
`77`	`78`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--language", language });`
`78`		`- cmdLineArgs.Language.Should().BeEquivalentTo(language);`
	`79`	`+ cmdLineArgs.Language.ShouldBe(language);`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`[Test]`
`82`	`83`	`public void VerifyConfigOption()`
`83`	`84`	`{`
`84`	`85`	`const string configFile = "myilspyoptions.xml";`
`85`	`86`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--config", configFile });`
`86`		`- cmdLineArgs.ConfigFile.Should().BeEquivalentTo(configFile);`
	`87`	`+ cmdLineArgs.ConfigFile.ShouldBe(configFile);`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`[Test]`
`90`	`91`	`public void VerifyNoActivateOption()`
`91`	`92`	`{`
`92`	`93`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "--noactivate" });`
`93`		`- cmdLineArgs.NoActivate.Should().BeTrue();`
	`94`	`+ cmdLineArgs.NoActivate.ShouldBeTrue();`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`[Test]`
`97`	`98`	`public void MultipleAssembliesAsArguments()`
`98`	`99`	`{`
`99`	`100`	`var cmdLineArgs = CommandLineArguments.Create(new string[] { "assembly1", "assembly2", "assembly3" });`
`100`		`- cmdLineArgs.AssembliesToLoad.Should().HaveCount(3);`
	`101`	`+ cmdLineArgs.AssembliesToLoad.Count.ShouldBe(3);`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`[Test]`
`@@ -117,9 +118,10 @@ public void PassAtFileArguments()`
`117`	`118`	`{`
`118`	`119`	`}`
`119`	`120`
`120`		`- cmdLineArgs.SingleInstance.Should().BeFalse();`
`121`		`- cmdLineArgs.NoActivate.Should().BeTrue();`
`122`		`- cmdLineArgs.AssembliesToLoad.Should().HaveCount(3);`
	`121`	`+ cmdLineArgs.SingleInstance.ShouldNotBeNull();`
	`122`	`+ cmdLineArgs.SingleInstance.Value.ShouldBeFalse();`
	`123`	`+ cmdLineArgs.NoActivate.ShouldBeTrue();`
	`124`	`+ cmdLineArgs.AssembliesToLoad.Count.ShouldBe(3);`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`	`}`