Fix double using directive. Use Verify for snapshots.

Dreamescaper · Dreamescaper · commit 80ca4e330d77 · 2025-05-01T14:04:46.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -339,4 +339,6 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 
-/GenerateAspNetCoreClient/Properties/debug-paths.txt
+/GenerateAspNetCoreClient/Properties/debug-paths.txt
+
+*.received.*
diff --git a/GenerateAspNetCoreClient.Command/GenerateAspNetCoreClient.Command.csproj b/GenerateAspNetCoreClient.Command/GenerateAspNetCoreClient.Command.csproj
@@ -11,7 +11,7 @@
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
-    <PackageReference Include="Namotion.Reflection" Version="3.2.0" />
+    <PackageReference Include="Namotion.Reflection" Version="3.4.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/GenerateAspNetCoreClient.Command/GenerateClientCommand.cs b/GenerateAspNetCoreClient.Command/GenerateClientCommand.cs
@@ -126,9 +126,6 @@ private static IEnumerable<string> GetImportedNamespaces(Client clientModel, Has
             var namespaces = GetNamespaces(clientModel.EndpointMethods, ambiguousTypes)
                 .Concat(options.AdditionalNamespaces);
 
-            if (options.AddCancellationTokenParameters)
-                namespaces = namespaces.Append("System.Threading");
-
             namespaces = namespaces
                 .OrderByDescending(ns => ns.StartsWith("System"))
                 .ThenBy(ns => ns);
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses/IWeatherForecastApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses/IWeatherForecastApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses_UseCancellationTokens/ITestWebApiMinimalApiApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses_UseCancellationTokens/ITestWebApiMinimalApiApi.verified.cs
@@ -0,0 +1,15 @@
+﻿//<auto-generated />
+
+using System.Threading;
+using System.Threading.Tasks;
+using Refit;
+using TestWebApi.Models;
+
+namespace Test.Name.Space
+{
+    public partial interface ITestWebApiMinimalApiApi
+    {
+        [Post("/weather-forecast")]
+        Task<IApiResponse> PostWeatherForecast([Body] WeatherForecast forecast, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses_UseCancellationTokens/IWeatherForecastApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_UseApiResponses_UseCancellationTokens/IWeatherForecastApi.verified.cs
@@ -0,0 +1,18 @@
+﻿//<auto-generated />
+
+using System.Threading;
+using System.Threading.Tasks;
+using Refit;
+using TestWebApi.Models;
+
+namespace Test.Name.Space
+{
+    public partial interface IWeatherForecastApi
+    {
+        [Get("/weather-forecast")]
+        Task<IApiResponse<WeatherForecastRecord[]>> GetWeatherForecast(CancellationToken cancellationToken = default);
+
+        [Get("/weather-forecast/with-name")]
+        Task<IApiResponse<WeatherForecastRecord>> GetSomeWeather(int days, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Controllers/IAnotherTestApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Controllers/IAnotherTestApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System;
 using System.Threading.Tasks;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Controllers/IWeatherForecastApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Controllers/IWeatherForecastApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System;
 using System.Collections.Generic;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.MinimalApi/ITestWebApiMinimalApiApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.MinimalApi/ITestWebApiMinimalApiApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System.Threading.Tasks;
 using Refit;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.MinimalApi/IWeatherForecastApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.MinimalApi/IWeatherForecastApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System.Threading.Tasks;
 using Refit;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Versioning/IVersionApi.verified.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.GenerationTest_testProjectName=TestWebApi.Versioning/IVersionApi.verified.cs
@@ -1,4 +1,4 @@
-//<auto-generated />
+﻿//<auto-generated />
 
 using System.Threading.Tasks;
 using Refit;
diff --git a/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.cs b/Tests/GenerateAspNetCoreClient.Tests/ClientGenerationTests.cs
@@ -1,23 +1,19 @@
-﻿using System;
-using System.IO;
-using System.Text.RegularExpressions;
+﻿using System.IO;
+using System.Threading.Tasks;
 using DotNet.Cli.Build;
 using GenerateAspNetCoreClient.Options;
 using NUnit.Framework;
+using VerifyNUnit;
 
 namespace GenerateAspNetCoreClient.Tests
 {
     [NonParallelizable]
     public class ClientGenerationTests
     {
-        private static readonly string _snapshotsPath = Path.Combine("..", "..", "..", "__snapshots__", "{0}");
-
         private static readonly string _inputPath = Path.Combine("..", "..", "..", "..", "{0}", "{0}.csproj");
         private static readonly string _outPath = Path.Combine("..", "..", "..", "..", "OutputTest", "Client");
         private static readonly string _outProjectPath = Path.Combine("..", "..", "..", "..", "OutputTest", "OutputProject.csproj");
 
-        private static readonly bool _regenerateSnapshots = false;
-
         [TearDown]
         public void CleanOutput()
         {
@@ -27,24 +23,23 @@ public void CleanOutput()
         [TestCase("TestWebApi.Controllers")]
         [TestCase("TestWebApi.Versioning")]
         [TestCase("TestWebApi.MinimalApi")]
-        public void GenerationTest(string testProjectName)
+        public async Task GenerationTest(string testProjectName)
         {
             var options = new GenerateClientOptions
             {
                 InputPath = string.Format(_inputPath, testProjectName),
                 OutPath = _outPath,
                 Namespace = "Test.Name.Space",
             };
-
+        
             Program.CreateClient(options);
-
+        
             Assert.That(() => Project.FromPath(_outProjectPath).Build(), Throws.Nothing);
-            AssertSnapshotMatch(testProjectName);
+            await Verifier.VerifyDirectory(_outPath);
         }
 
-
         [Test]
-        public void GenerationTest_UseApiResponses()
+        public async Task GenerationTest_UseApiResponses()
         {
             var options = new GenerateClientOptions
             {
@@ -57,61 +52,25 @@ public void GenerationTest_UseApiResponses()
             Program.CreateClient(options);
 
             Assert.That(() => Project.FromPath(_outProjectPath).Build(), Throws.Nothing);
-            AssertSnapshotMatch("TestWebApi.Controllers.UseApiResponses");
-        }
-
-        private static void RegenerateSnapshots(string testProjectName)
-        {
-            var snapshotsPath = string.Format(_snapshotsPath, testProjectName);
-
-            if (Directory.Exists(snapshotsPath))
-            {
-                Directory.Delete(snapshotsPath, recursive: true);
-            }
-
-            Directory.CreateDirectory(snapshotsPath);
-
-            var generatedFiles = Directory.EnumerateFiles(_outPath, "*", new EnumerationOptions { RecurseSubdirectories = true });
-
-            foreach (var generatedFile in generatedFiles)
-            {
-                var relativePath = Path.GetRelativePath(_outPath, generatedFile);
-                File.Move(generatedFile, Path.Combine(snapshotsPath, relativePath + ".snap"));
-            }
-
-            throw new Exception("Don't forget to disable snapshot regeneration.");
+            await Verifier.VerifyDirectory(_outPath);
         }
-
-        private static void AssertSnapshotMatch(string testProjectName)
+        
+        [Test]
+        public async Task GenerationTest_UseApiResponses_UseCancellationTokens()
         {
-            if (_regenerateSnapshots)
-            {
-                RegenerateSnapshots(testProjectName);
-            }
-
-            var snapshotsPath = string.Format(_snapshotsPath, testProjectName);
-            var generatedFiles = Directory.EnumerateFiles(_outPath, "*", new EnumerationOptions { RecurseSubdirectories = true });
-
-            foreach (var generatedFile in generatedFiles)
-            {
-                var relativePath = Path.GetRelativePath(_outPath, generatedFile);
-                var snapshotPath = Path.Combine(snapshotsPath, relativePath + ".snap");
-
-                Assert.That(snapshotPath, Does.Exist, $"Unexpected file generated ({relativePath})");
-
-                var actualContent = File.ReadAllText(generatedFile);
-                var expectedContent = File.ReadAllText(snapshotPath);
-
-                Assert.That(actualContent, Is.EqualTo(expectedContent).Using<string>(IgnoreLineEndings),
-                    $"File mismatch (${relativePath})");
-            }
-
-            static bool IgnoreLineEndings(string s1, string s2)
+            var options = new GenerateClientOptions
             {
-                s1 = Regex.Replace(s1, "(\r|\n|\r\n)", "\r");
-                s2 = Regex.Replace(s2, "(\r|\n|\r\n)", "\r");
-                return s1 == s2;
-            }
+                InputPath = string.Format(_inputPath,"TestWebApi.MinimalApi"),
+                UseApiResponses = true,
+                AddCancellationTokenParameters = true,
+                OutPath = _outPath,
+                Namespace = "Test.Name.Space",
+            };
+        
+            Program.CreateClient(options);
+        
+            Assert.That(() => Project.FromPath(_outProjectPath).Build(), Throws.Nothing);
+            await Verifier.VerifyDirectory(_outPath);
         }
     }
 }
diff --git a/Tests/GenerateAspNetCoreClient.Tests/GenerateAspNetCoreClient.Tests.csproj b/Tests/GenerateAspNetCoreClient.Tests/GenerateAspNetCoreClient.Tests.csproj
@@ -5,20 +5,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Verify.NUnit" Version="29.5.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,4 +28,11 @@
     <ProjectReference Include="..\TestWebApi.MinimalApi\TestWebApi.MinimalApi.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="**\*.verified.cs" />
+    <None Include="**\*.verified.cs" />
+    <Compile Remove="**\*.received.cs" />
+    <None Include="**\*.received.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/Tests/OutputTest/OutputProject.csproj b/Tests/OutputTest/OutputProject.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="refit" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.4" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/TestWebApi.Controllers/TestWebApi.Controllers.csproj b/Tests/TestWebApi.Controllers/TestWebApi.Controllers.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/TestWebApi.MinimalApi/TestWebApi.MinimalApi.csproj b/Tests/TestWebApi.MinimalApi/TestWebApi.MinimalApi.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.11">
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/TestWebApi.Versioning/TestWebApi.Versioning.csproj b/Tests/TestWebApi.Versioning/TestWebApi.Versioning.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+	<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//<auto-generated />`
	`1`	`+//<auto-generated />`
`2`	`2`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Threading.Tasks;`