Removing use of Shouldly

SteveWilkes · SteveWilkes · commit 50d725ef229f · 2018-02-17T16:03:15.000Z
diff --git a/AgileMapper.UnitTests.NonParallel/AgileMapper.UnitTests.NonParallel.csproj b/AgileMapper.UnitTests.NonParallel/AgileMapper.UnitTests.NonParallel.csproj
@@ -39,9 +39,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Shouldly, Version=2.8.3.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
diff --git a/AgileMapper.UnitTests.NonParallel/Configuration/WhenConfiguringMappingCallbacks.cs b/AgileMapper.UnitTests.NonParallel/Configuration/WhenConfiguringMappingCallbacks.cs
@@ -3,8 +3,6 @@
     using System;
     using System.Collections.Generic;
     using TestClasses;
-    // ReSharper disable once RedundantUsingDirective
-    using Shouldly; // <- this using is required even though ReSharper thinks it isn't
     using Xunit;
 
     public class WhenConfiguringMappingCallbacks : NonParallelTestsBase
@@ -90,15 +88,15 @@ public void ShouldExecutePreAndPostMappingCallbacksForASpecifiedMemberConditiona
 
                 Mapper.Map(new Customer { Discount = 0.2m }).Over(customer1);
 
-                customersWithDiscounts.ShouldBe(new[] { customer1 });
+                customersWithDiscounts.ShouldHaveSingleItem().ShouldBe(customer1);
                 customersAdded.ShouldBe(1);
                 customersRemoved.ShouldBe(0);
 
                 var customer2 = new Customer { Discount = 0.1m };
 
                 Mapper.Map(new Customer { Discount = 0.0m }).Over(customer2);
 
-                customersWithDiscounts.ShouldBe(new[] { customer1 });
+                customersWithDiscounts.ShouldHaveSingleItem().ShouldBe(customer1);
                 customersAdded.ShouldBe(2);
                 customersRemoved.ShouldBe(1);
             });
diff --git a/AgileMapper.UnitTests.NonParallel/SimpleTypeConversion/WhenConvertingToStrings.cs b/AgileMapper.UnitTests.NonParallel/SimpleTypeConversion/WhenConvertingToStrings.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Globalization;
-    using Shouldly;
     using TestClasses;
     using Xunit;
 
diff --git a/AgileMapper.UnitTests.NonParallel/WhenValidatingMappings.cs b/AgileMapper.UnitTests.NonParallel/WhenValidatingMappings.cs
@@ -1,7 +1,6 @@
 ﻿namespace AgileObjects.AgileMapper.UnitTests.NonParallel
 {
     using TestClasses;
-    using Shouldly;
     using Validation;
     using Xunit;
 
diff --git a/AgileMapper.UnitTests.NonParallel/WhenViewingMappingPlans.cs b/AgileMapper.UnitTests.NonParallel/WhenViewingMappingPlans.cs
@@ -1,6 +1,5 @@
 ﻿namespace AgileObjects.AgileMapper.UnitTests.NonParallel
 {
-    using Shouldly;
     using TestClasses;
     using Xunit;
 
@@ -31,9 +30,9 @@ public void ShouldShowAllCachedMappingPlansViaTheStaticApi()
 
                 plan.ShouldContain("MysteryCustomer -> MysteryCustomerViewModel");
                 plan.ShouldContain("MegaProduct -> ProductDtoMega");
-                plan.ShouldContain("Rule set: CreateNew");
-                plan.ShouldContain("Rule set: Merge");
-                plan.ShouldContain("Rule set: Overwrite");
+                plan.ShouldContain("Rule Set: CreateNew");
+                plan.ShouldContain("Rule Set: Merge");
+                plan.ShouldContain("Rule Set: Overwrite");
             });
         }
     }
diff --git a/AgileMapper.UnitTests.NonParallel/packages.config b/AgileMapper.UnitTests.NonParallel/packages.config
@@ -1,6 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Shouldly" version="2.8.3" targetFramework="net461" />
   <package id="xunit" version="2.3.1" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
   <package id="xunit.analyzers" version="0.8.0" targetFramework="net461" />
diff --git a/AgileMapper.UnitTests/packages.config b/AgileMapper.UnitTests/packages.config
@@ -3,7 +3,6 @@
   <package id="AgileObjects.NetStandardPolyfills" version="1.3.0" targetFramework="net461" />
   <package id="AgileObjects.ReadableExpressions" version="1.11.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
-  <package id="Shouldly" version="2.8.3" targetFramework="net461" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
   <package id="xunit" version="2.3.1" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Globalization;`
`5`		`- using Shouldly;`
`6`	`5`	`using TestClasses;`
`7`	`6`	`using Xunit;`
`8`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace AgileObjects.AgileMapper.UnitTests.NonParallel`
`2`	`2`	`{`
`3`	`3`	`using TestClasses;`
`4`		`- using Shouldly;`
`5`	`4`	`using Validation;`
`6`	`5`	`using Xunit;`
`7`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace AgileObjects.AgileMapper.UnitTests.NonParallel`
`2`	`2`	`{`
`3`		`- using Shouldly;`
`4`	`3`	`using TestClasses;`
`5`	`4`	`using Xunit;`
`6`	`5`
`@@ -31,9 +30,9 @@ public void ShouldShowAllCachedMappingPlansViaTheStaticApi()`
`31`	`30`
`32`	`31`	`plan.ShouldContain("MysteryCustomer -> MysteryCustomerViewModel");`
`33`	`32`	`plan.ShouldContain("MegaProduct -> ProductDtoMega");`
`34`		`- plan.ShouldContain("Rule set: CreateNew");`
`35`		`- plan.ShouldContain("Rule set: Merge");`
`36`		`- plan.ShouldContain("Rule set: Overwrite");`
	`33`	`+ plan.ShouldContain("Rule Set: CreateNew");`
	`34`	`+ plan.ShouldContain("Rule Set: Merge");`
	`35`	`+ plan.ShouldContain("Rule Set: Overwrite");`
`37`	`36`	`});`
`38`	`37`	`}`
`39`	`38`	`}`