replace array with hashset and refactor tests

Author: Tobias Mønster

Lib.AspNetCore.ServerSentEvents/ServerSentEventsMiddleware.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -28,6 +29,7 @@ public class ServerSentEventsMiddleware<TServerSentEventsService> where TServerS
         private readonly ServerSentEventsOptions _serverSentEventsOptions;
         private readonly ILogger<ServerSentEventsMiddleware<TServerSentEventsService>> _logger;
         private readonly bool _clientDisconnectServicesAvailable = false;
+        private readonly HashSet<string> AcceptedHeaders = new() { "*/*", "text/*", Constants.SSE_CONTENT_TYPE };
 
         private AuthorizationPolicy _authorizationPolicy;
         #endregion
@@ -114,7 +116,7 @@ public async Task Invoke(HttpContext context, IPolicyEvaluator policyEvaluator)
             }
         }
 
-        private static readonly string[] AcceptedHeaders = new[] { "*/*", "text/*", Constants.SSE_CONTENT_TYPE };
+        
 
         private bool CheckAcceptHeader(IHeaderDictionary requestHeaders)
         {

Test.AspNetCore.ServerSentEvents/Unit/Middleware/HandshakeTests.cs

@@ -37,11 +37,15 @@ public async Task Invoke_SseRequestWithoutAcceptHeaderAndAcceptHeaderRequired_Do
             Assert.Null(context.Response.ContentType);
         }
 
-        [Fact]
-        public async Task Invoke_SseRequestWithEventStreamAcceptHeader_Accepts()
+        
+        [Theory]
+        [InlineData("*/*")]
+        [InlineData("text/*")]
+        [InlineData(SSE_CONTENT_TYPE)]
+        public async Task Invoke_SseRequestWithAcceptedHeader_Accepts(string header)
         {
             ServerSentEventsMiddleware<ServerSentEventsService> serverSentEventsMiddleware = SubjectUnderTestHelper.PrepareServerSentEventsMiddleware();
-            HttpContext context = SubjectUnderTestHelper.PrepareHttpContext(acceptHeaderValue: SSE_CONTENT_TYPE);
+            HttpContext context = SubjectUnderTestHelper.PrepareHttpContext(acceptHeaderValue: header);
 
             await serverSentEventsMiddleware.Invoke(context, null);
 
@@ -95,21 +99,6 @@ public async Task Invoke_SseRequestWithMultipleAcceptHeadersWithNotEventStreamAc
             Assert.Null(context.Response.ContentType);
         }
 
-        
-        [Theory]
-        [InlineData("*/*")]
-        [InlineData("text/*")]
-        [InlineData(SSE_CONTENT_TYPE)]
-        public async Task Invoke_SseRequestWithAcceptedHeader_Accepts(string header)
-        {
-            ServerSentEventsMiddleware<ServerSentEventsService> serverSentEventsMiddleware = SubjectUnderTestHelper.PrepareServerSentEventsMiddleware();
-            HttpContext context = SubjectUnderTestHelper.PrepareHttpContext(acceptHeaderValue: header);
-
-            await serverSentEventsMiddleware.Invoke(context, null);
-
-            Assert.Equal(SSE_CONTENT_TYPE, context.Response.ContentType);
-        }
-        
         #endregion
     }
 }