rollback changes from wip commit

Author: david-driscoll

src/JsonRpc/SchedulerContainer.cs

@@ -34,15 +34,14 @@ public async Task Should_Support_Custom_Telemetry_Using_Base_Class()
                 PromptToUpdatePackageManagement = false
             };
             server.SendTelemetryEvent(@event);
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
-                await SettleNext();
+            await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
             var args = call.GetArguments();
 
             args[0].Should().BeOfType<CustomTelemetryEventParams>()
                    .And.Subject
-                   .Should().BeEquivalentTo(@event, z=> z.UsingStructuralRecordEquality().Excluding(x => x.ExtensionData));
+                   .Should().BeEquivalentTo(@event, z => z.UsingStructuralRecordEquality().Excluding(x => x.ExtensionData));
         }
 
         [RetryFact]
@@ -59,8 +58,7 @@ public async Task Should_Support_Custom_Telemetry_Receiving_Regular_Telemetry_Us
                 PromptToUpdatePackageManagement = false
             };
             server.SendTelemetryEvent(@event);
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
-                await SettleNext();
+            await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
             var args = call.GetArguments();
@@ -76,7 +74,7 @@ public async Task Should_Support_Custom_Telemetry_Receiving_Regular_Telemetry_Us
         public async Task Should_Support_Custom_Telemetry_Using_Extension_Data_Using_Base_Class()
         {
             var fake = Substitute.For<TelemetryEventHandlerBase<CustomTelemetryEventParams>>();
-            var (_, server) = await Initialize(options => { options.AddHandler(fake);}, options => {  });
+            var (_, server) = await Initialize(options => { options.AddHandler(fake); }, options => { });
 
             server.SendTelemetryEvent(
                 new TelemetryEventParams {
@@ -89,7 +87,6 @@ public async Task Should_Support_Custom_Telemetry_Using_Extension_Data_Using_Bas
                     }
                 }
             );
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
             await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
@@ -116,15 +113,14 @@ public async Task Should_Support_Custom_Telemetry_Using_Delegate()
                 PromptToUpdatePackageManagement = false
             };
             server.SendTelemetryEvent(@event);
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
-                await SettleNext();
+            await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
             var args = call.GetArguments();
             args[0]
                .Should().BeOfType<CustomTelemetryEventParams>()
                .And.Subject
-               .Should().BeEquivalentTo(@event, z=> z.UsingStructuralRecordEquality().Excluding(x => x.ExtensionData));
+               .Should().BeEquivalentTo(@event, z => z.UsingStructuralRecordEquality().Excluding(x => x.ExtensionData));
         }
 
         [RetryFact]
@@ -141,8 +137,7 @@ public async Task Should_Support_Custom_Telemetry_Receiving_Regular_Telemetry_Us
                 PromptToUpdatePackageManagement = false
             };
             server.SendTelemetryEvent(@event);
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
-                await SettleNext();
+            await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
             var args = call.GetArguments();
@@ -171,8 +166,7 @@ public async Task Should_Support_Custom_Telemetry_Using_Extension_Data_Using_Del
                     }
                 }
             );
-            while (!fake.ReceivedCalls().Any() && !CancellationToken.IsCancellationRequested)
-                await SettleNext();
+            await SettleNext();
 
             var call = fake.ReceivedCalls().Single();
             var args = call.GetArguments();

test/Lsp.Tests/Integration/CustomRequestsTests.cs

@@ -254,7 +254,7 @@ public async Task Should_Support_Options_Monitor()
             // IOptionsMonitor<> is registered as a singleton, so this will update
             options.CurrentValue.Host.Should().Be("localhost");
             options.CurrentValue.Port.Should().Be(443);
-            sub.Received(Quantity.AtLeastOne()).Invoke(Arg.Any<BinderSourceUrl>());
+            sub.Received(1).Invoke(Arg.Any<BinderSourceUrl>());
 
             configuration.Update("mysection", new Dictionary<string, string> { ["host"] = "127.0.0.1", ["port"] = "80" });
             await options.WaitForChange(CancellationToken);

test/Lsp.Tests/Integration/LanguageServerConfigurationTests.cs

@@ -19,8 +19,6 @@ public static JsonRpcTestOptions ConfigureForXUnit(
             jsonRpcTestOptions
                .WithClientLoggerFactory(new TestLoggerFactory(outputHelper, "{Timestamp:yyyy-MM-dd HH:mm:ss} [Client] [{Level}] {Message}{NewLine}{Exception}", logEventLevel))
                .WithServerLoggerFactory(new TestLoggerFactory(outputHelper, "{Timestamp:yyyy-MM-dd HH:mm:ss} [Server] [{Level}] {Message}{NewLine}{Exception}", logEventLevel))
-               .WithClientScheduler(Scheduler.CurrentThread)
-               .WithServerScheduler(Scheduler.CurrentThread)
         ;
     }
 }