Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate host.tests from Newtonsoft to STJ #76901

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Migrate host.tests from Newtonsoft to STJ #76901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608150a
Migrate host.tests from Newtonsoft to STJ
am11 Oct 10, 2022
4d10094
Revert MoqVersion
am11 Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
<NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
<MoqVersion>4.12.0</MoqVersion>
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
<FsCheckVersion>2.14.3</FsCheckVersion>
<!-- Android gRPC client tests -->
<GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
Expand Down
6 changes: 1 addition & 5 deletions src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Project>

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
Expand All @@ -12,6 +10,4 @@
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

</Project>
8 changes: 4 additions & 4 deletions .../HostActivation.Tests/DependencyResolution/DependencyResolutionCommandResultExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static AndConstraint<CommandResultAssertions> HaveRuntimePropertyContaini
foreach (string value in values)
{
Execute.Assertion.ForCondition(propertyValue != null && propertyValue.Contains(value))
.FailWithPreformatted($"The property {propertyName} doesn't contain expected value: '{value}'{Environment.NewLine}" +
.FailWith($"The property {propertyName} doesn't contain expected value: '{value}'{Environment.NewLine}" +
$"{propertyName}='{propertyValue}'" +
$"{assertion.GetDiagnosticsInfo()}");
}
Expand All @@ -37,7 +37,7 @@ public static AndConstraint<CommandResultAssertions> NotHaveRuntimePropertyConta
foreach (string value in values)
{
Execute.Assertion.ForCondition(propertyValue != null && !propertyValue.Contains(value))
.FailWithPreformatted($"The property {propertyName} contains unexpected value: '{value}'{Environment.NewLine}" +
.FailWith($"The property {propertyName} contains unexpected value: '{value}'{Environment.NewLine}" +
$"{propertyName}='{propertyValue}'" +
$"{assertion.GetDiagnosticsInfo()}");
}
Expand Down Expand Up @@ -84,7 +84,7 @@ public static AndConstraint<CommandResultAssertions> HaveResolvedComponentDepend
foreach (string value in values)
{
Execute.Assertion.ForCondition(propertyValue != null && propertyValue.Contains(value))
.FailWithPreformatted($"The resolved {propertyName} doesn't contain expected value: '{value}'{Environment.NewLine}" +
.FailWith($"The resolved {propertyName} doesn't contain expected value: '{value}'{Environment.NewLine}" +
$"{propertyName}='{propertyValue}'" +
$"{assertion.GetDiagnosticsInfo()}");
}
Expand All @@ -102,7 +102,7 @@ public static AndConstraint<CommandResultAssertions> NotHaveResolvedComponentDep
foreach (string value in values)
{
Execute.Assertion.ForCondition(propertyValue != null && !propertyValue.Contains(value))
.FailWithPreformatted($"The resolved {propertyName} contains unexpected value: '{value}'{Environment.NewLine}" +
.FailWith($"The resolved {propertyName} contains unexpected value: '{value}'{Environment.NewLine}" +
$"{propertyName}='{propertyValue}'" +
$"{assertion.GetDiagnosticsInfo()}");
}
Expand Down
24 changes: 14 additions & 10 deletions src/installer/tests/HostActivation.Tests/LightupAppActivation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Newtonsoft.Json.Linq;
using System;
using System.IO;
using System.Text.Json.Nodes;
using Xunit;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
Expand Down Expand Up @@ -400,9 +400,11 @@ public void SharedFx_With_Higher_Version_Wins_Against_Additional_Deps()

// Create a deps.json file in the folder "additionalDeps\shared\Microsoft.NETCore.App\9999.0.0"
string additionalDepsRootPath = Path.Combine(_fxBaseDir, "additionalDeps");
JObject versionInfo = new JObject();
versionInfo.Add(new JProperty("assemblyVersion", "0.0.0.1"));
versionInfo.Add(new JProperty("fileVersion", "0.0.0.2"));
JsonObject versionInfo = new JsonObject
{
["assemblyVersion"] = "0.0.0.1",
["fileVersion"] = "0.0.0.2"
};
string additionalDepsPath = CreateAdditionalDeps(additionalDepsRootPath, versionInfo);

// Version: NetCoreApp 9999.0.0
Expand Down Expand Up @@ -456,10 +458,12 @@ public void SharedFx_With_Lower_Version_Loses_Against_Additional_Deps()

// Create a deps.json file in the folder "additionalDeps\shared\Microsoft.NETCore.App\9999.0.0"
string additionalDepsRootPath = Path.Combine(_fxBaseDir, "additionalDeps");
JObject versionInfo = new JObject();
// Use Higher version numbers to win
versionInfo.Add(new JProperty("assemblyVersion", "99.9.9.9"));
versionInfo.Add(new JProperty("fileVersion", "98.9.9.9"));
JsonObject versionInfo = new JsonObject
{
// Use Higher version numbers to win
["assemblyVersion"] = "99.9.9.9",
["fileVersion"] = "98.9.9.9"
};
string additionalDepsPath = CreateAdditionalDeps(additionalDepsRootPath, versionInfo);

// Version: NetCoreApp 9999.0.0
Expand Down Expand Up @@ -492,7 +496,7 @@ private static void CreateLightupFolder(string customLightupPath, string version
File.Copy(libDepsJson, Path.Combine(customLightupPath, Path.GetFileName(libDepsJson)));
}

private static string CreateAdditionalDeps(string destDir, JObject immutableCollectionVersionInfo)
private static string CreateAdditionalDeps(string destDir, JsonObject immutableCollectionVersionInfo)
{
DirectoryInfo dir = new DirectoryInfo(destDir);
if (dir.Exists)
Expand All @@ -502,7 +506,7 @@ private static string CreateAdditionalDeps(string destDir, JObject immutableColl

dir.Create();

JObject depsjson = SharedFramework.CreateDepsJson("Microsoft.NETCore.App", "LightupLib/1.0.0", "LightupLib");
JsonObject depsjson = SharedFramework.CreateDepsJson("Microsoft.NETCore.App", "LightupLib/1.0.0", "LightupLib");

string depsFile = Path.Combine(destDir, "My.deps.json");
File.WriteAllText(depsFile, depsjson.ToString());
Expand Down
4 changes: 2 additions & 2 deletions ...osoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Bundle.Tests/BundlerConsistencyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ public void TestWithIdenticalBundlesShouldBeBinaryEqualPasses()
var secondBundle = CreateSampleBundle(true);
byte[] secondBundleContent = File.ReadAllBytes(secondBundle.bundleFileName);

firstBundle.bundleId.ShouldBeEquivalentTo(secondBundle.bundleId,
firstBundle.bundleId.Should().BeEquivalentTo(secondBundle.bundleId,
"Deterministic/Reproducible build should produce identical bundle id for identical inputs");
firstBundleContent.ShouldBeEquivalentTo(secondBundleContent,
firstBundleContent.Should().BeEquivalentTo(secondBundleContent,
"Deterministic/Reproducible build should produce identical binary for identical inputs");
}

Expand Down
20 changes: 0 additions & 20 deletions src/installer/tests/TestUtils/Assertions/AssertionScopeExtensions.cs
View file
Open in desktop

This file was deleted.

34 changes: 17 additions & 17 deletions src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,121 +21,121 @@ public CommandResultAssertions(CommandResult commandResult)
public AndConstraint<CommandResultAssertions> ExitWith(int expectedExitCode)
{
Execute.Assertion.ForCondition(Result.ExitCode == expectedExitCode)
.FailWithPreformatted($"Expected command to exit with {expectedExitCode} but it did not.{GetDiagnosticsInfo()}");
.FailWith($"Expected command to exit with {expectedExitCode} but it did not.{GetDiagnosticsInfo()}");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we had to explicitly use our extension and AddFailure (or I guess AddPreFormattedFailure in newer versions) because FailWith would always go through the the FluentAssertions formatter which messed with things like newlines. Does the new version not do that anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were a lot of API changes between v4 and the latest v6. AssertionScope.Succeeded etc. are not available on public surface anymore.

FailWith would always go through the the FluentAssertions formatter which messed with things like newlines.

If this is still a problem, we can change the behavior with AssertionOptions.FormattingOptions.UseLineBreaks = true (or fluent API .UsingLineBreaks).

return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> Pass()
{
Execute.Assertion.ForCondition(Result.ExitCode == 0)
.FailWithPreformatted($"Expected command to pass but it did not.{GetDiagnosticsInfo()}");
.FailWith($"Expected command to pass but it did not.{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> Fail()
{
Execute.Assertion.ForCondition(Result.ExitCode != 0)
.FailWithPreformatted($"Expected command to fail but it did not.{GetDiagnosticsInfo()}");
.FailWith($"Expected command to fail but it did not.{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdOut()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdOut))
.FailWithPreformatted($"Command did not output anything to stdout{GetDiagnosticsInfo()}");
.FailWith($"Command did not output anything to stdout{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdOut(string expectedOutput)
{
Execute.Assertion.ForCondition(Result.StdOut.Equals(expectedOutput, StringComparison.Ordinal))
.FailWithPreformatted($"Command did not output with Expected Output. Expected: '{expectedOutput}'{GetDiagnosticsInfo()}");
.FailWith($"Command did not output with Expected Output. Expected: '{expectedOutput}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdOutContaining(string pattern)
{
Execute.Assertion.ForCondition(Result.StdOut.Contains(pattern))
.FailWithPreformatted($"The command output did not contain expected result: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"The command output did not contain expected result: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern)
{
Execute.Assertion.ForCondition(!Result.StdOut.Contains(pattern))
.FailWithPreformatted($"The command output contained a result it should not have contained: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"The command output contained a result it should not have contained: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(Regex.IsMatch(Result.StdOut, pattern, options))
.FailWithPreformatted($"Matching the command output failed. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"Matching the command output failed. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdErr()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
.FailWithPreformatted($"Command did not output anything to stderr.{GetDiagnosticsInfo()}");
.FailWith($"Command did not output anything to stderr.{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdErrContaining(string pattern)
{
Execute.Assertion.ForCondition(Result.StdErr.Contains(pattern))
.FailWithPreformatted($"The command error output did not contain expected result: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"The command error output did not contain expected result: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotHaveStdErrContaining(string pattern)
{
Execute.Assertion.ForCondition(!Result.StdErr.Contains(pattern))
.FailWithPreformatted($"The command error output contained a result it should not have contained: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"The command error output contained a result it should not have contained: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdErrMatching(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(Regex.IsMatch(Result.StdErr, pattern, options))
.FailWithPreformatted($"Matching the command error output failed. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
.FailWith($"Matching the command error output failed. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotHaveStdOut()
{
Execute.Assertion.ForCondition(string.IsNullOrEmpty(Result.StdOut))
.FailWithPreformatted($"Expected command to not output to stdout but it was not:{GetDiagnosticsInfo()}");
.FailWith($"Expected command to not output to stdout but it was not:{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotHaveStdErr()
{
Execute.Assertion.ForCondition(string.IsNullOrEmpty(Result.StdErr))
.FailWithPreformatted($"Expected command to not output to stderr but it was not:{GetDiagnosticsInfo()}");
.FailWith($"Expected command to not output to stderr but it was not:{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> FileExists(string path)
{
Execute.Assertion.ForCondition(System.IO.File.Exists(path))
.FailWithPreformatted($"The command did not write the expected file: '{path}'{GetDiagnosticsInfo()}");
.FailWith($"The command did not write the expected file: '{path}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> FileContains(string path, string pattern)
{
string fileContent = System.IO.File.ReadAllText(path);
Execute.Assertion.ForCondition(fileContent.Contains(pattern))
.FailWithPreformatted($"The command did not write the expected result '{pattern}' to the file: '{path}'{GetDiagnosticsInfo()}{Environment.NewLine}file content: >>{fileContent}<<");
.FailWith($"The command did not write the expected result '{pattern}' to the file: '{path}'{GetDiagnosticsInfo()}{Environment.NewLine}file content: >>{fileContent}<<");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotFileContains(string path, string pattern)
{
string fileContent = System.IO.File.ReadAllText(path);
Execute.Assertion.ForCondition(!fileContent.Contains(pattern))
.FailWithPreformatted($"The command did not write the expected result '{pattern}' to the file: '{path}'{GetDiagnosticsInfo()}{Environment.NewLine}file content: >>{fileContent}<<");
.FailWith($"The command did not write the expected result '{pattern}' to the file: '{path}'{GetDiagnosticsInfo()}{Environment.NewLine}file content: >>{fileContent}<<");
return new AndConstraint<CommandResultAssertions>(this);
}

Expand Down
Loading