Added Ensure.Arg.OfType() and Ensure.Arg.OfGenericType() with object argument.

src/AppCoreNet.Diagnostics.Sources/Ensure.Arg.cs

@@ -259,6 +259,42 @@
             OfType(type, typeof(TExpected), paramName);
         }
 
+        /// <summary>
+        /// Ensures that the argument is of the expected type.
+        /// </summary>
+        /// <param name="value">The argument.</param>
+        /// <param name="expectedType">The expected <see cref="Type"/>.</param>
+        /// <param name="paramName">The parameter name.</param>
+        /// <exception cref="ArgumentException">The type argument is not of the expected type.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [StackTraceHidden]
+        public static void OfType(
+            object? value,
+            Type expectedType,
+            [CallerArgumentExpression("value")] string? paramName = null)
+        {
+            if (value != null)
+            {
+                OfType(value.GetType(), expectedType, paramName);
+            }
+        }
+
+        /// <summary>
+        /// Ensures that the argument is of the expected type.
+        /// </summary>
+        /// <typeparam name="TExpected">The expected <see cref="Type"/>.</typeparam>
+        /// <param name="value">The argument.</param>
+        /// <param name="paramName">The parameter name.</param>
+        /// <exception cref="ArgumentException">The type argument is not of the expected type.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [StackTraceHidden]
+        public static void OfType<TExpected>(
+            object? value,
+            [CallerArgumentExpression("value")] string? paramName = null)
+        {
+            OfType(value, typeof(TExpected), paramName);
+        }
+
         /// <summary>
         /// Ensures that the type argument is of the expected type. Supports testing for
         /// open generic types.
@@ -303,6 +339,46 @@
             OfGenericType(type, typeof(TExpected), paramName);
         }
 
+        /// <summary>
+        /// Ensures that the argument is of the expected type. Supports testing for
+        /// open generic types.
+        /// </summary>
+        /// <param name="value">The argument.</param>
+        /// <param name="expectedType">The expected <see cref="Type"/>.</param>
+        /// <param name="paramName">The parameter name.</param>
+        /// <exception cref="ArgumentException">The type argument is not of the expected type.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [StackTraceHidden]
+        public static void OfGenericType(
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
+            object? value,
+            Type expectedType,
+            [CallerArgumentExpression("value")] string? paramName = null)
+        {
+            if (value != null)
+            {
+                OfGenericType(value.GetType(), expectedType, paramName);
+            }
+        }
+
+        /// <summary>
+        /// Ensures that the argument is of the expected type.  Supports testing for
+        /// open generic types.
+        /// </summary>
+        /// <typeparam name="TExpected">The expected <see cref="Type"/>.</typeparam>
+        /// <param name="value">The argument.</param>
+        /// <param name="paramName">The parameter name.</param>
+        /// <exception cref="ArgumentException">The type argument is not of the expected type.</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [StackTraceHidden]
+        public static void OfGenericType<TExpected>(
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
+            object? value,
+            [CallerArgumentExpression("value")] string? paramName = null)
+        {
+            OfGenericType(value, typeof(TExpected), paramName);
+        }
+
         [StackTraceHidden]
         private static bool IsAssignableTo(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]

test/AppCoreNet.Diagnostics.Tests/EnsureTests.Arg.cs

@@ -181,12 +181,39 @@
                      .Be("param");
         }
 
+        [Theory]
+        [InlineData(typeof(IEnumerable))]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(ExpectedArgBaseType))]
+        [InlineData(typeof(ExpectedArgType))]
+        public void OfTypeDoesNotThrowForRelatedValue(Type expectedType)
+        {
+            object value = new ExpectedArgType();
+            Ensure.Arg.OfType(value, expectedType, "param");
+        }
+
+        [Fact]
+        public void OfTypeThrowsForUnrelatedValue()
+        {
+            var exception = Assert.Throws<ArgumentException>(
+                () => Ensure.Arg.OfType(string.Empty, typeof(ExpectedArgType), "param"));
+
+            exception.ParamName.Should()
+                     .Be("param");
+        }
+
         [Fact]
         public void OfTypeDoesNotThrowForNullType()
         {
             Ensure.Arg.OfType(null, typeof(string));
         }
 
+        [Fact]
+        public void OfTypeDoesNotThrowForNullValue()
+        {
+            Ensure.Arg.OfType((object?)null, typeof(string));
+        }
+
         [Theory]
         [InlineData(typeof(IEnumerable))]
         [InlineData(typeof(IEnumerable<string>))]
@@ -199,12 +226,30 @@
             Ensure.Arg.OfGenericType(type, expectedType, "param");
         }
 
+        [Theory]
+        [InlineData(typeof(IEnumerable))]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(IEnumerable<>))]
+        [InlineData(typeof(ExpectedArgBaseType))]
+        [InlineData(typeof(ExpectedArgType))]
+        public void OfGenericTypeDoesNotThrowForRelatedValue(Type expectedType)
+        {
+            object value = new ExpectedArgType();
+            Ensure.Arg.OfGenericType(value, expectedType, "param");
+        }
+
         [Fact]
         public void OfGenericTypeDoesNotThrowForNullType()
         {
             Ensure.Arg.OfGenericType(null, typeof(string));
         }
 
+        [Fact]
+        public void OfGenericTypeDoesNotThrowForNullValue()
+        {
+            Ensure.Arg.OfGenericType((object?)null, typeof(string));
+        }
+
         [Fact]
         public void OfGenericTypeThrowsForUnrelatedType()
         {
@@ -214,5 +259,15 @@
             exception.ParamName.Should()
                      .Be("param");
         }
+
+        [Fact]
+        public void OfGenericTypeThrowsForUnrelatedValue()
+        {
+            var exception = Assert.Throws<ArgumentException>(
+                () => Ensure.Arg.OfGenericType(string.Empty, typeof(ExpectedArgType), "param"));
+
+            exception.ParamName.Should()
+                     .Be("param");
+        }
     }
 }