Code style

xunit · Feb 26, 2024 · 7c7d7ab · 7c7d7ab
1 parent a7721a9
commit 7c7d7ab
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 45 deletions.
diff --git a/samples/xunit-runner-sample/xunit-runner-sample.csproj b/samples/xunit-runner-sample/xunit-runner-sample.csproj
@@ -17,10 +17,7 @@
   <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>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8-pre.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/xunit-runner-sample/xunit-runner-sample.sln b/samples/xunit-runner-sample/xunit-runner-sample.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xunit-runner-sample", "xunit-runner-sample.csproj", "{CA7073C4-D751-474E-80E0-C252F722DBAE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CA7073C4-D751-474E-80E0-C252F722DBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA7073C4-D751-474E-80E0-C252F722DBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA7073C4-D751-474E-80E0-C252F722DBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA7073C4-D751-474E-80E0-C252F722DBAE}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/src/xunit.runner.visualstudio/TestingPlatform/TestApplicationBuilderExtensions.cs b/src/xunit.runner.visualstudio/TestingPlatform/TestApplicationBuilderExtensions.cs
@@ -1,7 +1,6 @@
 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;
@@ -11,13 +10,16 @@ namespace Xunit.Runner.VisualStudio;
 
 public static class TestApplicationBuilderExtensions
 {
-	public static void AddXunit(this ITestApplicationBuilder testApplicationBuilder, Func<IEnumerable<Assembly>> getTestAssemblies)
+	public static void AddXunit(
+		this ITestApplicationBuilder testApplicationBuilder,
+		Func<IEnumerable<Assembly>> getTestAssemblies)
 	{
 		XunitExtension extension = new();
 		testApplicationBuilder.AddRunSettingsService(extension);
 		testApplicationBuilder.AddTestCaseFilterService(extension);
 		testApplicationBuilder.RegisterTestFramework(
 			_ => new TestFrameworkCapabilities(new VSTestBridgeExtensionBaseCapabilities()),
-			(capabilities, serviceProvider) => new XunitBridgedTestFramework(extension, getTestAssemblies, serviceProvider, capabilities));
+			(capabilities, serviceProvider) => new XunitBridgedTestFramework(extension, getTestAssemblies, serviceProvider, capabilities)
+		);
 	}
 }
diff --git a/src/xunit.runner.visualstudio/TestingPlatform/TestingPlatformBuilderHook.cs b/src/xunit.runner.visualstudio/TestingPlatform/TestingPlatformBuilderHook.cs
@@ -1,15 +1,12 @@
 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()!]);
-	}
+	public static void AddExtensions(
+		ITestApplicationBuilder testApplicationBuilder,
+		string[] _) =>
+			testApplicationBuilder.AddXunit(() => [Assembly.GetEntryAssembly()!]);
 }
diff --git a/src/xunit.runner.visualstudio/TestingPlatform/XunitBridgedTestFramework.cs b/src/xunit.runner.visualstudio/TestingPlatform/XunitBridgedTestFramework.cs
@@ -7,48 +7,46 @@
 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)
-	{
-	}
+	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,
+	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);
-		}
+			discoverer.DiscoverTests(request.AssemblyPaths, request.DiscoveryContext, request.MessageLogger, request.DiscoverySink);
 
 		return Task.CompletedTask;
 	}
 
 	/// <inheritdoc />
-	protected override Task SynchronizedRunTestsAsync(VSTestRunTestExecutionRequest request, IMessageBus messageBus,
+	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);
-			}
+				runner.RunTests(testCases, request.RunContext, request.FrameworkHandle);
 			else
-			{
-				executor.RunTests(request.AssemblyPaths, request.RunContext, request.FrameworkHandle);
-			}
-		}
+				runner.RunTests(request.AssemblyPaths, request.RunContext, request.FrameworkHandle);
 
 		return Task.CompletedTask;
 	}

diff --git a/src/xunit.runner.visualstudio/TestingPlatform/XunitExtension.cs b/src/xunit.runner.visualstudio/TestingPlatform/XunitExtension.cs
@@ -7,11 +7,11 @@ internal sealed class XunitExtension : IExtension
 {
 	public string Uid => nameof(XunitExtension);
 
-	public string DisplayName => "xUnit";
+	public string DisplayName => "xUnit.net";
 
 	public string Version => ThisAssembly.AssemblyVersion;
 
-	public string Description => "xUnit Framework for Microsoft Testing Platform";
+	public string Description => "xUnit.net Framework for Microsoft Testing Platform";
 
 	public Task<bool> IsEnabledAsync() => Task.FromResult(true);
 }
diff --git a/src/xunit.runner.visualstudio/VsTestRunner.cs b/src/xunit.runner.visualstudio/VsTestRunner.cs
@@ -113,7 +113,7 @@ public void Cancel()
 			cancelled = true;
 		}
 
-		void ITestDiscoverer.DiscoverTests(
+		public void DiscoverTests(
 			IEnumerable<string> sources,
 			IDiscoveryContext discoveryContext,
 			IMessageLogger logger,
@@ -153,7 +153,7 @@ static void PrintHeader(LoggerHelper loggerHelper)
 				loggerHelper.Log($"xUnit.net VSTest Adapter v{ThisAssembly.AssemblyInformationalVersion} ({IntPtr.Size * 8}-bit {RuntimeInformation.FrameworkDescription})");
 		}
 
-		void ITestExecutor.RunTests(
+		public void RunTests(
 			IEnumerable<string>? sources,
 			IRunContext? runContext,
 			IFrameworkHandle? frameworkHandle)
@@ -182,7 +182,7 @@ void ITestExecutor.RunTests(
 			);
 		}
 
-		void ITestExecutor.RunTests(
+		public void RunTests(
 			IEnumerable<TestCase>? tests,
 			IRunContext? runContext,
 			IFrameworkHandle? frameworkHandle)

diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec
@@ -14,19 +14,18 @@
     <description>Visual Studio 2022+ Test Explorer runner for the xUnit.net framework. Capable of running xUnit.net v1.9.2 and v2.0+ tests. Supports .NET 4.6.2 or later, and .NET 6 or later.</description>
     <copyright>Copyright (C) .NET Foundation</copyright>
     <repository type="git" url="https://github.com/xunit/visualstudio.xunit" commit="$GitCommitId$" />
-    <developmentDependency>true</developmentDependency>
     <dependencies>
       <group targetFramework="net462">
         <dependency id="Microsoft.TestPlatform.ObjectModel" version="$MicrosoftTestPlatformObjectModelVersion$" />
         <dependency id="Microsoft.Testing.Extensions.Telemetry" version="$MicrosoftTestingPlatformVersion$" />
-		<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="$MicrosoftTestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="$MicrosoftTestingPlatformVersion$" />
         <dependency id="Microsoft.Testing.Platform.MSBuild" version="$MicrosoftTestingPlatformVersion$" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="Microsoft.Testing.Extensions.Telemetry" version="$MicrosoftTestingPlatformVersion$" />
-		<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="$MicrosoftTestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="$MicrosoftTestingPlatformVersion$" />
         <dependency id="Microsoft.Testing.Platform.MSBuild" version="$MicrosoftTestingPlatformVersion$" />
-	  </group>
+      </group>
     </dependencies>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="mscorlib" targetFramework="net462" />
@@ -42,14 +41,14 @@
     <file target="build\net462\" src="bin\$Configuration$\net462\xunit.runner.utility.net452.dll" />
     <file target="build\net462\" src="bin\$Configuration$\net462\$SignedPath$xunit.runner.visualstudio.testadapter.dll" />
     <file target="build\net462\xunit.runner.visualstudio.props" src="build\xunit.runner.visualstudio.desktop.props" />
-	<file target="build\net462\xunit.runner.visualstudio.targets" src="build\xunit.runner.visualstudio.targets" />
+    <file target="build\net462\xunit.runner.visualstudio.targets" src="build\xunit.runner.visualstudio.targets" />
 
     <file target="build\net6.0\" src="bin\$Configuration$\net6.0\xunit.abstractions.dll" />
     <file target="build\net6.0\" src="bin\$Configuration$\net6.0\xunit.runner.reporters.netcoreapp10.dll" />
     <file target="build\net6.0\" src="bin\$Configuration$\net6.0\xunit.runner.utility.netcoreapp10.dll" />
     <file target="build\net6.0\" src="bin\$Configuration$\net6.0\$SignedPath$xunit.runner.visualstudio.testadapter.dll" />
     <file target="build\net6.0\xunit.runner.visualstudio.props" src="build\xunit.runner.visualstudio.dotnetcore.props" />
-	<file target="build\net6.0\xunit.runner.visualstudio.targets" src="build\xunit.runner.visualstudio.targets" />
+    <file target="build\net6.0\xunit.runner.visualstudio.targets" src="build\xunit.runner.visualstudio.targets" />
 
     <file target="lib\net462\" src="build\_._" />