Merge pull request #1002 from manfred-brands/Issue1001_AsyncDisposable

Also recognized DisposeAsync for rule NUnit1028

Author: mikkelbu

src/nunit.analyzers.tests/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzerTests.cs

@@ -173,6 +173,59 @@ public override void Dispose() { }
             RoslynAssert.Valid(analyzer, testCode);
         }
 
+        [Test]
+        public void AnalyzeWhenMethodIsExplicitDisposeAsync()
+        {
+            var testCode = TestUtility.WrapClassInNamespaceAndAddUsing(@"
+        public sealed class TestClass : IAsyncDisposable
+        {
+            [Test]
+            public void TestMethod() { }
+
+            ValueTask IAsyncDisposable.DisposeAsync() => default(ValueTask);
+        }
+        ");
+
+            RoslynAssert.Valid(analyzer, testCode);
+        }
+
+        [Test]
+        public void AnalyzeWhenMethodIsDisposeAsync()
+        {
+            var testCode = TestUtility.WrapClassInNamespaceAndAddUsing(@"
+        public sealed class TestClass : IAsyncDisposable
+        {
+            [Test]
+            public void TestMethod() { }
+
+            public ValueTask DisposeAsync() => default(ValueTask);
+        }
+        ");
+
+            RoslynAssert.Valid(analyzer, testCode);
+        }
+
+        [Test]
+        public void AnalyzeWhenMethodIsDisposeAsyncOverride()
+        {
+            var testCode = TestUtility.WrapClassInNamespaceAndAddUsing(@"
+        public class BaseClass : IAsyncDisposable
+        {
+            public virtual ValueTask DisposeAsync() => default(ValueTask);
+        }
+
+        public sealed class DerivedClass : BaseClass
+        {
+            [Test]
+            public void TestMethod() { }
+
+            public override ValueTask DisposeAsync() => default(ValueTask);
+        }
+        ");
+
+            RoslynAssert.Valid(analyzer, testCode);
+        }
+
         [Test]
         public void AnalyzeWhenMethodIsBaseClassOverride()
         {

src/nunit.analyzers.tests/SetUpFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using Gu.Roslyn.Asserts;
 using Microsoft.CodeAnalysis.CSharp;
 using NUnit.Framework;
@@ -16,10 +17,10 @@ public void SetDefaults()
         {
             Settings.Default = Settings.Default
 #if NUNIT4
-                .WithMetadataReferences(MetadataReferences.Transitive(typeof(Assert), typeof(ClassicAssert)))
+                .WithMetadataReferences(MetadataReferences.Transitive(typeof(Assert), typeof(ClassicAssert), typeof(IAsyncDisposable)))
                 .WithParseOption(new CSharpParseOptions(LanguageVersion.Preview).WithPreprocessorSymbols("NUNIT4"));
 #else
-                .WithMetadataReferences(MetadataReferences.Transitive(typeof(Assert)))
+                .WithMetadataReferences(MetadataReferences.Transitive(typeof(Assert), typeof(IAsyncDisposable)))
                 .WithParseOption(new CSharpParseOptions(LanguageVersion.Preview).WithPreprocessorSymbols("NUNIT3"));
 #endif
         }

src/nunit.analyzers.tests/nunit.analyzers.tests.csproj

@@ -32,12 +32,16 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
     <PackageReference Include="Gu.Roslyn.Asserts" Version="4.3.0" />
     <PackageReference Include="Gu.Roslyn.Asserts.Analyzers" Version="4.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\nunit.analyzers\nunit.analyzers.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\nunit.analyzers.codefixes\nunit.analyzers.codefixes.csproj" OutputItemType="Analyzer" />

src/nunit.analyzers/NonTestMethodAccessibilityLevel/NonTestMethodAccessibilityLevelAnalyzer.cs

@@ -81,7 +81,8 @@ private static bool IsOverride(IMethodSymbol method)
 
         private static bool IsDisposeMethod(IMethodSymbol method)
         {
-            return method.IsInterfaceImplementation("System.IDisposable");
+            return method.IsInterfaceImplementation("System.IDisposable") ||
+                   method.IsInterfaceImplementation("System.IAsyncDisposable");
         }
     }
 }