Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.61.0" />
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="10.0.301" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.8.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.Telemetry" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Platform" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="2.2.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.Telemetry" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Platform" Version="2.3.1" />
<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="2.3.1" />
<PackageVersion Include="Imposter" Version="0.1.9"/>
<PackageVersion Include="Mockolate" Version="3.3.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine.Tests/DerivedSkipWithClassDataSourceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public async Task DerivedSkipWithFailingDataSource_ShouldBeSkipped()
await RunTestsWithFilter(
"/*/*/DerivedSkipWithFailingClassDataSourceTests/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand All @@ -31,7 +31,7 @@ public async Task DerivedSkipWithSucceedingDataSource_ShouldBeSkipped()
await RunTestsWithFilter(
"/*/*/DerivedSkipWithSucceedingClassDataSourceTests/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine.Tests/DynamicSkipReasonTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public async Task TestSkippedViaSetSkippedMethod_ShouldContainDynamicDeviceName(
await RunTestsWithFilter(
"/*/*/DynamicSkipReasonTests/TestSkippedViaSetSkippedMethod",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand All @@ -25,7 +25,7 @@ public async Task TestSkippedViaGetSkipReasonOverride_ShouldContainDynamicDevice
await RunTestsWithFilter(
"/*/*/DynamicSkipReasonTests/TestSkippedViaGetSkipReasonOverride",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine.Tests/GitHubReporterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,9 @@ private static TestNodeUpdateMessage CreatePassedTestMessage(
string testId, string displayName, string typeName) =>
CreateTestMessage(testId, displayName, typeName, PassedTestNodeStateProperty.CachedInstance);

#pragma warning disable CS0618
#pragma warning disable CS0618, MTP0001 // Required to verify TUnit's cancelled-state reporting
private static TestNodeUpdateMessage CreateCancelledTestMessage(
string testId, string displayName, string typeName) =>
CreateTestMessage(testId, displayName, typeName, new CancelledTestNodeStateProperty());
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
}
4 changes: 2 additions & 2 deletions TUnit.Engine.Tests/SkipInHooksTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public async Task SkipInBeforeClassHook_ShouldMarkTestAsSkipped()
await RunTestsWithFilter(
"/*/*/SkipInBeforeClassHookTests/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand All @@ -25,7 +25,7 @@ public async Task SkipInBeforeTestHook_ShouldMarkAllTestsAsSkipped()
await RunTestsWithFilter(
"/*/*/SkipInBeforeTestHookTests/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(2),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine.Tests/SkipTestExceptionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ public async Task ThrowingSkipTestException_ShouldMarkAsSkipped()
await RunTestsWithFilter(
"/*/*/SkipExceptionFixTest/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
result => result.ResultSummary.Counters.NotExecuted.ShouldBe(1)
]);
}
}
}
2 changes: 1 addition & 1 deletion TUnit.Engine.Tests/SkipTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public async Task Test()
await RunTestsWithFilter(
"/*/*/SkipTests/*",
[
result => result.ResultSummary.Outcome.ShouldBe("Failed"),
result => result.ResultSummary.Outcome.ShouldBe("Completed"),
result => result.ResultSummary.Counters.Total.ShouldBe(1),
result => result.ResultSummary.Counters.Passed.ShouldBe(0),
result => result.ResultSummary.Counters.Failed.ShouldBe(0),
Expand Down
16 changes: 8 additions & 8 deletions TUnit.Engine/Reporters/GitHubReporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ public Task AfterRunAsync(int exitCode, CancellationToken cancellation)
case InProgressTestNodeStateProperty:
inProgress.Add(kvp);
break;
#pragma warning disable CS0618
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's GitHub cancellation reporting
case CancelledTestNodeStateProperty:
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
cancelled.Add(kvp);
break;
}
Expand Down Expand Up @@ -502,12 +502,12 @@ private static bool IsFileLocked(IOException exception)

private string GetDetails(IProperty? stateProperty, PropertyBag properties)
{
#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's GitHub cancellation reporting
if (stateProperty is FailedTestNodeStateProperty
or ErrorTestNodeStateProperty
or TimeoutTestNodeStateProperty
or CancelledTestNodeStateProperty)
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
{
return $"<pre>{GetError(stateProperty)}</pre>";
}
Expand Down Expand Up @@ -536,9 +536,9 @@ or TimeoutTestNodeStateProperty
ErrorTestNodeStateProperty errorTestNodeStateProperty =>
GetTruncatedExceptionMessage(TUnitFailedException.Unwrap(errorTestNodeStateProperty.Exception)) ?? "Test failed",
TimeoutTestNodeStateProperty timeoutTestNodeStateProperty => timeoutTestNodeStateProperty.Explanation,
#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's GitHub cancellation reporting
CancelledTestNodeStateProperty => "Test was cancelled",
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
_ => null
};
}
Expand Down Expand Up @@ -566,9 +566,9 @@ private static string GetStatus(IProperty? stateProperty)
{
return stateProperty switch
{
#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's GitHub cancellation reporting
CancelledTestNodeStateProperty => "Cancelled",
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
ErrorTestNodeStateProperty => "Failed",
FailedTestNodeStateProperty => "Failed",
InProgressTestNodeStateProperty => "In Progress (never finished)",
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine/Reporters/Html/HtmlReporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,9 @@ private static (string Status, ReportExceptionData? Exception, string? SkipReaso
ErrorTestNodeStateProperty error => ("error", MapException(error.Exception), null),
TimeoutTestNodeStateProperty timeout => ("timedOut", MapException(timeout.Exception), null),
SkippedTestNodeStateProperty skipped => ("skipped", null, skipped.Explanation),
#pragma warning disable CS0618
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's HTML cancellation reporting
CancelledTestNodeStateProperty => ("cancelled", null, null),
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
InProgressTestNodeStateProperty => ("inProgress", null, null),
_ => ("unknown", null, null)
};
Expand Down
4 changes: 2 additions & 2 deletions TUnit.Engine/TUnitMessageBus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ public ValueTask Skipped(TestContext testContext, string reason)

public ValueTask Cancelled(TestContext testContext, DateTimeOffset start)
{
#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete - TUnit still needs to report cancelled state for its own reporters
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's own cancellation reporters
var testNode = testContext.ToTestNode(new CancelledTestNodeStateProperty());
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001

return new ValueTask(context.MessageBus.PublishAsync(this, CreateUpdateMessage(testContext, testNode)));
}
Expand Down
8 changes: 4 additions & 4 deletions TUnit.Engine/Xml/JUnitXmlWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,9 @@ private static void WriteTestCase(XmlWriter writer, TestNodeUpdateMessage test)
WriteTimeoutError(writer, timeout);
break;

#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's JUnit cancellation reporting
case CancelledTestNodeStateProperty:
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
WriteCancellationError(writer);
break;

Expand Down Expand Up @@ -396,9 +396,9 @@ private static TestSummary CalculateSummary(IEnumerable<TestNodeUpdateMessage> t
break;
case ErrorTestNodeStateProperty:
case TimeoutTestNodeStateProperty:
#pragma warning disable CS0618 // CancelledTestNodeStateProperty is obsolete
#pragma warning disable CS0618, MTP0001 // Retained for TUnit's JUnit cancellation reporting
case CancelledTestNodeStateProperty:
#pragma warning restore CS0618
#pragma warning restore CS0618, MTP0001
case InProgressTestNodeStateProperty:
summary.Errors++;
break;
Expand Down
2 changes: 1 addition & 1 deletion examples/CloudShop/CloudShop.Tests/CloudShop.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectReference Include="..\..\..\TUnit\TUnit.csproj" />
<ProjectReference Include="..\..\..\TUnit.Aspire\TUnit.Aspire.csproj" />
<ProjectReference Include="..\..\..\TUnit.Assertions.SourceGenerator\TUnit.Assertions.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="2.2.3" />
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="2.3.1" />
<PackageReference Include="Npgsql" Version="10.0.3" />
<PackageReference Include="StackExchange.Redis" Version="3.0.17" />
<PackageReference Include="RabbitMQ.Client" Version="7.2.1" />
Expand Down
Loading