Reorganize snapshots (#3790)

Reorganize the snapshots to remove the TFM from the file names and instead move to subdirectories that are easier to maintain when new TFMs are added.

Author: martincostello

test/Swashbuckle.AspNetCore.IntegrationTests/CodeGenerationTests.cs

@@ -21,12 +21,6 @@ public static TheoryData<ClientGeneratorTool, string> SnapshotTestCases()
             var path = testCase.Data.Item1;
             var documentVersion = testCase.Data.Item2;
 
-            // Deduplicate by ignoring snapshots for other TFMs
-            if (!path.EndsWith(".DotNet10_0.verified.txt", StringComparison.Ordinal))
-            {
-                continue;
-            }
-
             var version = documentVersion switch
             {
                 { Major: 2 } => OpenApiSpecVersion.OpenApi2_0,
@@ -78,7 +72,7 @@ await VerifyDirectory(
             pattern: "*.cs",
             include: (p) => !p.Contains("bin") && !p.Contains("obj"),
             options: new() { RecurseSubdirectories = true })
-            .UseDirectory("snapshots")
+            .UseDirectory("snapshots/code")
             .UseFileName($"{nameof(GeneratesValidClient)}_{hashString}")
             .AddScrubber((builder) =>
             {

test/Swashbuckle.AspNetCore.IntegrationTests/SnapshotTestData.cs

@@ -11,14 +11,16 @@ public static class SnapshotTestData
             .First((p) => p.Key is "ProjectRoot")
             .Value!;
 
-    public static string SnapshotsPath() => Path.Combine(_projectRoot, "snapshots");
+    public static string SnapshotsDirectory { get; } = $"snapshots/{Environment.Version.Major}_{Environment.Version.Minor}";
+
+    public static string SnapshotsPath() => Path.Combine(_projectRoot, "snapshots", $"{Environment.Version.Major}_{Environment.Version.Minor}");
 
     public static string SchemasPath() => Path.Combine(_projectRoot, "schemas");
 
     public static TheoryData<string, Version> Snapshots()
     {
         var testCases = new TheoryData<string, Version>();
-        var snapshotsPath = Path.Combine(_projectRoot, "snapshots");
+        var snapshotsPath = Path.Combine(_projectRoot, "snapshots", $"{Environment.Version.Major}_{Environment.Version.Minor}");
 
         foreach (var path in Directory.EnumerateFiles(snapshotsPath, "*.txt", SearchOption.AllDirectories))
         {

test/Swashbuckle.AspNetCore.IntegrationTests/VerifyTests.cs

@@ -6,6 +6,8 @@ namespace Swashbuckle.AspNetCore.IntegrationTests;
 [Collection("TestSite")]
 public partial class VerifyTests(ITestOutputHelper outputHelper)
 {
+    private static string SnapshotsDirectory { get; } = SnapshotTestData.SnapshotsDirectory;
+
     [Theory]
     [InlineData(typeof(Basic.Startup), "/swagger/v1/swagger.json")]
     [InlineData(typeof(NSwagClientExample.Startup), "/swagger/v1/swagger.json")]
@@ -31,9 +33,8 @@ public async Task SwaggerEndpoint_ReturnsValidSwaggerJson(
         var swagger = await swaggerResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         await Verify(NormalizeLineBreaks(swagger))
-            .UseDirectory("snapshots")
-            .UseParameters(startupType, GetVersion(swaggerRequestUri))
-            .UniqueForTargetFrameworkAndVersion();
+            .UseDirectory(SnapshotsDirectory)
+            .UseParameters(startupType, GetVersion(swaggerRequestUri));
     }
 
     [Fact]
@@ -49,9 +50,8 @@ public async Task SwaggerEndpoint_ReturnsValidSwaggerJson_ForAutofaq()
         var swagger = await swaggerResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         await Verify(swagger)
-            .UseDirectory("snapshots")
-            .UseParameters(startupType, GetVersion(swaggerRequestUri))
-            .UniqueForTargetFrameworkAndVersion();
+            .UseDirectory(SnapshotsDirectory)
+            .UseParameters(startupType, GetVersion(swaggerRequestUri));
     }
 
     [Theory]
@@ -69,9 +69,8 @@ public async Task Swagger_IsValidJson_No_Startup(
         var swaggerResponse = await SwaggerEndpointReturnsValidSwaggerJson(entryPointType, swaggerRequestUri);
 
         await Verify(swaggerResponse)
-            .UseDirectory("snapshots")
-            .UseParameters(entryPointType, GetVersion(swaggerRequestUri))
-            .UniqueForTargetFrameworkAndVersion();
+            .UseDirectory(SnapshotsDirectory)
+            .UseParameters(entryPointType, GetVersion(swaggerRequestUri));
     }
 
     [Fact]
@@ -82,9 +81,7 @@ public async Task TypesAreRenderedCorrectly()
 
         var swaggerResponse = await SwaggerResponse(client, "/swagger/v1/swagger.json");
 
-        await Verify(swaggerResponse)
-            .UseDirectory("snapshots")
-            .UniqueForTargetFrameworkAndVersion();
+        await Verify(swaggerResponse).UseDirectory(SnapshotsDirectory);
     }
 
     private static async Task<string> SwaggerEndpointReturnsValidSwaggerJson(Type entryPointType, string swaggerRequestUri)