bugfix: Actually wait for and assert initialization in InitializationTests

Author: razzmatazz

src/CSharpLanguageServer/RoslynHelpers.fs

@@ -410,7 +410,7 @@ let tryLoadSolutionFromProjectFiles
     let progress = ProgressReporter(lspClient)
 
     async {
-        do! progress.Begin($"Loading {projs.Length} projects...", false, $"0/{projs.Length}", 0u)
+        do! progress.Begin($"Loading {projs.Length} project(s)...", false, $"0/{projs.Length}", 0u)
         let loadedProj = ref 0
 
         let msbuildWorkspace = MSBuildWorkspace.Create(CSharpLspHostServices())

tests/CSharpLanguageServer.Tests/InitializationTests.fs

@@ -28,5 +28,6 @@ let testServerRegistersCapabilitiesWithTheClient () =
     use client = startAndMountServer projectFiles false
     client.Start()
     client.Initialize()
-    client.DumpRpcLog()
-    Assert.IsTrue(client.ServerDidInvoke("client/registerCapability"))
+    client.WaitForProgressEnd("OK, 1 project file(s) loaded")
+    Assert.IsTrue(client.ServerDidRespondTo("initialize"))
+    Assert.IsTrue(client.ServerDidRespondTo("initialized"))

tests/CSharpLanguageServer.Tests/Tooling.fs

@@ -6,6 +6,7 @@ open System.IO
 open System.Diagnostics
 open System.Text
 open System.Threading.Tasks
+open System.Threading
 
 open NUnit.Framework
 open Newtonsoft.Json.Linq
@@ -432,6 +433,26 @@ type ClientController (client: MailboxProcessor<ClientEvent>, projectFiles: Map<
         client.PostAndReply(fun rc -> InitializeRequest rc)
         logMessage "Initialize" "OK, InitializeRequest complete"
 
+    member __.WaitForProgressEnd(message: string) =
+        let timeoutMS = 10 * 1000
+        let start = DateTime.Now
+
+        let progressEndMatch m =
+            m.Source = Server
+            && (m.Message.["method"] |> string) = "$/progress"
+            && (m.Message.["params"].["value"].["kind"] |> string) = "end"
+            && (m.Message.["params"].["value"].["message"] |> string) = message
+
+        let mutable haveProgressEnd = false
+        while (not haveProgressEnd) do
+            let rpcLog = client.PostAndReply(fun rc -> GetRpcLog rc)
+            haveProgressEnd <- rpcLog |> Seq.exists progressEndMatch
+
+            if (DateTime.Now - start).TotalMilliseconds > timeoutMS then
+               failwith (sprintf "WaitForProgressEnd: no $/progress[end] received in %dms"
+                                 timeoutMS)
+            Thread.Sleep(25)
+
     member __.Shutdown () =
         client.Post(ShutdownRequest)
         client.Post(ExitRequest)
@@ -448,6 +469,13 @@ type ClientController (client: MailboxProcessor<ClientEvent>, projectFiles: Map<
         let rpcLog = client.PostAndReply(fun rc -> GetRpcLog rc)
         rpcLog |> Seq.exists (fun m -> m.Source = Server && (string m.Message["method"]) = rpcMethod)
 
+    member __.ServerDidRespondTo (rpcMethod: string) =
+        let rpcLog = client.PostAndReply(fun rc -> GetRpcLog rc)
+        let invocation = rpcLog |> Seq.find (fun m -> m.Source = Client && (string m.Message["method"]) = rpcMethod)
+        rpcLog
+        |> Seq.exists (fun m -> m.Source = Client
+                                && (m.Message.["id"] |> string) = (invocation.Message.["id"] |> string)
+                                && (m.Message.["method"] |> string) = rpcMethod)
 
 let startAndMountServer (projectFiles: Map<string, string>) (enableLogging: bool) =
     let initialState = { ClientState.Default with LoggingEnabled = enableLogging }