Added target framework for netcoreapp2.1 for tests (#253)

* Added target framework for netcoreapp2.1
* fixed test failures on appveyor

Author: david-driscoll

src/JsonRpc.Testing/JsonRpcServerTestBase.cs

@@ -33,8 +33,8 @@ protected virtual void ConfigureServerInputOutput(PipeReader inMemoryReader, Pip
             Action<JsonRpcServerOptions> clientOptionsAction,
             Action<JsonRpcServerOptions> serverOptionsAction)
         {
-            var clientPipe = new Pipe();
-            var serverPipe = new Pipe();
+            var clientPipe = new Pipe(TestOptions.DefaultPipeOptions);
+            var serverPipe = new Pipe(TestOptions.DefaultPipeOptions);
 
             var clientTask = JsonRpcServer.From(options => {
                 options

src/JsonRpc.Testing/JsonRpcTestOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO.Pipelines;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
@@ -25,5 +26,9 @@ public JsonRpcTestOptions(ILoggerFactory clientLoggerFactory, ILoggerFactory ser
         public TimeSpan SettleTimeSpan { get; internal set; } = TimeSpan.FromMilliseconds(50);
         public TimeSpan SettleTimeout { get; internal set; } = TimeSpan.FromMilliseconds(500);
         public TimeSpan TestTimeout { get; internal set; } = TimeSpan.FromSeconds(30);
+
+        public PipeOptions DefaultPipeOptions { get; internal set; } =
+            new PipeOptions();
+
     }
 }

src/JsonRpc.Testing/JsonRpcTestOptionsExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO.Pipelines;
 using Microsoft.Extensions.Logging;
 
 namespace OmniSharp.Extensions.JsonRpc.Testing
@@ -30,5 +31,10 @@ public static JsonRpcTestOptions WithTestTimeout(this JsonRpcTestOptions options
             options.TestTimeout = testTimeout;
             return options;
         }
+        public static JsonRpcTestOptions WithDefaultPipeOptions(this JsonRpcTestOptions options, PipeOptions pipeOptions)
+        {
+            options.DefaultPipeOptions = pipeOptions;
+            return options;
+        }
     }
 }

src/JsonRpc.Testing/Settler.cs

@@ -10,12 +10,14 @@ namespace OmniSharp.Extensions.JsonRpc.Testing
 {
     class Settler : ISettler, IRequestSettler
     {
+        private readonly TimeSpan _timeout;
         private readonly CancellationToken _cancellationToken;
         private readonly IObservable<Unit> _settle;
         private readonly IObserver<int> _requester;
 
         public Settler(TimeSpan waitTime, TimeSpan timeout, CancellationToken cancellationToken)
         {
+            _timeout = timeout;
             _cancellationToken = cancellationToken;
             var subject = new Subject<int>();
             var data = subject;

src/Testing/LanguageProtocolTestBase.cs

@@ -42,8 +42,8 @@ protected virtual void ConfigureServerInputOutput(PipeReader clientOutput, PipeW
             Action<LanguageClientOptions> clientOptionsAction,
             Action<LanguageServerOptions> serverOptionsAction)
         {
-            var clientPipe = new Pipe(new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false));
-            var serverPipe = new Pipe(new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false));
+            var clientPipe = new Pipe(TestOptions.DefaultPipeOptions);
+            var serverPipe = new Pipe(TestOptions.DefaultPipeOptions);
 
             _client = LanguageClient.PreInit(options => {
                 options

test/Client.Tests/Client.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
         <AssemblyName>OmniSharp.Extensions.LanguageClient.Tests</AssemblyName>
         <RootNamespace>OmniSharp.Extensions.LanguageServer.Client.Tests</RootNamespace>
     </PropertyGroup>

test/Dap.Tests/Dap.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

test/JsonRpc.Tests/JsonRpc.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

test/Lsp.Tests/Integration/ConnectionAndDisconnectionTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO.Pipelines;
 using System.Threading.Tasks;
 using FluentAssertions;
 using MediatR;
@@ -15,7 +16,10 @@ namespace Lsp.Tests.Integration
 {
     public class ConnectionAndDisconnectionTests : LanguageProtocolTestBase
     {
-        public ConnectionAndDisconnectionTests(ITestOutputHelper outputHelper)  : base(new JsonRpcTestOptions().ConfigureForXUnit(outputHelper).WithTestTimeout(TimeSpan.FromSeconds(10)))
+        public ConnectionAndDisconnectionTests(ITestOutputHelper outputHelper)  : base(new JsonRpcTestOptions()
+            .ConfigureForXUnit(outputHelper)
+            .WithTestTimeout(TimeSpan.FromSeconds(20))
+        )
         {
         }
 
@@ -28,7 +32,7 @@ public async Task Server_Should_Stay_Alive_When_Requests_Throw_An_Exception()
             result.Should().BeTrue();
 
             Func<Task> a = () => client.SendRequest("throw").ReturningVoid(CancellationToken);
-            a.Should().Throw<InternalErrorException>();
+            await a.Should().ThrowAsync<InternalErrorException>();
 
             result = await client.SendRequest("keepalive").Returning<bool>(CancellationToken);
             result.Should().BeTrue();
@@ -43,7 +47,7 @@ public async Task Client_Should_Stay_Alive_When_Requests_Throw_An_Exception()
             result.Should().BeTrue();
 
             Func<Task> a = () => server.SendRequest("throw").ReturningVoid(CancellationToken);
-            a.Should().Throw<InternalErrorException>();
+            await a.Should().ThrowAsync<InternalErrorException>();
 
             result = await server.SendRequest("keepalive").Returning<bool>(CancellationToken);
             result.Should().BeTrue();

test/Lsp.Tests/Integration/DynamicRegistrationTests.cs

@@ -34,6 +34,9 @@ public async Task Should_Register_Dynamically_After_Initialization()
 
             client.ServerSettings.Capabilities.CompletionProvider.Should().BeNull();
 
+            await Events.SettleNext();
+            await Events.SettleNext();
+            await Events.SettleNext();
             await Events.SettleNext();
 
             client.RegistrationManager.CurrentRegistrations.Should().Contain(x =>
@@ -58,7 +61,7 @@ public async Task Should_Register_Dynamically_While_Server_Is_Running()
                     })
             );
 
-            await Settle().Take(2);
+            await Task.Delay(TimeSpan.FromSeconds(1));
 
             client.RegistrationManager.CurrentRegistrations.Should().Contain(x =>
                 x.Method == TextDocumentNames.Completion && SelectorMatches(x, z=> z.HasLanguage && z.Language == "vb")
@@ -85,7 +88,7 @@ public async Task Should_Unregister_Dynamically_While_Server_Is_Running()
 
             disposable.Dispose();
 
-            await Settle().Take(2);
+            await Task.Delay(TimeSpan.FromSeconds(1));
 
             client.RegistrationManager.CurrentRegistrations.Should().NotContain(x =>
                 x.Method == TextDocumentNames.Completion && SelectorMatches(x, z=> z.HasLanguage && z.Language == "vb")

test/Lsp.Tests/Lsp.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

test/Lsp.Tests/Testing/LanguageServerTestBaseTests.cs

@@ -19,8 +19,8 @@ public LanguageServerTestBaseTests(ITestOutputHelper testOutputHelper) : base(ne
 
         protected override (Stream clientOutput, Stream serverInput) SetupServer()
         {
-            var clientPipe = new Pipe();
-            var serverPipe = new Pipe();
+            var clientPipe = new Pipe(TestOptions.DefaultPipeOptions);
+            var serverPipe = new Pipe(TestOptions.DefaultPipeOptions);
 
             var server = LanguageServer.PreInit(options => {
                 options.WithInput(serverPipe.Reader).WithOutput(clientPipe.Writer);