Merge commit '96970e9adedda0c14f40281527ff430363a31d34'
This commit is contained in:
commit
0b65c0a766
8 changed files with 19 additions and 18 deletions
|
@ -234,8 +234,8 @@ jobs:
|
||||||
- task: PublishTestResults@2
|
- task: PublishTestResults@2
|
||||||
displayName: Publish Test Results
|
displayName: Publish Test Results
|
||||||
inputs:
|
inputs:
|
||||||
testRunner: XUnit
|
testRunner: VSTest
|
||||||
testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
|
testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
|
||||||
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
|
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
|
||||||
platform: '$(BuildPlatform)'
|
platform: '$(BuildPlatform)'
|
||||||
configuration: '${{ parameters.buildConfiguration }}'
|
configuration: '${{ parameters.buildConfiguration }}'
|
||||||
|
|
|
@ -240,8 +240,8 @@ jobs:
|
||||||
- task: PublishTestResults@2
|
- task: PublishTestResults@2
|
||||||
displayName: Publish Test Results
|
displayName: Publish Test Results
|
||||||
inputs:
|
inputs:
|
||||||
testRunner: XUnit
|
testRunner: VSTest
|
||||||
testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
|
testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
|
||||||
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
|
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
|
||||||
platform: '$(BuildPlatform)'
|
platform: '$(BuildPlatform)'
|
||||||
configuration: '${{ parameters.buildConfiguration }}'
|
configuration: '${{ parameters.buildConfiguration }}'
|
||||||
|
|
|
@ -3,5 +3,6 @@
|
||||||
<Import Project="..\eng\TestVersions.props" />
|
<Import Project="..\eng\TestVersions.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||||
|
<UseVSTestRunner>true</UseVSTestRunner>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -34,7 +34,7 @@ namespace EndToEnd.Tests
|
||||||
File.Exists(manifestFile).Should().BeTrue();
|
File.Exists(manifestFile).Should().BeTrue();
|
||||||
using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
|
using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
|
||||||
Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
|
Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
|
||||||
readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
|
readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
public AndConstraint<CommandResultAssertions> Pass()
|
public AndConstraint<CommandResultAssertions> Pass()
|
||||||
{
|
{
|
||||||
Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)
|
Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)
|
||||||
.FailWith(AppendDiagnosticsTo($"Expected command to pass but it did not."));
|
.FailWith(AppendDiagnosticsTo("Expected command to pass but it did not."));
|
||||||
return new AndConstraint<CommandResultAssertions>(this);
|
return new AndConstraint<CommandResultAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public AndConstraint<CommandResultAssertions> Fail()
|
public AndConstraint<CommandResultAssertions> Fail()
|
||||||
{
|
{
|
||||||
Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)
|
Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)
|
||||||
.FailWith(AppendDiagnosticsTo($"Expected command to fail but it did not."));
|
.FailWith(AppendDiagnosticsTo("Expected command to fail but it did not."));
|
||||||
return new AndConstraint<CommandResultAssertions>(this);
|
return new AndConstraint<CommandResultAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
public AndConstraint<CommandResultAssertions> NotHaveStdOut()
|
public AndConstraint<CommandResultAssertions> NotHaveStdOut()
|
||||||
{
|
{
|
||||||
Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))
|
Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))
|
||||||
.FailWith(AppendDiagnosticsTo($"Expected command to not output to stdout but it was not:"));
|
.FailWith(AppendDiagnosticsTo("Expected command to not output to stdout but it was not:"));
|
||||||
return new AndConstraint<CommandResultAssertions>(this);
|
return new AndConstraint<CommandResultAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
public AndConstraint<DirectoryInfoAssertions> Exist()
|
public AndConstraint<DirectoryInfoAssertions> Exist()
|
||||||
{
|
{
|
||||||
Execute.Assertion.ForCondition(_dirInfo.Exists)
|
Execute.Assertion.ForCondition(_dirInfo.Exists)
|
||||||
.FailWith("Expected directory {0} does not exist.", _dirInfo.FullName);
|
.FailWith(String.Format("Expected directory {0} does not exist.", _dirInfo.FullName));
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(this);
|
return new AndConstraint<DirectoryInfoAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
Execute.Assertion
|
Execute.Assertion
|
||||||
.ForCondition(file == null)
|
.ForCondition(file == null)
|
||||||
.BecauseOf(because, reasonArgs)
|
.BecauseOf(because, reasonArgs)
|
||||||
.FailWith("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName);
|
.FailWith(String.Format("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName));
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(this);
|
return new AndConstraint<DirectoryInfoAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,8 +109,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
Execute.Assertion
|
Execute.Assertion
|
||||||
.ForCondition(matchingFileExists == true)
|
.ForCondition(matchingFileExists == true)
|
||||||
.BecauseOf(because, reasonArgs)
|
.BecauseOf(because, reasonArgs)
|
||||||
.FailWith("Expected directory {0} to contain files matching {1}, but no matching file exists.",
|
.FailWith(String.Format("Expected directory {0} to contain files matching {1}, but no matching file exists.",
|
||||||
_dirInfo.FullName, expectedFilesSearchPattern);
|
_dirInfo.FullName, expectedFilesSearchPattern));
|
||||||
|
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(this);
|
return new AndConstraint<DirectoryInfoAssertions>(this);
|
||||||
}
|
}
|
||||||
|
@ -132,8 +132,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
{
|
{
|
||||||
var matchingFileCount = _dirInfo.EnumerateFiles(expectedFilesSearchPattern, searchOption).Count();
|
var matchingFileCount = _dirInfo.EnumerateFiles(expectedFilesSearchPattern, searchOption).Count();
|
||||||
Execute.Assertion.ForCondition(matchingFileCount == 0)
|
Execute.Assertion.ForCondition(matchingFileCount == 0)
|
||||||
.FailWith("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
|
.FailWith(String.Format("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
|
||||||
matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern);
|
matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern));
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(this);
|
return new AndConstraint<DirectoryInfoAssertions>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -141,7 +141,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
{
|
{
|
||||||
var dir = _dirInfo.EnumerateDirectories(expectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
|
var dir = _dirInfo.EnumerateDirectories(expectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
|
||||||
Execute.Assertion.ForCondition(dir != null)
|
Execute.Assertion.ForCondition(dir != null)
|
||||||
.FailWith("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName);
|
.FailWith(String.Format("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName));
|
||||||
|
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
|
return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
|
||||||
}
|
}
|
||||||
|
@ -160,7 +160,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
{
|
{
|
||||||
var dir = _dirInfo.EnumerateDirectories(unexpectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
|
var dir = _dirInfo.EnumerateDirectories(unexpectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
|
||||||
Execute.Assertion.ForCondition(dir == null)
|
Execute.Assertion.ForCondition(dir == null)
|
||||||
.FailWith("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName);
|
.FailWith(String.Format("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName));
|
||||||
|
|
||||||
return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
|
return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FluentAssertions" Version="4.18.0" />
|
<PackageReference Include="FluentAssertions" Version="6.12.0" />
|
||||||
<PackageReference Include="xunit" Version="2.4.2" />
|
<PackageReference Include="xunit" Version="2.4.2" />
|
||||||
<PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
|
<PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FluentAssertions" Version="4.18.0" />
|
<PackageReference Include="FluentAssertions" Version="6.12.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
Loading…
Reference in a new issue