!nits! Slight Testing cleanup

.github/ISSUE_TEMPLATE/30_api_proposal.md

@@ -1,56 +1,56 @@
----
-name: API proposal
-about: Propose a change to the public API surface
-title: ''
-labels: api-suggestion
-assignees: ''
-
----
-
-## Background and Motivation
-
-<!--
-We welcome API proposals! We have a process to evaluate the value and shape of new API. There is an overview of our process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md). This template will help us gather the information we need to start the review process.
-First, please describe the purpose and value of the new API here.
--->
-
-## Proposed API
-
-<!--
-Please provide the specific public API signature diff that you are proposing. For example:
-```diff
-namespace Microsoft.AspNetCore.Http
-{
-    public static class HttpResponseWritingExtensions
-    {
-+       public Task WriteAsync(this HttpResponse response, StringBuilder builder);
-    }
-}
-```
-You may find the [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/framework-design-guidelines-digest.md) helpful.
--->
-
-## Usage Examples
-
-<!--
-Please provide code examples that highlight how the proposed API additions are meant to be consumed.
-This will help suggest whether the API has the right shape to be functional, performant and useable.
-You can use code blocks like this:
-``` C#
-// some lines of code here
-```
--->
-
-## Alternative Designs
-
-<!--
-Were there other options you considered, such as alternative API shapes?
-How does this compare to analogous APIs in other ecosystems and libraries?
--->
-
-## Risks
-
-<!--
-Please mention any risks that to your knowledge the API proposal might entail, such as breaking changes, performance regressions, etc.
--->
-
+---
+name: API proposal
+about: Propose a change to the public API surface
+title: ''
+labels: api-suggestion
+assignees: ''
+
+---
+
+## Background and Motivation
+
+<!--
+We welcome API proposals! We have a process to evaluate the value and shape of new API. There is an overview of our process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md). This template will help us gather the information we need to start the review process.
+First, please describe the purpose and value of the new API here.
+-->
+
+## Proposed API
+
+<!--
+Please provide the specific public API signature diff that you are proposing. For example:
+```diff
+namespace Microsoft.AspNetCore.Http
+{
+    public static class HttpResponseWritingExtensions
+    {
++       public Task WriteAsync(this HttpResponse response, StringBuilder builder);
+    }
+}
+```
+You may find the [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/framework-design-guidelines-digest.md) helpful.
+-->
+
+## Usage Examples
+
+<!--
+Please provide code examples that highlight how the proposed API additions are meant to be consumed.
+This will help suggest whether the API has the right shape to be functional, performant and useable.
+You can use code blocks like this:
+``` C#
+// some lines of code here
+```
+-->
+
+## Alternative Designs
+
+<!--
+Were there other options you considered, such as alternative API shapes?
+How does this compare to analogous APIs in other ecosystems and libraries?
+-->
+
+## Risks
+
+<!--
+Please mention any risks that to your knowledge the API proposal might entail, such as breaking changes, performance regressions, etc.
+-->
+

src/Testing/Testing.slnf

@@ -0,0 +1,10 @@
+{
+  "solution": {
+    "path": "..\\..\\AspNetCore.sln",
+    "projects": [
+      "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
+      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
+      "src\\Testing\\test\\Microsoft.AspNetCore.Testing.Tests.csproj"
+    ]
+  }
+}

src/Testing/src/AssemblyTestLog.cs

@@ -176,10 +176,6 @@ public IServiceProvider CreateLoggerServices(ITestOutputHelper output, string cl
         return serviceCollection.BuildServiceProvider();
     }
 
-    // For back compat
-    public static AssemblyTestLog Create(string assemblyName, string baseDirectory)
-        => Create(Assembly.Load(new AssemblyName(assemblyName)), baseDirectory);
-
     public static AssemblyTestLog Create(Assembly assembly, string baseDirectory)
     {
         var logStart = DateTimeOffset.UtcNow;
@@ -229,7 +225,8 @@ public static AssemblyTestLog ForAssembly(Assembly assembly)
 
                 // Try to clear previous logs, continue if it fails.
                 var assemblyBaseDirectory = TestFileOutputContext.GetAssemblyBaseDirectory(assembly);
-                if (!string.IsNullOrEmpty(assemblyBaseDirectory) && !TestFileOutputContext.GetPreserveExistingLogsInOutput(assembly))
+                if (!string.IsNullOrEmpty(assemblyBaseDirectory) &&
+                    !TestFileOutputContext.GetPreserveExistingLogsInOutput(assembly))
                 {
                     try
                     {
@@ -267,6 +264,7 @@ private static SerilogLoggerProvider ConfigureFileLogging(string fileName, DateT
             .MinimumLevel.Verbose()
             .WriteTo.File(fileName, outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message:l}{NewLine}{Exception}", flushToDiskInterval: TimeSpan.FromSeconds(1), shared: true)
             .CreateLogger();
+
         return new SerilogLoggerProvider(serilogger, dispose: true);
     }
 

src/Testing/src/LoggedTest/LoggedTestBase.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.AspNetCore.Testing;
 
-public class LoggedTestBase : ILoggedTest, ITestMethodLifecycle
+public abstract class LoggedTestBase : ITestMethodLifecycle, IDisposable
 {
     private ExceptionDispatchInfo _initializationException;
 

src/Testing/startvs.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Testing.slnf

src/Testing/test/AssemblyFixtureTest.cs

@@ -10,7 +10,9 @@ namespace Microsoft.AspNetCore.Testing;
 [TestCaseOrderer("Microsoft.AspNetCore.Testing.AlphabeticalOrderer", "Microsoft.AspNetCore.Testing.Tests")]
 public class AssemblyFixtureTest
 {
-    public AssemblyFixtureTest(TestAssemblyFixture assemblyFixture, TestCollectionFixture collectionFixture)
+    public AssemblyFixtureTest(
+        TestAssemblyFixture assemblyFixture,
+        TestCollectionFixture collectionFixture)
     {
         AssemblyFixture = assemblyFixture;
         CollectionFixture = collectionFixture;

src/Testing/test/AssemblyTestLogTests.cs

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
@@ -17,7 +16,11 @@ public class AssemblyTestLogTests : LoggedTest
 {
     private static readonly Assembly ThisAssembly = typeof(AssemblyTestLogTests).GetTypeInfo().Assembly;
     private static readonly string ThisAssemblyName = ThisAssembly.GetName().Name;
-    private static readonly string TFM = ThisAssembly.GetCustomAttributes().OfType<TestOutputDirectoryAttribute>().FirstOrDefault().TargetFramework;
+    private static readonly string TFM = ThisAssembly
+        .GetCustomAttributes()
+        .OfType<TestOutputDirectoryAttribute>()
+        .FirstOrDefault()
+        .TargetFramework;
 
     [Fact]
     public void FunctionalLogs_LogsPreservedFromNonQuarantinedTest()
@@ -43,8 +46,8 @@ public void ForAssembly_ReturnsSameInstanceForSameAssembly()
     public void TestLogWritesToITestOutputHelper()
     {
         var output = new TestTestOutputHelper();
-        var assemblyLog = AssemblyTestLog.Create(ThisAssemblyName, baseDirectory: null);
 
+        using var assemblyLog = AssemblyTestLog.Create(ThisAssembly, baseDirectory: null);
         using (assemblyLog.StartTestLog(output, "NonExistant.Test.Class", out var loggerFactory))
         {
             var logger = loggerFactory.CreateLogger("TestLogger");
@@ -69,11 +72,17 @@ public Task TestLogEscapesIllegalFileNames() =>
         {
             var illegalTestName = "T:e/s//t";
             var escapedTestName = "T_e_s_t";
-            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, baseDirectory: tempDir))
-            using (testAssemblyLog.StartTestLog(output: null, className: "FakeTestAssembly.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, resolvedTestName: out var resolvedTestname, out var _, testName: illegalTestName))
-            {
-                Assert.Equal(escapedTestName, resolvedTestname);
-            }
+
+            using var testAssemblyLog = AssemblyTestLog.Create(ThisAssembly, baseDirectory: tempDir);
+            using var disposable = testAssemblyLog.StartTestLog(
+                output: null,
+                className: "FakeTestAssembly.FakeTestClass",
+                loggerFactory: out var testLoggerFactory,
+                minLogLevel: LogLevel.Trace,
+                resolvedTestName: out var resolvedTestname,
+                out var _,
+                testName: illegalTestName);
+            Assert.Equal(escapedTestName, resolvedTestname);
         });
 
     [Fact]
@@ -84,11 +93,16 @@ public Task TestLogWritesToGlobalLogFile() =>
             // but it's also testing the test logging facility. So this is pretty meta ;)
             var logger = LoggerFactory.CreateLogger("Test");
 
-            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir))
+            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssembly, baseDirectory: tempDir))
             {
                 logger.LogInformation("Created test log in {baseDirectory}", tempDir);
 
-                using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: "FakeTestName"))
+                using (testAssemblyLog.StartTestLog(
+                    output: null,
+                    className: $"{ThisAssemblyName}.FakeTestClass",
+                    loggerFactory: out var testLoggerFactory,
+                    minLogLevel: LogLevel.Trace,
+                    testName: "FakeTestName"))
                 {
                     var testLogger = testLoggerFactory.CreateLogger("TestLogger");
                     testLogger.LogInformation("Information!");
@@ -126,15 +140,21 @@ public Task TestLogTruncatesTestNameToAvoidLongPaths() =>
         {
             var longTestName = new string('0', 50) + new string('1', 50) + new string('2', 50) + new string('3', 50) + new string('4', 50);
             var logger = LoggerFactory.CreateLogger("Test");
-            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir))
+            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssembly, baseDirectory: tempDir))
             {
                 logger.LogInformation("Created test log in {baseDirectory}", tempDir);
 
-                using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: longTestName))
+                using (testAssemblyLog.StartTestLog(
+                    output: null,
+                    className: $"{ThisAssemblyName}.FakeTestClass",
+                    loggerFactory: out var testLoggerFactory,
+                    minLogLevel: LogLevel.Trace,
+                    testName: longTestName))
                 {
                     testLoggerFactory.CreateLogger("TestLogger").LogInformation("Information!");
                 }
             }
+
             logger.LogInformation("Finished test log in {baseDirectory}", tempDir);
 
             var testLogFiles = new DirectoryInfo(Path.Combine(tempDir, ThisAssemblyName, TFM, "FakeTestClass")).EnumerateFiles();
@@ -152,18 +172,24 @@ public Task TestLogEnumerateFilenamesToAvoidCollisions() =>
         RunTestLogFunctionalTest((tempDir) =>
         {
             var logger = LoggerFactory.CreateLogger("Test");
-            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir))
+            using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssembly, baseDirectory: tempDir))
             {
                 logger.LogInformation("Created test log in {baseDirectory}", tempDir);
 
                 for (var i = 0; i < 10; i++)
                 {
-                    using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: "FakeTestName"))
+                    using (testAssemblyLog.StartTestLog(
+                        output: null,
+                        className: $"{ThisAssemblyName}.FakeTestClass",
+                        loggerFactory: out var testLoggerFactory,
+                        minLogLevel: LogLevel.Trace,
+                        testName: "FakeTestName"))
                     {
                         testLoggerFactory.CreateLogger("TestLogger").LogInformation("Information!");
                     }
                 }
             }
+
             logger.LogInformation("Finished test log in {baseDirectory}", tempDir);
 
             // The first log file exists
@@ -176,13 +202,13 @@ public Task TestLogEnumerateFilenamesToAvoidCollisions() =>
             }
         });
 
-    private static readonly Regex TimestampRegex = new Regex(@"\d+-\d+-\d+T\d+:\d+:\d+");
-    private static readonly Regex TimestampOffsetRegex = new Regex(@"\d+\.\d+s");
-    private static readonly Regex DurationRegex = new Regex(@"[^ ]+s$");
+    private static readonly Regex TimestampRegex = new(@"\d+-\d+-\d+T\d+:\d+:\d+");
+    private static readonly Regex TimestampOffsetRegex = new(@"\d+\.\d+s");
+    private static readonly Regex DurationRegex = new(@"[^ ]+s$");
 
-    private async Task RunTestLogFunctionalTest(Action<string> action, [CallerMemberName] string testName = null)
+    private static async Task RunTestLogFunctionalTest(Action<string> action)
     {
-        var tempDir = Path.Combine(Path.GetTempPath(), $"TestLogging_{Guid.NewGuid().ToString("N")}");
+        var tempDir = Path.Combine(Path.GetTempPath(), $"TestLogging_{Guid.NewGuid():N}");
         try
         {
             action(tempDir);
@@ -209,7 +235,7 @@ private static string MakeConsistent(string input)
         return string.Join(Environment.NewLine, input.Split(new[] { Environment.NewLine }, StringSplitOptions.None)
             .Select(line =>
             {
-                var strippedPrefix = line.IndexOf('[') >= 0 ? line.Substring(line.IndexOf('[')) : line;
+                var strippedPrefix = line.Contains('[') ? line.Substring(line.IndexOf('[')) : line;
 
                 var strippedDuration = DurationRegex.Replace(strippedPrefix, "DURATION");
                 var strippedTimestamp = TimestampRegex.Replace(strippedDuration, "TIMESTAMP");

src/Testing/test/Properties/AssemblyInfo.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
-using Xunit;
 
 [assembly: Repeat(1)]
 [assembly: LogLevel(LogLevel.Trace)]