More tests

javiercn · javiercn · commit c3e5a1631d8e · 2025-07-09T00:31:19.000+02:00
diff --git a/src/StaticWebAssetsSdk/Tasks/ApplyCompressionNegotiation.cs b/src/StaticWebAssetsSdk/Tasks/ApplyCompressionNegotiation.cs
@@ -5,7 +5,7 @@
 
 using System.Globalization;
 using Microsoft.Build.Framework;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointProperty.cs b/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointProperty.cs
@@ -7,7 +7,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointResponseHeader.cs b/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointResponseHeader.cs
@@ -7,7 +7,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointSelector.cs b/src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointSelector.cs
@@ -7,7 +7,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/WellKnownEndpointSelectorNames.cs b/src/StaticWebAssetsSdk/Tasks/Data/WellKnownEndpointSelectorNames.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
 internal static class WellKnownEndpointSelectorNames
@@ -20,6 +22,6 @@ public static string TryGetInternedSelectorName(ReadOnlySpan<byte> selectorNameS
         {
             16 => selectorNameSpan.SequenceEqual("Content-Encoding"u8) ? ContentEncoding : null,
             _ => null
-        })!;
+        });
     }
 }
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/WellKnownEndpointSelectorValues.cs b/src/StaticWebAssetsSdk/Tasks/Data/WellKnownEndpointSelectorValues.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
 internal static class WellKnownEndpointSelectorValues
@@ -22,6 +24,6 @@ public static string TryGetInternedSelectorValue(ReadOnlySpan<byte> selectorValu
             2 => selectorValueSpan.SequenceEqual("br"u8) ? Brotli : null,
             4 => selectorValueSpan.SequenceEqual("gzip"u8) ? Gzip : null,
             _ => null
-        })!;
+        });
     }
 }
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/WellKnownResponseHeaderValues.cs b/src/StaticWebAssetsSdk/Tasks/Data/WellKnownResponseHeaderValues.cs
@@ -43,10 +43,14 @@ public static string TryGetInternedHeaderValue(ReadOnlySpan<byte> headerValueSpa
             2 => headerValueSpan.SequenceEqual("br"u8) ? Brotli : null,
             4 => headerValueSpan.SequenceEqual("gzip"u8) ? Gzip : null,
             5 => headerValueSpan.SequenceEqual("bytes"u8) ? Bytes : null,
-            8 => headerValueSpan.SequenceEqual("no-cache"u8) ? NoCache : null,
-            9 => headerValueSpan[0] switch
+            8 => headerValueSpan[0] switch
             {
+                (byte)'n' when headerValueSpan.SequenceEqual("no-cache"u8) => NoCache,
                 (byte)'t' when headerValueSpan.SequenceEqual("text/css"u8) => TextCss,
+                _ => null
+            },
+            9 => headerValueSpan[0] switch
+            {
                 (byte)'t' when headerValueSpan.SequenceEqual("text/html"u8) => TextHtml,
                 (byte)'i' when headerValueSpan.SequenceEqual("image/png"u8) => ImagePng,
                 _ => null
@@ -61,7 +65,7 @@ public static string TryGetInternedHeaderValue(ReadOnlySpan<byte> headerValueSpa
                 _ => null
             },
             24 => headerValueSpan.SequenceEqual("application/octet-stream"u8) ? ApplicationOctetStream : null,
-            29 => headerValueSpan.SequenceEqual("max-age=31536000, immutable"u8) ? MaxAgeImmutable : null,
+            27 => headerValueSpan.SequenceEqual("max-age=31536000, immutable"u8) ? MaxAgeImmutable : null,
             _ => null
         };
     }
diff --git a/src/StaticWebAssetsSdk/Tasks/Data/WellKnownResponseHeaders.cs b/src/StaticWebAssetsSdk/Tasks/Data/WellKnownResponseHeaders.cs
@@ -17,48 +17,27 @@ internal static class WellKnownResponseHeaders
     public const string LastModified = "Last-Modified";
     public const string Vary = "Vary";
 
-    /// <summary>
-    /// Gets the interned header name if it's a well-known header, otherwise returns the original string.
-    /// Uses span comparison for efficiency.
-    /// </summary>
-    /// <param name="headerNameSpan">The header name span to check</param>
-    /// <returns>The interned header name or null if not well-known</returns>
     public static string TryGetInternedHeaderName(ReadOnlySpan<byte> headerNameSpan)
     {
-        // Check each well-known header using UTF-8 span comparison
-        if (headerNameSpan.SequenceEqual("Accept-Ranges"u8))
-        {
-            return AcceptRanges;
-        }
-        if (headerNameSpan.SequenceEqual("Cache-Control"u8))
-        {
-            return CacheControl;
-        }
-        if (headerNameSpan.SequenceEqual("Content-Encoding"u8))
-        {
-            return ContentEncoding;
-        }
-        if (headerNameSpan.SequenceEqual("Content-Length"u8))
-        {
-            return ContentLength;
-        }
-        if (headerNameSpan.SequenceEqual("Content-Type"u8))
-        {
-            return ContentType;
-        }
-        if (headerNameSpan.SequenceEqual("ETag"u8))
-        {
-            return ETag;
-        }
-        if (headerNameSpan.SequenceEqual("Last-Modified"u8))
-        {
-            return LastModified;
-        }
-        if (headerNameSpan.SequenceEqual("Vary"u8))
-        {
-            return Vary;
-        }
-
-        return null;
+        return headerNameSpan.Length switch
+        {
+            4 => headerNameSpan[0] switch
+            {
+                (byte)'E' when headerNameSpan.SequenceEqual("ETag"u8) => ETag,
+                (byte)'V' when headerNameSpan.SequenceEqual("Vary"u8) => Vary,
+                _ => null
+            },
+            12 => headerNameSpan.SequenceEqual("Content-Type"u8) ? ContentType : null,
+            13 => headerNameSpan[0] switch
+            {
+                (byte)'A' when headerNameSpan.SequenceEqual("Accept-Ranges"u8) => AcceptRanges,
+                (byte)'C' when headerNameSpan.SequenceEqual("Cache-Control"u8) => CacheControl,
+                (byte)'L' when headerNameSpan.SequenceEqual("Last-Modified"u8) => LastModified,
+                _ => null
+            },
+            14 => headerNameSpan.SequenceEqual("Content-Length"u8) ? ContentLength : null,
+            16 => headerNameSpan.SequenceEqual("Content-Encoding"u8) ? ContentEncoding : null,
+            _ => null
+        };
     }
 }
diff --git a/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssetEndpoints.cs b/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssetEndpoints.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 using Microsoft.Build.Framework;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 using Microsoft.Build.Utilities;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/UpdateStaticWebAssetEndpoints.cs b/src/StaticWebAssetsSdk/Tasks/UpdateStaticWebAssetEndpoints.cs
@@ -4,7 +4,7 @@
 #nullable disable
 
 using Microsoft.Build.Framework;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
diff --git a/src/StaticWebAssetsSdk/Tasks/Utils/JsonWriterContext.cs b/src/StaticWebAssetsSdk/Tasks/Utils/JsonWriterContext.cs
@@ -4,7 +4,7 @@
 using System.Buffers;
 using System.Text.Json;
 
-namespace Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+namespace Microsoft.AspNetCore.StaticWebAssets.Tasks.Utils;
 
 /// <summary>
 /// A reusable context for high-performance JSON writing using pooled buffers.
diff --git a/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointPropertyBenchmarks.cs b/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointPropertyBenchmarks.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.NET.Sdk.StaticWebAssets.Utils;
 
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
diff --git a/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointResponseHeaderBenchmarks.cs b/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointResponseHeaderBenchmarks.cs
@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.NET.Sdk.StaticWebAssets.Utils;
 
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
diff --git a/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointSelectorBenchmarks.cs b/src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointSelectorBenchmarks.cs
@@ -3,8 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
-
-using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+using Microsoft.NET.Sdk.StaticWebAssets.Utils;
 
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointPropertyNamesTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointPropertyNamesTest.cs
@@ -0,0 +1,100 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text;
+using FluentAssertions;
+using Microsoft.AspNetCore.StaticWebAssets.Tasks;
+using Xunit;
+
+namespace Microsoft.NET.Sdk.StaticWebAssets.Tests.StaticWebAssets;
+
+public class WellKnownEndpointPropertyNamesTest
+{
+    [Theory]
+    [InlineData("label")]
+    [InlineData("integrity")]
+    public void TryGetInternedPropertyName_KnownPropertyNames_ReturnsInternedStrings(string propertyName)
+    {
+        // Arrange
+        var span = ConvertToUtf8Span(propertyName);
+
+        // Act
+        var result = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().Be(propertyName);
+    }
+
+    [Theory]
+    [InlineData("label")]
+    [InlineData("integrity")]
+    public void TryGetInternedPropertyName_KnownPropertyNames_ReturnsSameReference(string input)
+    {
+        // Arrange
+        var span = ConvertToUtf8Span(input);
+
+        // Act
+        var result1 = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+        var result2 = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+
+        // Assert
+        result1.Should().NotBeNull("method should recognize the well-known property name");
+        result2.Should().NotBeNull("method should recognize the well-known property name");
+        result1.Should().BeSameAs(result2, "multiple calls with the same input should return the same reference");
+    }
+
+    [Theory]
+    [InlineData("unknown")]
+    [InlineData("Label")] // Different casing
+    [InlineData("INTEGRITY")] // Different casing
+    [InlineData("lab")] // Too short
+    [InlineData("labels")] // Too long
+    [InlineData("")]
+    [InlineData("integrit")] // Too short by one
+    [InlineData("integrityx")] // Too long by one
+    public void TryGetInternedPropertyName_UnknownPropertyNames_ReturnsNull(string propertyName)
+    {
+        // Arrange
+        var span = ConvertToUtf8Span(propertyName);
+
+        // Act
+        var result = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Fact]
+    public void TryGetInternedPropertyName_EmptySpan_ReturnsNull()
+    {
+        // Arrange
+        var span = ReadOnlySpan<byte>.Empty;
+
+        // Act
+        var result = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    [Theory]
+    [InlineData("labe1")] // Similar to "label" but with number
+    [InlineData("integral")] // Similar to "integrity" but different
+    [InlineData("     ")] // Whitespace
+    public void TryGetInternedPropertyName_SimilarButDifferentNames_ReturnsNull(string propertyName)
+    {
+        // Arrange
+        var span = ConvertToUtf8Span(propertyName);
+
+        // Act
+        var result = WellKnownEndpointPropertyNames.TryGetInternedPropertyName(span);
+
+        // Assert
+        result.Should().BeNull();
+    }
+
+    // Helper method
+    private static ReadOnlySpan<byte> ConvertToUtf8Span(string value)
+        => Encoding.UTF8.GetBytes(value);
+}
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointSelectorNamesTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointSelectorNamesTest.cs
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointSelectorValuesTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownEndpointSelectorValuesTest.cs
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownResponseHeaderValuesTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownResponseHeaderValuesTest.cs
diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownResponseHeadersTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/WellKnownResponseHeadersTest.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+#nullable disable`
	`5`	`+`
`4`	`6`	`namespace Microsoft.AspNetCore.StaticWebAssets.Tasks;`
`5`	`7`
`6`	`8`	`internal static class WellKnownEndpointSelectorNames`
`@@ -20,6 +22,6 @@ public static string TryGetInternedSelectorName(ReadOnlySpan<byte> selectorNameS`
`20`	`22`	`{`
`21`	`23`	`16 => selectorNameSpan.SequenceEqual("Content-Encoding"u8) ? ContentEncoding : null,`
`22`	`24`	`_ => null`
`23`		`- })!;`
	`25`	`+ });`
`24`	`26`	`}`
`25`	`27`	`}`