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

Make pm server tests pass on windows

Browse source
This commit is contained in:
Mihai Codoban 2016-03-29 11:32:33 -07:00
parent d2984e3cfc
commit 090336d785
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -436,7 +436,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
{ {
dependencies.RetrieveDependency(each) dependencies.RetrieveDependency(each)
.AssertProperty("Type", LibraryType.MSBuildProject.ToString()) .AssertProperty("Type", LibraryType.MSBuildProject.ToString())
.AssertProperty("MSBuildProjectPath", Path.Combine("..", "..", each, $"{each}.csproj")) .AssertProperty("MSBuildProjectPath", AssertPathsEqual(Path.Combine("..", "..", each, $"{each}.csproj")))
.AssertProperty<bool>("Resolved", true) .AssertProperty<bool>("Resolved", true)
.AssertProperty("Name", each) .AssertProperty("Name", each)
.AssertProperty<JArray>("Errors", array => array.Count == 0) .AssertProperty<JArray>("Errors", array => array.Count == 0)
@ -455,18 +455,36 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
Assert.True(classLibraries.Contains(name)); Assert.True(classLibraries.Contains(name));
projectRef.AssertProperty<string>("Path", path => path.Contains(Path.Combine("BasicCase01", name))) projectRef.AssertProperty<string>("Path", path => path.Contains(Path.Combine("BasicCase01", name)))
.AssertProperty("MSBuildProjectPath", Path.Combine("..", "..", name, $"{name}.csproj")); .AssertProperty("MSBuildProjectPath", AssertPathsEqual(Path.Combine("..", "..", name, $"{name}.csproj")));
} }
var fileReferences = references.RetrievePropertyAs<JArray>("FileReferences") var fileReferences = references.RetrievePropertyAs<JArray>("FileReferences")
.Select(each => each.Value<string>()) .Select(each => each.Value<string>())
.ToArray(); .ToArray();
Assert.Equal(3, fileReferences.Length); Assert.Equal(7, fileReferences.Length);
foreach (var each in classLibraries) foreach (var each in classLibraries)
{ {
fileReferences.Contains(Path.Combine("BasicCase01", "ClassLibrary1", "bin", "Debug", $"{each}.dll")); fileReferences.Contains(Path.Combine("BasicCase01", "ClassLibrary1", "bin", "Debug", $"{each}.dll"));
} }
} }
} }
private static Func<string, bool> AssertPathsEqual(string expectedString)
{
return
(string t) =>
{
if (t.Contains('/'))
{
t = t.Replace('/', Path.DirectorySeparatorChar);
}
else if (t.Contains('\\'))
{
t = t.Replace('\\', Path.DirectorySeparatorChar);
}
return string.Equals(t, expectedString);
};
}
} }
} }