nunit#258: Deal with untyped Tasks

manfred-brands · Jul 13, 2020 · 15fb7d2 · 15fb7d2
1 parent aab0b1f
commit 15fb7d2
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/src/nunit.analyzers.tests/EqualToIncompatibleTypes/EqualToIncompatibleTypesAnalyzerTests.cs b/src/nunit.analyzers.tests/EqualToIncompatibleTypes/EqualToIncompatibleTypesAnalyzerTests.cs
@@ -809,5 +809,26 @@ public void NoDiagnosticWhenCombinedConstraintAndUseAllOperator()
 
             AnalyzerAssert.Valid(analyzer, testCode);
         }
+
+        [Test]
+        public void NoDiagnosticWhenComparingTask()
+        {
+            var testCode = TestUtility.WrapInAsyncTestMethod(@"
+                Task wait = Task.CompletedTask;
+                Assert.That(await Task.WhenAny(wait).ConfigureAwait(false), Is.EqualTo(wait));");
+
+            AnalyzerAssert.Valid(analyzer, testCode);
+        }
+
+        [Test]
+        public void NoDiagnosticWhenComparingTask2()
+        {
+            var testCode = TestUtility.WrapInTestMethod(@"
+                Task task1 = Task.CompletedTask;
+                Task task2 = Task.CompletedTask;
+                Assert.That(task1, Is.SameAs(task2));");
+
+            AnalyzerAssert.Valid(analyzer, testCode);
+        }
     }
 }
diff --git a/src/nunit.analyzers.tests/NullConstraintUsage/NullConstraintUsageAnalyzerTests.cs b/src/nunit.analyzers.tests/NullConstraintUsage/NullConstraintUsageAnalyzerTests.cs
@@ -84,5 +84,16 @@ public void TestMethod()
 
             AnalyzerAssert.Valid(analyzer, testCode);
         }
+
+        [TestCase("Is.Null")]
+        [TestCase("Is.Not.Null")]
+        public void ValidWhenActualIsTask(string constraint)
+        {
+            var testCode = TestUtility.WrapInTestMethod($@"
+                var task = Task.CompletedTask;
+                Assert.That(task, {constraint});");
+
+            AnalyzerAssert.Valid(analyzer, testCode);
+        }
     }
 }
diff --git a/src/nunit.analyzers.tests/TestUtility.cs b/src/nunit.analyzers.tests/TestUtility.cs
@@ -39,5 +39,14 @@ public void TestMethod()
         {{{code}
         }}", additionalUsings);
         }
+
+        internal static string WrapInAsyncTestMethod(string code, string additionalUsings = null)
+        {
+            return WrapMethodInClassNamespaceAndAddUsings($@"
+        [Test]
+        public async Task TestMethod()
+        {{{code}
+        }}", additionalUsings);
+        }
     }
 }
diff --git a/src/nunit.analyzers/Helpers/AssertHelper.cs b/src/nunit.analyzers/Helpers/AssertHelper.cs
@@ -46,7 +46,7 @@ public static ITypeSymbol UnwrapActualType(ITypeSymbol actualType)
             if (actualType is INamedTypeSymbol namedType && namedType.DelegateInvokeMethod != null)
                 actualType = namedType.DelegateInvokeMethod.ReturnType;
 
-            if (actualType.IsAwaitable(out var awaitReturnType))
+            if (actualType.IsAwaitable(out var awaitReturnType) && awaitReturnType.SpecialType != SpecialType.System_Void)
                 actualType = awaitReturnType;
 
             return actualType;