refactor(tests): move test helper types into TestTypes folder

Author: davidkallesen

test/Atc.Rest.Client.Tests/BinaryEndpointResponseTests.cs

@@ -146,23 +146,4 @@ public void ErrorContent_IsNull_WhenSuccessful()
         sut.IsSuccess.Should().BeTrue();
         sut.ErrorContent.Should().BeNull();
     }
-
-    private sealed class TestableBinaryEndpointResponse : BinaryEndpointResponse
-    {
-        public TestableBinaryEndpointResponse(
-            bool isSuccess,
-            HttpStatusCode statusCode,
-            byte[]? content,
-            string? contentType,
-            string? fileName,
-            long? contentLength)
-            : base(isSuccess, statusCode, content, contentType, fileName, contentLength)
-        {
-        }
-
-        public InvalidOperationException GetInvalidContentAccessException(
-            HttpStatusCode expectedStatusCode,
-            string propertyName)
-            => InvalidContentAccessException(expectedStatusCode, propertyName);
-    }
 }

test/Atc.Rest.Client.Tests/Builder/MessageRequestBuilderFileContentTests.cs

@@ -1,3 +1,4 @@
+#pragma warning disable IDE0230
 namespace Atc.Rest.Client.Tests.Builder;
 
 public sealed class MessageRequestBuilderFileContentTests
@@ -210,76 +211,101 @@ public void DuckTyping_ObjectWithoutOpenReadStream_FallsBackToJson()
         serializer.Received(1).Serialize(notAFile);
     }
 
-    private sealed class TestFileContent : IFileContent
+    [Fact]
+    public void DuckTyping_IBrowserFileShape_PassesLongMaxValueAsMaxAllowedSize()
     {
-        private readonly byte[] data;
+        // Arrange
+        var sut = CreateSut();
+        var browserFile = new CapturingBrowserFileLike("doc.pdf", "application/pdf", [1, 2, 3]);
 
-        public TestFileContent(
-            string fileName,
-            string? contentType,
-            byte[] data)
-        {
-            FileName = fileName;
-            ContentType = contentType;
-            this.data = data;
-        }
+        // Act
+        sut.WithBody(browserFile);
+        sut.Build(HttpMethod.Post);
 
-        public string FileName { get; }
+        // Assert — ReflectedFileContent must pass long.MaxValue, not the 512000 default
+        browserFile.CapturedMaxAllowedSize.Should().Be(long.MaxValue);
+    }
 
-        public string? ContentType { get; }
+    [Fact]
+    public void DuckTyping_IBrowserFileShape_PassesCancellationTokenNone()
+    {
+        // Arrange
+        var sut = CreateSut();
+        var browserFile = new CapturingBrowserFileLike("doc.pdf", "application/pdf", [1, 2, 3]);
 
-        public Stream OpenReadStream() => new MemoryStream(data);
+        // Act
+        sut.WithBody(browserFile);
+        sut.Build(HttpMethod.Post);
+
+        // Assert
+        browserFile.CapturedCancellationToken.Should().Be(CancellationToken.None);
     }
 
-    /// <summary>
-    /// Mimics the shape of IFormFile: FileName property + parameterless OpenReadStream().
-    /// </summary>
-    [SuppressMessage("Design", "CA1024:Use properties where appropriate", Justification = "Mimics IFormFile.OpenReadStream() method shape for duck-typing test")]
-    internal sealed class FormFileLike
+    [Fact]
+    public void WithBody_IFileContent_NonSeekableStream_ProducesMultipartContent()
     {
-        private readonly byte[] data;
+        // Arrange
+        var sut = CreateSut();
+        var fileContent = new NonSeekableFileContent("stream.bin", "application/octet-stream", [10, 20, 30]);
 
-        public FormFileLike(
-            string fileName,
-            string contentType,
-            byte[] data)
-        {
-            FileName = fileName;
-            ContentType = contentType;
-            this.data = data;
-        }
+        // Act
+        sut.WithBody(fileContent);
+        var message = sut.Build(HttpMethod.Post);
 
-        public string FileName { get; }
+        // Assert — CopyTo must work even when the stream does not support Length/Position
+        message.Content.Should().BeOfType<MultipartFormDataContent>();
+    }
+
+    [Fact]
+    public async Task WithBody_IFileContent_NonSeekableStream_ContainsCorrectBytes()
+    {
+        // Arrange
+        var sut = CreateSut();
+        byte[] data = [10, 20, 30];
+        var fileContent = new NonSeekableFileContent("stream.bin", "application/octet-stream", data);
 
-        public string ContentType { get; }
+        // Act
+        sut.WithBody(fileContent);
+        var message = sut.Build(HttpMethod.Post);
 
-        public Stream OpenReadStream() => new MemoryStream(data);
+        // Assert
+        var multipart = (MultipartFormDataContent)message.Content!;
+        var bytes = await multipart.First().ReadAsByteArrayAsync();
+        bytes.Should().BeEquivalentTo(data);
     }
 
-    /// <summary>
-    /// Mimics the shape of IBrowserFile: Name property + OpenReadStream(long, CancellationToken) with defaults.
-    /// </summary>
-    [SuppressMessage("Design", "CA1024:Use properties where appropriate", Justification = "Mimics IBrowserFile.OpenReadStream() method shape for duck-typing test")]
-    internal sealed class BrowserFileLike
+    [Fact]
+    public async Task WithBody_IFileContent_EmptyStream_ProducesEmptyContent()
     {
-        private readonly byte[] data;
+        // Arrange
+        var sut = CreateSut();
+        var fileContent = new NonSeekableFileContent("empty.bin", null, []);
 
-        public BrowserFileLike(
-            string name,
-            string contentType,
-            byte[] data)
-        {
-            Name = name;
-            ContentType = contentType;
-            this.data = data;
-        }
+        // Act
+        sut.WithBody(fileContent);
+        var message = sut.Build(HttpMethod.Post);
 
-        public string Name { get; }
+        // Assert
+        var multipart = (MultipartFormDataContent)message.Content!;
+        var bytes = await multipart.First().ReadAsByteArrayAsync();
+        bytes.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task DuckTyping_NonSeekableBrowserFileLike_ContainsCorrectBytes()
+    {
+        // Arrange — end-to-end: duck-typing + long.MaxValue + non-seekable stream
+        var sut = CreateSut();
+        byte[] data = [99, 100, 101, 102];
+        var browserFile = new NonSeekableBrowserFileLike("blob.dat", "application/octet-stream", data);
 
-        public string ContentType { get; }
+        // Act
+        sut.WithBody(browserFile);
+        var message = sut.Build(HttpMethod.Post);
 
-        public Stream OpenReadStream(
-            long maxAllowedSize = 512000,
-            CancellationToken cancellationToken = default) => new MemoryStream(data);
+        // Assert
+        var multipart = (MultipartFormDataContent)message.Content!;
+        var bytes = await multipart.First().ReadAsByteArrayAsync();
+        bytes.Should().BeEquivalentTo(data);
     }
 }

test/Atc.Rest.Client.Tests/EndpointResponseTests.cs

@@ -419,23 +419,4 @@ public void Content_ReturnsRawStringContent()
         // Assert
         sut.Content.Should().Be(expectedContent);
     }
-
-    private sealed class TestableEndpointResponse : EndpointResponse
-    {
-        public TestableEndpointResponse(
-            bool isSuccess,
-            HttpStatusCode statusCode,
-            string content,
-            object? contentObject,
-            IReadOnlyDictionary<string, IEnumerable<string>> headers)
-            : base(isSuccess, statusCode, content, contentObject, headers)
-        {
-        }
-
-        public InvalidOperationException GetInvalidContentAccessException<TExpected>(
-            HttpStatusCode expectedStatusCode,
-            string propertyName)
-            where TExpected : class
-            => InvalidContentAccessException<TExpected>(expectedStatusCode, propertyName);
-    }
 }

test/Atc.Rest.Client.Tests/GlobalUsings.cs

@@ -8,4 +8,5 @@
 global using Atc.Rest.Client.Builder;
 global using Atc.Rest.Client.Options;
 global using Atc.Rest.Client.Serialization;
+global using Atc.Rest.Client.Tests.TestTypes;
 global using Microsoft.Extensions.DependencyInjection;

test/Atc.Rest.Client.Tests/Options/AtcRestClientOptionsTests.cs

@@ -60,11 +60,4 @@ public void DerivedClass_CanOverrideProperties()
         sut.BaseAddress.Should().Be(new Uri("https://override.example.com"));
         sut.Timeout.Should().Be(TimeSpan.FromMinutes(2));
     }
-
-    private sealed class DerivedOptions : AtcRestClientOptions
-    {
-        public override Uri? BaseAddress { get; set; } = new Uri("https://override.example.com");
-
-        public override TimeSpan Timeout { get; set; } = TimeSpan.FromMinutes(2);
-    }
 }

test/Atc.Rest.Client.Tests/Options/ServiceCollectionExtensionsTests.cs

@@ -366,9 +366,4 @@ public void AddAtcRestClient_WithHttpsAndHttpBaseAddresses_BothWork()
         factory.CreateClient("SecureClient").BaseAddress.Should().Be(httpsAddress);
         factory.CreateClient("InsecureClient").BaseAddress.Should().Be(httpAddress);
     }
-
-    [SuppressMessage("Major Code Smell", "S2094:Classes should not be empty", Justification = "Test helper type")]
-    private sealed class TestOptions : AtcRestClientOptions
-    {
-    }
 }

test/Atc.Rest.Client.Tests/Serialization/DefaultJsonContractSerializerTests.cs

@@ -1,6 +1,5 @@
 namespace Atc.Rest.Client.Tests.Serialization;
 
-[SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Test helper types")]
 public sealed class DefaultJsonContractSerializerTests
 {
     private readonly DefaultJsonContractSerializer sut = new();
@@ -433,29 +432,4 @@ public void Deserialize_PreservesUnicodeCharacters()
         result.Should().NotBeNull();
         result!.Name.Should().Be("日本語テスト");
     }
-
-    public sealed record TestModel(string Name, int Value);
-
-    public sealed record StatusContainer(TestStatus Status);
-
-    public enum TestStatus
-    {
-        Inactive,
-        Active,
-        Pending,
-    }
-
-    public sealed class CircularModel
-    {
-        public CircularModel? Self { get; set; }
-    }
-
-    public sealed record DateTimeModel(DateTimeOffset Timestamp);
-
-    public sealed record NestedModel(TestModel? Parent, TestModel? Child);
-
-    [SuppressMessage("Major Code Smell", "S2094:Classes should not be empty", Justification = "Test helper type")]
-    public sealed class EmptyModel
-    {
-    }
 }

test/Atc.Rest.Client.Tests/Serialization/JsonSerializerOptionsExtensionsTests.cs

@@ -139,34 +139,4 @@ public void WithoutConverter_SourceRemainsUnchanged()
         source.Converters.Should().HaveCount(1);
         source.Converters[0].Should().BeSameAs(converter);
     }
-
-    private sealed class CustomTestConverter : JsonConverter<string>
-    {
-        public override string? Read(
-            ref Utf8JsonReader reader,
-            Type typeToConvert,
-            JsonSerializerOptions options)
-            => reader.GetString();
-
-        public override void Write(
-            Utf8JsonWriter writer,
-            string value,
-            JsonSerializerOptions options)
-            => writer.WriteStringValue(value);
-    }
-
-    private sealed class AnotherTestConverter : JsonConverter<int>
-    {
-        public override int Read(
-            ref Utf8JsonReader reader,
-            Type typeToConvert,
-            JsonSerializerOptions options)
-            => reader.GetInt32();
-
-        public override void Write(
-            Utf8JsonWriter writer,
-            int value,
-            JsonSerializerOptions options)
-            => writer.WriteNumberValue(value);
-    }
 }

test/Atc.Rest.Client.Tests/StreamBinaryEndpointResponseTests.cs

@@ -206,23 +206,4 @@ public void ErrorContent_IsNull_WhenSuccessful()
         sut.IsSuccess.Should().BeTrue();
         sut.ErrorContent.Should().BeNull();
     }
-
-    private sealed class TestableStreamBinaryEndpointResponse : StreamBinaryEndpointResponse
-    {
-        public TestableStreamBinaryEndpointResponse(
-            bool isSuccess,
-            HttpStatusCode statusCode,
-            Stream? contentStream,
-            string? contentType,
-            string? fileName,
-            long? contentLength)
-            : base(isSuccess, statusCode, contentStream, contentType, fileName, contentLength)
-        {
-        }
-
-        public InvalidOperationException GetInvalidContentAccessException(
-            HttpStatusCode expectedStatusCode,
-            string propertyName)
-            => InvalidContentAccessException(expectedStatusCode, propertyName);
-    }
 }

test/Atc.Rest.Client.Tests/StreamingEndpointResponseTests.cs

@@ -161,22 +161,4 @@ public void InvalidContentAccessException_ContainsPropertyName()
         // Assert
         exception.Message.Should().Contain("OKContent");
     }
-
-    private sealed class TestableStreamingEndpointResponse<T> : StreamingEndpointResponse<T>
-    {
-        public TestableStreamingEndpointResponse(
-            bool isSuccess,
-            HttpStatusCode statusCode,
-            IAsyncEnumerable<T?>? content,
-            string? errorContent,
-            HttpResponseMessage? httpResponse)
-            : base(isSuccess, statusCode, content, errorContent, httpResponse)
-        {
-        }
-
-        public InvalidOperationException GetInvalidContentAccessException(
-            HttpStatusCode expectedStatusCode,
-            string propertyName)
-            => InvalidContentAccessException(expectedStatusCode, propertyName);
-    }
 }