Replace task delays with event listening on tests

src/OmniSharp.MSBuild/ProjectManager.cs

@@ -10,21 +10,17 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
 using OmniSharp.Eventing;
 using OmniSharp.FileWatching;
 using OmniSharp.Models.UpdateBuffer;
 using OmniSharp.MSBuild.Logging;
 using OmniSharp.MSBuild.Models.Events;
 using OmniSharp.MSBuild.Notification;
 using OmniSharp.MSBuild.ProjectFile;
-using OmniSharp.Roslyn.CSharp.Services.Diagnostics;
-using OmniSharp.Roslyn.CSharp.Services.Refactoring.V2;
 using OmniSharp.Options;
 using OmniSharp.Roslyn.Utilities;
 using OmniSharp.Services;
 using OmniSharp.Utilities;
-using System.Reflection;
 using Microsoft.CodeAnalysis.Diagnostics;
 using OmniSharp.Roslyn.EditorConfig;
 

src/OmniSharp.Roslyn.CSharp/Workers/Diagnostics/CSharpDiagnosticWorkerWithAnalyzers.cs

@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Helpers;
 using OmniSharp.Models.Diagnostics;

test-assets/test-projects/ProjectWithAnalyzers/ProjectWithAnalyzers.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>7.1</LangVersion>
     <CodeAnalysisRuleSet>default.ruleset</CodeAnalysisRuleSet>
-    <RestorePackagesPath>./nugets/</RestorePackagesPath>
+    <RestorePackagesPath>nugets</RestorePackagesPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

test-assets/test-projects/ProjectWithComplexAnalyzers/ProjectWithComplexAnalyzers.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RestorePackagesPath>./nugets/</RestorePackagesPath>
+    <RestorePackagesPath>nugets</RestorePackagesPath>
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />

test-assets/test-projects/ProjectWithDisabledAnalyzers/ProjectWithDisabledAnalyzers.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RestorePackagesPath>./nugets/</RestorePackagesPath>
+    <RestorePackagesPath>nugets</RestorePackagesPath>
     <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
   <ItemGroup>

test-assets/test-projects/ProjectWithDisabledAnalyzers2/ProjectWithDisabledAnalyzers2.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RestorePackagesPath>./nugets/</RestorePackagesPath>
+    <RestorePackagesPath>nugets/</RestorePackagesPath>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
   <ItemGroup>

tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs

@@ -3,14 +3,10 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Mef;
-using OmniSharp.Models;
 using OmniSharp.Models.Events;
 using OmniSharp.MSBuild.Notification;
 using OmniSharp.Services;
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Composition.Hosting.Core;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -96,75 +92,72 @@ public async Task The_target_framework_is_emitted()
         {
             // Arrange
             var expectedTFM = "netcoreapp2.1";
-            var emitter = new ProjectLoadTestEventEmitter();
 
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("HelloWorld"))
-            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            using (var host = CreateMSBuildTestHost(testProject.Directory))
             {
-                Assert.Single(emitter.ReceivedMessages);
-                Assert.Equal(emitter.ReceivedMessages[0].TargetFrameworks.First(), expectedTFM);
+                var emitter = host.GetTestEventEmitter();
+                await emitter.WaitForMessage<ProjectConfigurationMessage>();
+                Assert.Equal(emitter.Messages.OfType<ProjectConfigurationMessage>().First().TargetFrameworks.First(), expectedTFM);
             }
         }
 
         [Fact]
         public async Task If_there_is_a_solution_file_the_project_guid_present_in_it_is_emitted()
         {
-            // Arrange
-            var emitter = new ProjectLoadTestEventEmitter();
-
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("ProjectAndSolution"))
-            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            using (var host = CreateMSBuildTestHost(testProject.Directory))
             {
+                var emitter = host.GetTestEventEmitter();
                 var expectedGuid = "A4C2694D-AEB4-4CB1-8951-5290424EF883".ToLower();
-                Assert.Single(emitter.ReceivedMessages);
-                Assert.Equal(emitter.ReceivedMessages[0].ProjectId, expectedGuid);
+                await emitter.WaitForMessage<ProjectConfigurationMessage>();
+                Assert.Equal(emitter.Messages.OfType<ProjectConfigurationMessage>().First().ProjectId, expectedGuid);
             }
         }
 
         [Fact]
         public async Task If_there_is_no_solution_file_the_hash_of_project_file_content_and_name_is_emitted()
         {
-            // Arrange
-            var emitter = new ProjectLoadTestEventEmitter();
-
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("HelloWorld"))
-            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            using (var host = CreateMSBuildTestHost(testProject.Directory))
             {
+                var emitter = host.GetTestEventEmitter();
                 var projectFileContent = File.ReadAllText(Directory.GetFiles(testProject.Directory, "*.csproj").Single());
                 var expectedGuid = GetHashedReference($"Filename: HelloWorld.csproj\n{projectFileContent}");
-                Assert.Single(emitter.ReceivedMessages);
-                Assert.Equal(emitter.ReceivedMessages[0].ProjectId, expectedGuid);
+                await emitter.WaitForMessage<ProjectConfigurationMessage>();
+                Assert.Equal(emitter.Messages.OfType<ProjectConfigurationMessage>().First().ProjectId, expectedGuid);
             }
         }
 
         [Fact]
         public async Task Given_a_restored_project_the_references_are_emitted()
         {
-            var emitter = new ProjectLoadTestEventEmitter();
+            // TODO: ProjectConfigurationMessage doesn't get emitted after host startup on restore with references, for this reason restore is done
+            // before host startup to support custom event listning
+            var testEventEmitter = new TestEventEmitter();
+            var descriptor = MefValueProvider.From<IMSBuildEventSink>(new ProjectLoadListener(new LoggerFactory(), testEventEmitter));
 
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("HelloWorld"))
             {
-                var dotnetCliService = new DotNetCliService(LoggerFactory, emitter);
-                await dotnetCliService.RestoreAsync(testProject.Directory);
-                using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+                await new DotNetCliService(new LoggerFactory(), testEventEmitter).RestoreAsync(testProject.Directory);
+                using (var host = CreateMSBuildTestHost(testProject.Directory, additionalExports: new[] { descriptor }))
                 {
-                    Assert.Single(emitter.ReceivedMessages);
-                    Assert.NotEmpty(emitter.ReceivedMessages[0].References.Where(reference => reference == GetHashedReference("system.core")));
+                    await testEventEmitter.WaitForMessage<ProjectConfigurationMessage>();
+                    Assert.NotEmpty(testEventEmitter.Messages.OfType<ProjectConfigurationMessage>().Last().References.Where(reference => reference == GetHashedReference("system.core")));
                 }
             }
         }
 
-
         [Fact]
         public async Task If_there_are_multiple_target_frameworks_they_are_emitted()
         {
-            var emitter = new ProjectLoadTestEventEmitter();
-
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("ProjectWithMultiTFMLib/Lib"))
-            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            using (var host = CreateMSBuildTestHost(testProject.Directory))
             {
-                Assert.Single(emitter.ReceivedMessages);
-                var tfm = emitter.ReceivedMessages[0].TargetFrameworks.ToArray();
+                var emitter = host.GetTestEventEmitter();
+                Assert.NotEmpty(emitter.Messages.OfType<ProjectConfigurationMessage>());
+
+                var tfm = emitter.Messages.OfType<ProjectConfigurationMessage>().Last().TargetFrameworks.ToArray();
                 Assert.Equal(2, tfm.Count());
                 Assert.Equal("netstandard1.3", tfm[0]);
                 Assert.Equal("netstandard2.0", tfm[1]);
@@ -174,15 +167,14 @@ public async Task If_there_are_multiple_target_frameworks_they_are_emitted()
         [Fact]
         public async Task The_hashed_references_of_the_source_files_are_emitted()
         {
-            // Arrange
-            var emitter = new ProjectLoadTestEventEmitter();
-
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync("HelloWorld"))
-            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            using (var host = CreateMSBuildTestHost(testProject.Directory))
             {
-                Assert.Single(emitter.ReceivedMessages);
-                Assert.Single(emitter.ReceivedMessages[0].FileExtensions);
-                Assert.Equal(emitter.ReceivedMessages[0].FileExtensions.First(), GetHashedFileExtension(".cs"));
+                var emitter = host.GetTestEventEmitter();
+
+                await emitter.WaitForMessage<ProjectConfigurationMessage>();
+                Assert.Single(emitter.Messages.OfType<ProjectConfigurationMessage>().First().FileExtensions);
+                Assert.Equal(emitter.Messages.OfType<ProjectConfigurationMessage>().First().FileExtensions.First(), GetHashedFileExtension(".cs"));
             }
         }