Merge branch 'issue_26'

AsyncConverter.Tests/AsyncConverter.Rider.Tests.csproj

@@ -30,6 +30,6 @@
     <ProjectReference Include="..\AsyncConverter\AsyncConverter.Rider.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2018.1.0" />
+    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2018.1.2" />
   </ItemGroup>
 </Project>

AsyncConverter.Tests/AsyncConverter.Tests.csproj

@@ -26,7 +26,7 @@
     <None Remove="Test\Data\**\*.cs.tmp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2018.1.0" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2018.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AsyncConverter\AsyncConverter.csproj" />

AsyncConverter.Tests/Highlightings/ConfigureAwait/ConfigureAwaitOnTestTests.cs

@@ -0,0 +1,11 @@
+using AsyncConverter.Settings.General;
+using JetBrains.ReSharper.TestFramework;
+
+namespace AsyncConverter.Tests.Highlightings
+{
+    [TestSetting(typeof(GeneralSettings), nameof(GeneralSettings.ExcludeTestMethodsFromConfigureAwait), false)]
+    public class ConfigureAwaitOnTestTests : HighlightingsTestsBase
+    {
+        protected override string Folder => "ConfigureAwait/OnTest";
+    }
+}

AsyncConverter.Tests/Highlightings/ConfigureAwait/ConfigureAwaitTests.cs

@@ -0,0 +1,7 @@
+namespace AsyncConverter.Tests.Highlightings
+{
+    public class ConfigureAwaitTests : HighlightingsTestsBase
+    {
+        protected override string Folder => "ConfigureAwait/Common";
+    }
+}

AsyncConverter.Tests/Highlightings/ConfigureAwaitWithAttributeTests.cs → AsyncConverter.Tests/Highlightings/ConfigureAwait/ConfigureAwaitWithAttributeTests.cs

@@ -1,4 +1,4 @@
-using AsyncConverter.Settings.ConfigureAwaitOptions;
+using AsyncConverter.Settings.ConfigureAwaitOptions;
 using JetBrains.Application.Settings;
 
 namespace AsyncConverter.Tests.Highlightings
@@ -9,6 +9,6 @@ protected override void MutateSettings(IContextBoundSettingsStore settingsStore)
         {
             settingsStore.SetIndexedValue((AsyncConverterConfigureAwaitSettings s) => s.ConfigureAwaitIgnoreAttributeTypes, "MyCustomAttribute", "AsyncConverter.Tests.Test.Data.Highlightings.ConfigureAwaitWithAttribute.MyCustomAttribute");
         }
-        protected override string Folder => "ConfigureAwaitWithAttribute";
+        protected override string Folder => "ConfigureAwait/WithAttribute";
     }
 }

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/Common/MsTestAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public class Class
+    {
+        [TestMethod]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    public class TestMethodAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/Common/MsTestAttr.cs.gold

@@ -0,0 +1,22 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public class Class
+    {
+        [TestMethod]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    public class TestMethodAttribute : Attribute
+    { }
+}
+---------------------------------------------------------

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/Common/WithAttributeOnClass.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [Test]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/Common/WithAttributeOnClass.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [Test]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestAttribute : Attribute
+    { }
+}
+
+---------------------------------------------------------

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/MsTestAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public class Class
+    {
+        [TestMethod]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    public class TestMethodAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/MsTestAttr.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public class Class
+    {
+        [TestMethod]
+        public async Task Test()
+        {
+            |await Task.Delay(1000)|(0);
+        }
+    }
+}
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    public class TestMethodAttribute : Attribute
+    { }
+}
+---------------------------------------------------------
+(0): ReSharper Warning: (T) 'If await not configured it may cause deadlock, if this code will be call synchronously' (E) 'Await not configured'

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/NUnitTestAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [Test]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/NUnitTestAttr.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [Test]
+        public async Task Test()
+        {
+            |await Task.Delay(1000)|(0);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestAttribute : Attribute
+    { }
+}
+---------------------------------------------------------
+(0): ReSharper Warning: (T) 'If await not configured it may cause deadlock, if this code will be call synchronously' (E) 'Await not configured'

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/NUnitTestCaseAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [TestCase]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestCaseAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/NUnitTestCaseAttr.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using NUnit.Framework;
+    public class Class
+    {
+        [TestCase]
+        public async Task Test()
+        {
+            |await Task.Delay(1000)|(0);
+        }
+    }
+}
+
+namespace NUnit.Framework
+{
+    public class TestCaseAttribute : Attribute
+    { }
+}
+---------------------------------------------------------
+(0): ReSharper Warning: (T) 'If await not configured it may cause deadlock, if this code will be call synchronously' (E) 'Await not configured'

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/XunitFactAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Xunit;
+    public class Class
+    {
+        [Fact]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace Xunit
+{
+    public class FactAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/XunitFactAttr.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Xunit;
+    public class Class
+    {
+        [Fact]
+        public async Task Test()
+        {
+            |await Task.Delay(1000)|(0);
+        }
+    }
+}
+
+namespace Xunit
+{
+    public class FactAttribute : Attribute
+    { }
+}
+---------------------------------------------------------
+(0): ReSharper Warning: (T) 'If await not configured it may cause deadlock, if this code will be call synchronously' (E) 'Await not configured'

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/XunitTheoryAttr.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Xunit;
+    public class Class
+    {
+        [Theory]
+        public async Task Test()
+        {
+            await Task.Delay(1000);
+        }
+    }
+}
+
+namespace Xunit
+{
+    public class TheoryAttribute : Attribute
+    { }
+}

AsyncConverter.Tests/Test/Data/Highlightings/ConfigureAwait/OnTest/XunitTheoryAttr.cs.gold

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+
+namespace AsyncConverter.Tests.Test.Data.FixReturnValueToTaskTests
+{
+    using Xunit;
+    public class Class
+    {
+        [Theory]
+        public async Task Test()
+        {
+            |await Task.Delay(1000)|(0);
+        }
+    }
+}
+
+namespace Xunit
+{
+    public class TheoryAttribute : Attribute
+    { }
+}
+---------------------------------------------------------
+(0): ReSharper Warning: (T) 'If await not configured it may cause deadlock, if this code will be call synchronously' (E) 'Await not configured'