✨ add support for comparing nullable int/long values with enums

- early fail for null value
- otherwise just the same :D

src/NExpect.Matchers.AspNetCore.Tests/GlobalUsings.cs

@@ -1,4 +1,5 @@
 global using NExpect;
 global using NUnit.Framework;
 global using static NExpect.AspNetCoreExpectations;
-global using static NExpect.Expectations;
+global using static NExpect.Expectations;
+global using static PeanutButter.RandomGenerators.RandomValueGen;

src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj

@@ -15,8 +15,8 @@
     <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
-    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.244" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.265" />
+    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.265" />
     <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
   </ItemGroup>
 

src/NExpect.Matchers.AspNetCore.Tests/StatusCodeTests.cs

@@ -0,0 +1,47 @@
+using System.Net;
+using PeanutButter.TestUtils.AspNetCore.Builders;
+
+namespace NExpect.Matchers.AspNet.Tests
+{
+    [TestFixture]
+    public class StatusCodeTests
+    {
+        [Test]
+        public void LiveIssue_ComparingResponseStatusCodeToEnum()
+        {
+            // Arrange
+            var statusCode = GetRandom<HttpStatusCode>();
+            var res = HttpResponseBuilder.Create()
+                .WithStatusCode(statusCode)
+                .Build();
+            // Act
+            Assert.That(
+                () =>
+                {
+                    Expect(res.StatusCode)
+                        .To.Equal(statusCode);
+                },
+                Throws.Nothing
+            );
+            // Assert
+        }
+
+        [Test]
+        public void LiveIssue_NullableLongVsEnum()
+        {
+            // Arrange
+            var statusCode = GetRandom<HttpStatusCode>();
+            var res = HttpResponseBuilder.Create()
+                .WithStatusCode(statusCode)
+                .Build();
+            long? testMe = res.StatusCode;
+            // Act
+            Assert.That(() =>
+            {
+                Expect(testMe)
+                    .To.Equal(statusCode);
+            }, Throws.Nothing);
+            // Assert
+        }
+    }
+}

src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj

@@ -76,7 +76,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0"/>
-    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.244"/>
+    <PackageReference Include="PeanutButter.TestUtils.AspNetCore" Version="3.0.265"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NExpect\NExpect.csproj"/>

src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.265" />
     <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
   </ItemGroup>
 

src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj

@@ -12,8 +12,8 @@
         <PackageReference Include="nunit" Version="4.0.1" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
-        <PackageReference Include="PeanutButter.Utils" Version="3.0.244" />
+        <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.265" />
+        <PackageReference Include="PeanutButter.Utils" Version="3.0.265" />
         <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
     </ItemGroup>
 

src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj

@@ -11,7 +11,7 @@
   <PackageReference Include="nunit" Version="4.0.1" />
   <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-  <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+  <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.265" />
   <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
 </ItemGroup>
 

src/NExpect.Tests/GlobalUsings.cs

@@ -1,2 +1,3 @@
 global using NExpect;
-global using static NExpect.Expectations;
+global using static NExpect.Expectations;
+global using static PeanutButter.RandomGenerators.RandomValueGen;

src/NExpect.Tests/NExpect.Tests.csproj

@@ -9,8 +9,8 @@
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="nunit" Version="4.0.1" />
     <PackageReference Include="nunit3testadapter" Version="4.5.0" />
-    <PackageReference Include="PeanutButter.DuckTyping" Version="3.0.244" />
-    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.244" />
+    <PackageReference Include="PeanutButter.DuckTyping" Version="3.0.265" />
+    <PackageReference Include="PeanutButter.RandomGenerators" Version="3.0.265" />
     <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
     <PackageReference Include="system.valuetuple" Version="4.5.0" />
   </ItemGroup>

src/NExpect/IntsAndEnumsMatchers.cs

@@ -4,6 +4,7 @@
 using NExpect.Interfaces;
 using NExpect.MatcherLogic;
 using static NExpect.Implementations.MessageHelpers;
+
 // ReSharper disable MemberCanBePrivate.Global
 
 
@@ -385,6 +386,193 @@ Func<string> customMessageGenerator
         );
     }
 
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this ITo<long?> to,
+        T enumValue
+    ) where T : Enum
+    {
+        return to.Equal(enumValue, NULL_STRING);
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessage"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this ITo<long?> to,
+        T enumValue,
+        string customMessage
+    ) where T : Enum
+    {
+        return to.Equal(
+            enumValue,
+            () => customMessage
+        );
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessageGenerator"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this ITo<long?> to,
+        T enumValue,
+        Func<string> customMessageGenerator
+    ) where T : Enum
+    {
+        return to.AddMatcher(
+            actual =>
+                VerifyEquality(
+                    enumValue,
+                    actual,
+                    customMessageGenerator,
+                    comparingEnumToInt: false
+                )
+        );
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this IToAfterNot<long?> to,
+        T enumValue
+    ) where T : Enum
+    {
+        return to.Equal(enumValue, NULL_STRING);
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessage"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this IToAfterNot<long?> to,
+        T enumValue,
+        string customMessage
+    ) where T : Enum
+    {
+        return to.Equal(
+            enumValue,
+            () => customMessage
+        );
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessageGenerator"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this IToAfterNot<long?> to,
+        T enumValue,
+        Func<string> customMessageGenerator
+    ) where T : Enum
+    {
+        return to.AddMatcher(
+            actual => VerifyEquality(
+                enumValue,
+                actual,
+                customMessageGenerator,
+                comparingEnumToInt: false
+            )
+        );
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this INotAfterTo<long?> to,
+        T enumValue
+    ) where T : Enum
+    {
+        return to.Equal(enumValue, NULL_STRING);
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessage"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this INotAfterTo<long?> to,
+        T enumValue,
+        string customMessage
+    ) where T : Enum
+    {
+        return to.Equal(
+            enumValue,
+            () => customMessage
+        );
+    }
+
+    /// <summary>
+    /// Tests if the provided integer value is equal
+    /// to the provided enum value
+    /// </summary>
+    /// <param name="to"></param>
+    /// <param name="enumValue"></param>
+    /// <param name="customMessageGenerator"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IMore<long?> Equal<T>(
+        this INotAfterTo<long?> to,
+        T enumValue,
+        Func<string> customMessageGenerator
+    ) where T : Enum
+    {
+        return to.AddMatcher(
+            actual => VerifyEquality(
+                enumValue,
+                actual,
+                customMessageGenerator,
+                comparingEnumToInt: false
+            )
+        );
+    }
+
 
     private static IMore<T> ResolveResult<T>(
         this ICanAddMatcher<T> canAddMatcher,
@@ -405,11 +593,20 @@ bool comparingEnumToInt
 
     private static IMatcherResult VerifyEquality<T>(
         T enumValue,
-        long intValue,
+        long? nullableIntValue,
         Func<string> customMessageGenerator,
         bool comparingEnumToInt
     ) where T : Enum
     {
+        if (nullableIntValue is null)
+        {
+            return new EnforcedMatcherResult(
+                false,
+                () => "Cannot compare null with an enum value"
+            );
+        }
+
+        var intValue = nullableIntValue.Value;
         var earlyFail = VerifyWithinRange<T>(intValue, customMessageGenerator);
         if (earlyFail is not null)
         {