Remove original workaround suggested in devlooped/moq#918

eduherminio · Nov 12, 2020 · 3647e4e · 3647e4e
1 parent 5b1dcbd
commit 3647e4e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/SheepTools.Moq/MoqGenericLoggerExtensions.cs b/src/SheepTools.Moq/MoqGenericLoggerExtensions.cs
@@ -95,9 +95,9 @@ public static void VerifyLog<T>(this Mock<ILogger<T>> loggerMock, LogLevel level
             loggerMock.Verify(l => l.Log(
                     level,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((_, __) => true),
+                    It.IsAny<It.IsAnyType>(),
                     It.IsAny<TException>(),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -110,7 +110,7 @@ public static void VerifyLog<T>(this Mock<ILogger<T>> loggerMock, LogLevel level
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.IsAny<TException>(),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -123,7 +123,7 @@ public static void VerifyLog<T>(this Mock<ILogger<T>> loggerMock, LogLevel level
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.Is<TException>(e => (e != null ? e.GetHashCode() : -1) == ex.GetHashCode()),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -136,7 +136,7 @@ public static void VerifyLog<T>(this Mock<ILogger<T>> loggerMock, LogLevel level
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.Is<TException>(e => (e != null ? e.GetHashCode() : -1) == ex.GetHashCode()),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }

diff --git a/src/SheepTools.Moq/MoqLoggerExtensions.cs b/src/SheepTools.Moq/MoqLoggerExtensions.cs
@@ -95,9 +95,9 @@ public static void VerifyLog<TException>(this Mock<ILogger> loggerMock, LogLevel
             loggerMock.Verify(l => l.Log(
                     level,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((_, __) => true),
+                    It.IsAny<It.IsAnyType>(),
                     It.IsAny<TException>(),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -110,7 +110,7 @@ public static void VerifyLog<TException>(this Mock<ILogger> loggerMock, LogLevel
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.IsAny<TException>(),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -123,7 +123,7 @@ public static void VerifyLog<TException>(this Mock<ILogger> loggerMock, TExcepti
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.Is<TException>(e => (e != null ? e.GetHashCode() : -1) == ex.GetHashCode()),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }
@@ -136,7 +136,7 @@ public static void VerifyLog<TException>(this Mock<ILogger> loggerMock, LogLevel
                     It.IsAny<EventId>(),
                     It.Is<It.IsAnyType>((object v, Type _) => v != null && v.ToString() != null && v!.ToString()!.Contains(message)),
                     It.Is<TException>(e => (e != null ? e.GetHashCode() : -1) == ex.GetHashCode()),
-                    It.Is<Func<It.IsAnyType, Exception, string>>((_, __) => true)),
+                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
                 times,
                 failMessage);
         }