Disable ParallelizeTestCollections

Author: scott-xu

.gitignore

@@ -1,4 +1,5 @@
 .vs
+*.user
 bin
 obj
 TestResults

appveyor.yml

@@ -33,7 +33,7 @@ build:
   verbosity: minimal
 
 test_script:
-  - OpenCover.Console.exe -oldstyle -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --configuration Release --no-build src\Ninject.Extensions.Interception.Test" -filter:"+[Ninject.Extensions.Interception*]* -[Ninject.Extensions.Interception.Test*]*" -excludebyattribute:*.ExcludeFromCodeCoverage*;*.Obsolete* -output:"Ninject.Extensions.Interception_coverage.xml"
+  - OpenCover.Console.exe -oldstyle -returntargetcode -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --configuration Release --no-build src\Ninject.Extensions.Interception.Test" -filter:"+[Ninject.Extensions.Interception*]* -[Ninject.Extensions.Interception.Test*]*" -excludebyattribute:*.ExcludeFromCodeCoverage*;*.Obsolete* -output:"Ninject.Extensions.Interception_coverage.xml"
   - codecov -f "Ninject.Extensions.Interception_coverage.xml
 
 artifacts:

src/Ninject.Extensions.Interception.Test/AsyncInterceptionContext.cs

@@ -1,7 +1,5 @@
-#if !NET_35 && !SILVERLIGHT
 namespace Ninject.Extensions.Interception
 {
-    using System.Threading;
     using System.Threading.Tasks;
     using FluentAssertions;
     using Ninject.Extensions.Interception.Infrastructure.Language;
@@ -10,24 +8,23 @@ namespace Ninject.Extensions.Interception
     public abstract class AsyncInterceptionContext : InterceptionTestContext
     {
         [Fact]
-        public void AsyncMethodsCanBeIntercepted()
+        public async Task AsyncMethodsCanBeIntercepted()
         {
             using (var kernel = this.CreateDefaultInterceptionKernel())
             {
                 BeforeAfterCallOrderInterceptor.Reset();
 
                 kernel.Bind<AsyncService>().ToSelf().Intercept().With<BeforeAfterCallOrderInterceptor>();
-
                 var service = kernel.Get<AsyncService>();
-                var task = service.DoAsync();
-                task.Wait();
+
+                await service.DoAsync();
 
                 BeforeAfterCallOrderInterceptor.Order.Should().Be("Before_Action_AfterCompleted_");
-            } 
+            }
         }
 
         [Fact]
-        public void AsyncMethodsWithReturnValueCanBeIntercepted()
+        public async Task AsyncMethodsWithReturnValueCanBeIntercepted()
         {
             using (var kernel = this.CreateDefaultInterceptionKernel())
             {
@@ -36,16 +33,15 @@ public void AsyncMethodsWithReturnValueCanBeIntercepted()
                 kernel.Bind<AsyncService>().ToSelf().Intercept().With<BeforeAfterCallOrderInterceptor>();
                 var service = kernel.Get<AsyncService>();
 
-                var task = service.DoAsyncInt();
-                task.Wait();
- 
+                var result = await service.DoAsyncInt();
+
                 BeforeAfterCallOrderInterceptor.Order.Should().Be("Before_Action_AfterCompleted_");
-                task.Result.Should().Be(42);
+                result.Should().Be(42);
             }
         }
 
         [Fact]
-        public void AsyncMethodsWithReturnValue_InterceptorsCanChangeTheResult()
+        public async Task AsyncMethodsWithReturnValue_InterceptorsCanChangeTheResult()
         {
             using (var kernel = this.CreateDefaultInterceptionKernel())
             {
@@ -54,39 +50,13 @@ public void AsyncMethodsWithReturnValue_InterceptorsCanChangeTheResult()
                 kernel.Bind<AsyncService>().ToSelf().Intercept().With<IncreaseResultInterceptor>();
                 var service = kernel.Get<AsyncService>();
 
-                var task = service.DoAsyncInt();
-                task.Wait();
+                var result = await service.DoAsyncInt();
 
                 BeforeAfterCallOrderInterceptor.Order.Should().Be("Before_Action_AfterCompleted_");
-                task.Result.Should().Be(43);
+                result.Should().Be(43);
             }
         }
 
-#if NET_40
-        public class AsyncService
-        {
-            public virtual Task<int> DoAsyncInt()
-            {
-                BeforeAfterCallOrderInterceptor.ActionCalled();
-                var result = new Task<int>(
-                    () =>
-                        {
-                            Thread.Sleep(100);
-                            return 42;
-                        });
-                result.Start();
-                return result;
-            }
-
-            public virtual Task DoAsync()
-            {
-                BeforeAfterCallOrderInterceptor.ActionCalled();
-                var result = new Task(() => Thread.Sleep(100));
-                result.Start();
-                return result;
-            }
-        }
-#else
         public class AsyncService
         {
             public virtual async Task<int> DoAsyncInt()
@@ -112,7 +82,6 @@ private Task<int> DoInt()
                 return Task.Delay(100).ContinueWith((t, o) => 42, null);
             }
         }
-#endif
 
         public class BeforeAfterCallOrderInterceptor : AsyncInterceptor
         {
@@ -157,5 +126,4 @@ protected override void AfterInvoke(IInvocation invocation)
             }
         }
     }
-}
-#endif
+}

src/Ninject.Extensions.Interception.Test/Ninject.Extensions.Interception.Tests.csproj

@@ -28,4 +28,10 @@
     <ProjectReference Include="..\Ninject.Extensions.Interception.LinFu\Ninject.Extensions.Interception.LinFu.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

src/Ninject.Extensions.Interception.Test/xunit.runner.json

@@ -0,0 +1,3 @@
+{
+  "parallelizeTestCollections": false
+}