Add initial support for Microsoft.Testing.Platform #403
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <packageSources> | ||
| <clear /> | ||
| <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| <add key="feedz.io/xunit/xunit" value="https://f.feedz.io/xunit/xunit/nuget/index.json" protocolVersion="3" /> | ||
| <add key="local" value="C:\src\visualstudio.xunit\artifacts\packages\" /> | ||
| </packageSources> | ||
| </configuration> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| namespace xunit_runner_sample; | ||
|
|
||
| public class UnitTest1 | ||
| { | ||
| [Fact] | ||
| public void Test1() | ||
| { | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>net462;net6.0</TargetFrameworks> | ||
| <RootNamespace>xunit_runner_sample</RootNamespace> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
|
|
||
| <IsPackable>false</IsPackable> | ||
| <IsTestProject>true</IsTestProject> | ||
|
|
||
| <EnableXunitRunner>true</EnableXunitRunner> | ||
| <OutputType>Exe</OutputType> | ||
| <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" /> | ||
| <PackageReference Include="xunit" Version="2.7.0" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8-pre.1"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Using Include="Xunit" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Reflection; | ||
|
|
||
| using Microsoft.Testing.Extensions.VSTestBridge.Capabilities; | ||
| using Microsoft.Testing.Extensions.VSTestBridge.Helpers; | ||
| using Microsoft.Testing.Platform.Builder; | ||
| using Microsoft.Testing.Platform.Capabilities.TestFramework; | ||
|
|
||
| namespace Xunit.Runner.VisualStudio; | ||
|
|
||
| public static class TestApplicationBuilderExtensions | ||
| { | ||
| public static void AddXunit(this ITestApplicationBuilder testApplicationBuilder, Func<IEnumerable<Assembly>> getTestAssemblies) | ||
| { | ||
| XunitExtension extension = new(); | ||
| testApplicationBuilder.AddRunSettingsService(extension); | ||
|
There was a problem hiding this comment. This provides the runsettings support. |
||
| testApplicationBuilder.AddTestCaseFilterService(extension); | ||
|
There was a problem hiding this comment. This provides support for the vstest way of filtering tests. |
||
| testApplicationBuilder.RegisterTestFramework( | ||
| _ => new TestFrameworkCapabilities(new VSTestBridgeExtensionBaseCapabilities()), | ||
| (capabilities, serviceProvider) => new XunitBridgedTestFramework(extension, getTestAssemblies, serviceProvider, capabilities)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using System.Reflection; | ||
|
|
||
| using Microsoft.Testing.Platform.Builder; | ||
|
|
||
| namespace Xunit.Runner.VisualStudio; | ||
|
|
||
| public static class TestingPlatformBuilderHook | ||
| { | ||
| #pragma warning disable IDE0060 // Remove unused parameter | ||
| public static void AddExtensions(ITestApplicationBuilder testApplicationBuilder, string[] arguments) | ||
| #pragma warning restore IDE0060 // Remove unused parameter | ||
| { | ||
| testApplicationBuilder.AddXunit(() => [Assembly.GetEntryAssembly()!]); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Reflection; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Testing.Extensions.VSTestBridge; | ||
| using Microsoft.Testing.Extensions.VSTestBridge.Requests; | ||
| using Microsoft.Testing.Platform.Capabilities.TestFramework; | ||
| using Microsoft.Testing.Platform.Messages; | ||
| using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter; | ||
|
|
||
| namespace Xunit.Runner.VisualStudio; | ||
|
|
||
| internal sealed class XunitBridgedTestFramework : SynchronizedSingleSessionVSTestBridgedTestFramework | ||
| { | ||
| public XunitBridgedTestFramework(XunitExtension extension, Func<IEnumerable<Assembly>> getTestAssemblies, | ||
| IServiceProvider serviceProvider, ITestFrameworkCapabilities capabilities) | ||
| : base(extension, getTestAssemblies, serviceProvider, capabilities) | ||
| { | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| protected override Task SynchronizedDiscoverTestsAsync(VSTestDiscoverTestExecutionRequest request, IMessageBus messageBus, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| var discoverer = new VsTestRunner(); | ||
| using (cancellationToken.Register(discoverer.Cancel)) | ||
| { | ||
| ((ITestDiscoverer)discoverer).DiscoverTests(request.AssemblyPaths, request.DiscoveryContext, request.MessageLogger, request.DiscoverySink); | ||
| } | ||
|
|
||
| return Task.CompletedTask; | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| protected override Task SynchronizedRunTestsAsync(VSTestRunTestExecutionRequest request, IMessageBus messageBus, | ||
| CancellationToken cancellationToken) | ||
| { | ||
| var runner = new VsTestRunner(); | ||
| using (cancellationToken.Register(runner.Cancel)) | ||
| { | ||
| var executor = (ITestExecutor)runner; | ||
| if (request.VSTestFilter.TestCases is { } testCases) | ||
| { | ||
| executor.RunTests(testCases, request.RunContext, request.FrameworkHandle); | ||
| } | ||
| else | ||
| { | ||
| executor.RunTests(request.AssemblyPaths, request.RunContext, request.FrameworkHandle); | ||
| } | ||
| } | ||
|
|
||
| return Task.CompletedTask; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Testing.Platform.Extensions; | ||
|
|
||
| namespace Xunit.Runner.VisualStudio; | ||
|
|
||
| internal sealed class XunitExtension : IExtension | ||
| { | ||
| public string Uid => nameof(XunitExtension); | ||
|
|
||
| public string DisplayName => "xUnit"; | ||
|
|
||
| public string Version => ThisAssembly.AssemblyVersion; | ||
|
|
||
| public string Description => "xUnit Framework for Microsoft Testing Platform"; | ||
|
|
||
| public Task<bool> IsEnabledAsync() => Task.FromResult(true); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- Handle the coexistance between testing platform and Microsoft.NET.Test.Sdk --> | ||
| <PropertyGroup> | ||
| <GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableXunitRunner)</GenerateTestingPlatformEntryPoint> | ||
| <GenerateProgramFile Condition=" '$(EnableXunitRunner)' == 'true' ">false</GenerateProgramFile> | ||
| <DisableTestingPlatformServerCapability Condition=" '$(EnableXunitRunner)' == 'false' or '$(EnableXunitRunner)' == '' " >true</DisableTestingPlatformServerCapability> | ||
| </PropertyGroup> | ||
|
|
||
| <Choose> | ||
| <!-- Avoid false warning about missing reference (msbuild bug) --> | ||
| <!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 --> | ||
| <When Condition=" '$(EnableXunitRunner)' == 'true' "> | ||
| <ItemGroup> | ||
| <Reference Include="xunit.runner.visualstudio.testadapter"> | ||
| <HintPath>$(MSBuildThisFileDirectory)xunit.runner.visualstudio.testadapter.dll</HintPath> | ||
| </Reference> | ||
| </ItemGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <ItemGroup> | ||
| <None Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.testadapter.dll"> | ||
| <Link>xunit.runner.visualstudio.testadapter.dll</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>False</Visible> | ||
| </None> | ||
| </ItemGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be kept, this is just a temp change for you to test locally (you'll need to update the path as you know).