Added fixture based tests and re-enabled disabled tests (#310)

* Added fixture based tests and re-enabled disabled tests

* Fixed settler tests and hardened settler a little bit more

* lets keep this going

* skip progress tests

* equals was a mistake

* progress tests

* progress tests

* progress tests

* fixed bug in work done progress (not completeing correctly!)

* Progress tests

* some tests just aren't ready yet

Author: david-driscoll

src/Client/LanguageClientOptions.cs

@@ -61,6 +61,9 @@ ILanguageClientRegistry IJsonRpcHandlerRegistry<ILanguageClientRegistry>.AddHand
         ILanguageClientRegistry IJsonRpcHandlerRegistry<ILanguageClientRegistry>.AddHandler(string method, Type type, JsonRpcHandlerOptions options) =>
             AddHandler(method, type, options);
 
+        ILanguageClientRegistry IJsonRpcHandlerRegistry<ILanguageClientRegistry>.AddHandlerLink(string sourceMethod, string destinationMethod) =>
+            AddHandlerLink(sourceMethod, destinationMethod);
+
         ILanguageClientRegistry IJsonRpcHandlerRegistry<ILanguageClientRegistry>.OnJsonRequest(string method, Func<JToken, Task<JToken>> handler, JsonRpcHandlerOptions options) =>
             OnJsonRequest(method, handler, options);
 

src/Dap.Client/DebugAdapterClientOptions.cs

@@ -49,6 +49,9 @@ IDebugAdapterClientRegistry IJsonRpcHandlerRegistry<IDebugAdapterClientRegistry>
         IDebugAdapterClientRegistry IJsonRpcHandlerRegistry<IDebugAdapterClientRegistry>.AddHandler(string method, Type type, JsonRpcHandlerOptions options) =>
             AddHandler(method, type, options);
 
+        IDebugAdapterClientRegistry IJsonRpcHandlerRegistry<IDebugAdapterClientRegistry>.AddHandlerLink(string sourceMethod, string destinationMethod) =>
+            AddHandlerLink(sourceMethod, destinationMethod);
+
         IDebugAdapterClientRegistry IJsonRpcHandlerRegistry<IDebugAdapterClientRegistry>.OnJsonRequest(
             string method, Func<JToken, Task<JToken>> handler, JsonRpcHandlerOptions options
         ) => OnJsonRequest(method, handler, options);

src/Dap.Protocol/IProgressObservable.cs

@@ -1,9 +1,11 @@
 using System;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
+using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 
 namespace OmniSharp.Extensions.DebugAdapter.Protocol
 {
     public interface IProgressObservable : IObservable<ProgressEvent>
     {
+        ProgressToken ProgressToken { get; }
     }
 }

src/Dap.Protocol/Models/ProgressToken.cs

@@ -69,7 +69,6 @@ public bool Equals(ProgressToken other) =>
             String == other.String;
 
         public bool Equals(long other) => IsLong && Long == other;
-
         public bool Equals(string other) => IsString && String == other;
 
         private string DebuggerDisplay => IsString ? String : IsLong ? Long.ToString() : "";

src/Dap.Server/DebugAdapterServerOptions.cs

@@ -37,6 +37,9 @@ IDebugAdapterServerRegistry IJsonRpcHandlerRegistry<IDebugAdapterServerRegistry>
         IDebugAdapterServerRegistry IJsonRpcHandlerRegistry<IDebugAdapterServerRegistry>.AddHandler(string method, Type type, JsonRpcHandlerOptions options) =>
             AddHandler(method, type, options);
 
+        IDebugAdapterServerRegistry IJsonRpcHandlerRegistry<IDebugAdapterServerRegistry>.AddHandlerLink(string sourceMethod, string destinationMethod) =>
+            AddHandlerLink(sourceMethod, destinationMethod);
+
         IDebugAdapterServerRegistry IJsonRpcHandlerRegistry<IDebugAdapterServerRegistry>.OnJsonRequest(
             string method, Func<JToken, Task<JToken>> handler, JsonRpcHandlerOptions options
         ) => OnJsonRequest(method, handler, options);

src/JsonRpc.Testing/AggregateSettler.cs

@@ -13,7 +13,7 @@ public class AggregateSettler : ISettler
 
         public AggregateSettler(params ISettler[] settlers) => _settlers = settlers;
 
-        public Task SettleNext() => Settle().Take(1).IgnoreElements().LastOrDefaultAsync().ToTask();
+        public Task SettleNext() => Task.WhenAll(_settlers.Select(z => z.SettleNext()));
 
         public IObservable<Unit> Settle() =>
             _settlers

src/JsonRpc.Testing/JsonRpcIntegrationServerTestBase.cs

@@ -19,10 +19,10 @@ public JsonRpcIntegrationServerTestBase(JsonRpcTestOptions testOptions)
             _cancellationTokenSource = new CancellationTokenSource();
             if (!Debugger.IsAttached)
             {
-                _cancellationTokenSource.CancelAfter(testOptions.TestTimeout);
+                _cancellationTokenSource.CancelAfter(testOptions.CancellationTimeout);
             }
 
-            Events = ClientEvents = new Settler(TestOptions.SettleTimeSpan, TestOptions.SettleTimeout, CancellationToken);
+            Events = ClientEvents = new Settler(TestOptions, CancellationToken);
         }
 
         protected CompositeDisposable Disposable { get; }

src/JsonRpc.Testing/JsonRpcTestBase.cs

@@ -19,22 +19,22 @@ public JsonRpcTestBase(JsonRpcTestOptions testOptions)
             _cancellationTokenSource = new CancellationTokenSource();
             if (!Debugger.IsAttached)
             {
-                _cancellationTokenSource.CancelAfter(testOptions.TestTimeout);
+                _cancellationTokenSource.CancelAfter(testOptions.CancellationTimeout);
             }
 
-            ClientEvents = new Settler(TestOptions.SettleTimeSpan, TestOptions.SettleTimeout, CancellationToken);
-            ServerEvents = new Settler(TestOptions.SettleTimeSpan, TestOptions.SettleTimeout, CancellationToken);
+            ClientEvents = new Settler(TestOptions, CancellationToken);
+            ServerEvents = new Settler(TestOptions, CancellationToken);
             Events = new AggregateSettler(ClientEvents, ServerEvents);
         }
 
         protected CompositeDisposable Disposable { get; }
-        protected ISettler ClientEvents { get; }
-        protected ISettler ServerEvents { get; }
-        protected ISettler Events { get; }
-        protected JsonRpcTestOptions TestOptions { get; }
-        protected internal CancellationToken CancellationToken => _cancellationTokenSource.Token;
-        protected Task SettleNext() => Events.SettleNext();
-        protected IObservable<Unit> Settle() => Events.Settle();
+        public ISettler ClientEvents { get; }
+        public  ISettler ServerEvents { get; }
+        public  ISettler Events { get; }
+        public  JsonRpcTestOptions TestOptions { get; }
+        public  CancellationToken CancellationToken => _cancellationTokenSource.Token;
+        public  Task SettleNext() => Events.SettleNext();
+        public  IObservable<Unit> Settle() => Events.Settle();
 
         public void Dispose()
         {

src/JsonRpc.Testing/JsonRpcTestOptions.cs

@@ -21,9 +21,9 @@ public JsonRpcTestOptions(ILoggerFactory clientLoggerFactory, ILoggerFactory ser
 
         public ILoggerFactory ClientLoggerFactory { get; internal set; } = NullLoggerFactory.Instance;
         public ILoggerFactory ServerLoggerFactory { get; internal set; } = NullLoggerFactory.Instance;
-        public TimeSpan SettleTimeSpan { get; internal set; } = TimeSpan.FromMilliseconds(100);
-        public TimeSpan SettleTimeout { get; internal set; } = TimeSpan.FromMilliseconds(500);
-        public TimeSpan TestTimeout { get; internal set; } = TimeSpan.FromMinutes(5);
+        public TimeSpan WaitTime { get; internal set; } = TimeSpan.FromMilliseconds(50);
+        public TimeSpan Timeout { get; internal set; } = TimeSpan.FromMilliseconds(500);
+        public TimeSpan CancellationTimeout { get; internal set; } = TimeSpan.FromMinutes(5);
         public PipeOptions DefaultPipeOptions { get; internal set; } = new PipeOptions();
     }
 }

src/JsonRpc.Testing/JsonRpcTestOptionsExtensions.cs

@@ -18,21 +18,21 @@ public static JsonRpcTestOptions WithClientLoggerFactory(this JsonRpcTestOptions
             return options;
         }
 
-        public static JsonRpcTestOptions WithSettleTimeSpan(this JsonRpcTestOptions options, TimeSpan settleTimeSpan)
+        public static JsonRpcTestOptions WithWaitTime(this JsonRpcTestOptions options, TimeSpan waitTime)
         {
-            options.SettleTimeSpan = settleTimeSpan;
+            options.WaitTime = waitTime;
             return options;
         }
 
-        public static JsonRpcTestOptions WithSettleTimeout(this JsonRpcTestOptions options, TimeSpan timeout)
+        public static JsonRpcTestOptions WithTimeout(this JsonRpcTestOptions options, TimeSpan timeout)
         {
-            options.SettleTimeout = timeout;
+            options.Timeout = timeout;
             return options;
         }
 
-        public static JsonRpcTestOptions WithTestTimeout(this JsonRpcTestOptions options, TimeSpan testTimeout)
+        public static JsonRpcTestOptions WithCancellationTimeout(this JsonRpcTestOptions options, TimeSpan cancellationTimeout)
         {
-            options.TestTimeout = testTimeout;
+            options.CancellationTimeout = cancellationTimeout;
             return options;
         }