mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Send DependencyDiagnostics after Dependencies message

Browse source
This commit is contained in:
Troy Dai 2016-04-12 14:32:45 -07:00
parent aed81d43db
commit 20c24a0b36
2 changed files with 55 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dotnet/commands/dotnet-projectmodel-server/ProjectManager.cs
View file

@ -54,9 +54,9 @@ namespace Microsoft.DotNet.ProjectModel.Server
_messengers = new List<Messenger<ProjectContextSnapshot>> _messengers = new List<Messenger<ProjectContextSnapshot>>
{ {
new DependencyDiagnosticsMessenger(Transmit),
new ReferencesMessenger(Transmit), new ReferencesMessenger(Transmit),
new DependenciesMessenger(Transmit), new DependenciesMessenger(Transmit),
new DependencyDiagnosticsMessenger(Transmit),
new CompilerOptionsMessenger(Transmit), new CompilerOptionsMessenger(Transmit),
new SourcesMessenger(Transmit) new SourcesMessenger(Transmit)
}; };

71
test/dotnet-projectmodel-server.Tests/DthTests.cs
View file

@ -80,6 +80,43 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
} }
} }
[Fact]
public void DependencyDiagnsoticsAfterDependencies()
{
var projectPath = Path.Combine(_testAssetsManager.AssetsRoot, "EmptyConsoleApp");
Assert.NotNull(projectPath);
using (var server = new DthTestServer(_loggerFactory))
using (var client = new DthTestClient(server, _loggerFactory))
{
client.Initialize(projectPath);
var messages = client.DrainAllMessages()
.Select(message => message.MessageType)
.ToArray();
var expectDependencies = true;
var expectDependencyDiagnostics = false;
for (var i = 0; i < messages.Length; ++i)
{
if (messages[i] == MessageTypes.Dependencies)
{
Assert.True(expectDependencies);
expectDependencies = false;
expectDependencyDiagnostics = true;
}
else if (messages[i] == MessageTypes.DependencyDiagnostics)
{
Assert.True(expectDependencyDiagnostics);
expectDependencyDiagnostics = false;
break;
}
}
Assert.False(expectDependencies);
Assert.False(expectDependencyDiagnostics);
}
}
[Theory] [Theory]
[InlineData(4, 4)] [InlineData(4, 4)]
[InlineData(5, 4)] [InlineData(5, 4)]
@ -195,19 +232,19 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
client.Initialize(movedProjectPath); client.Initialize(movedProjectPath);
client.DrainTillFirst("DependencyDiagnostics")
.RetrieveDependencyDiagnosticsCollection()
.RetrieveDependencyDiagnosticsErrorAt(0)
.AssertProperty<string>("FormattedMessage", message => message.Contains("error NU1002"))
.RetrievePropertyAs<JObject>("Source")
.AssertProperty("Name", "EmptyLibrary");
client.DrainTillFirst("Dependencies") client.DrainTillFirst("Dependencies")
.RetrieveDependency("EmptyLibrary") .RetrieveDependency("EmptyLibrary")
.AssertProperty<JArray>("Errors", errorsArray => errorsArray.Count == 1) .AssertProperty<JArray>("Errors", errorsArray => errorsArray.Count == 1)
.AssertProperty<JArray>("Warnings", warningsArray => warningsArray.Count == 0) .AssertProperty<JArray>("Warnings", warningsArray => warningsArray.Count == 0)
.AssertProperty("Name", "EmptyLibrary") .AssertProperty("Name", "EmptyLibrary")
.AssertProperty("Resolved", false); .AssertProperty("Resolved", false);
client.DrainTillFirst("DependencyDiagnostics")
.RetrieveDependencyDiagnosticsCollection()
.RetrieveDependencyDiagnosticsErrorAt(0)
.AssertProperty<string>("FormattedMessage", message => message.Contains("error NU1002"))
.RetrievePropertyAs<JObject>("Source")
.AssertProperty("Name", "EmptyLibrary");
} }
} }
@ -230,17 +267,17 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.RetrievePropertyAs<JArray>("ProjectSearchPaths") .RetrievePropertyAs<JArray>("ProjectSearchPaths")
.AssertJArrayCount(2); .AssertJArrayCount(2);
client.DrainTillFirst("DependencyDiagnostics")
.RetrievePayloadAs<JObject>()
.AssertProperty<JArray>("Errors", array => array.Count == 0)
.AssertProperty<JArray>("Warnings", array => array.Count == 0);
client.DrainTillFirst("Dependencies") client.DrainTillFirst("Dependencies")
.RetrieveDependency("Newtonsoft.Json") .RetrieveDependency("Newtonsoft.Json")
.AssertProperty("Type", "Project") .AssertProperty("Type", "Project")
.AssertProperty("Resolved", true) .AssertProperty("Resolved", true)
.AssertProperty<JArray>("Errors", array => array.Count == 0, _ => "Dependency shouldn't contain any error."); .AssertProperty<JArray>("Errors", array => array.Count == 0, _ => "Dependency shouldn't contain any error.");
client.DrainTillFirst("DependencyDiagnostics")
.RetrievePayloadAs<JObject>()
.AssertProperty<JArray>("Errors", array => array.Count == 0)
.AssertProperty<JArray>("Warnings", array => array.Count == 0);
// Overwrite the global.json to remove search path to ext // Overwrite the global.json to remove search path to ext
File.WriteAllText( File.WriteAllText(
Path.Combine(projectPath, "home", GlobalSettings.FileName), Path.Combine(projectPath, "home", GlobalSettings.FileName),
@ -254,11 +291,6 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.AssertJArrayCount(1) .AssertJArrayCount(1)
.AssertJArrayElement(0, Path.Combine(projectPath, "home", "src")); .AssertJArrayElement(0, Path.Combine(projectPath, "home", "src"));
client.DrainTillFirst("DependencyDiagnostics")
.RetrieveDependencyDiagnosticsCollection()
.RetrieveDependencyDiagnosticsErrorAt<JObject>(0)
.AssertProperty("ErrorCode", "NU1010");
client.DrainTillFirst("Dependencies") client.DrainTillFirst("Dependencies")
.RetrieveDependency("Newtonsoft.Json") .RetrieveDependency("Newtonsoft.Json")
.AssertProperty("Type", "") .AssertProperty("Type", "")
@ -267,6 +299,11 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.AssertJArrayCount(1) .AssertJArrayCount(1)
.RetrieveArraryElementAs<JObject>(0) .RetrieveArraryElementAs<JObject>(0)
.AssertProperty("ErrorCode", "NU1010"); .AssertProperty("ErrorCode", "NU1010");
client.DrainTillFirst("DependencyDiagnostics")
.RetrieveDependencyDiagnosticsCollection()
.RetrieveDependencyDiagnosticsErrorAt<JObject>(0)
.AssertProperty("ErrorCode", "NU1010");
} }
} }