PR Comments

Xabaril · Mar 28, 2022 · 8dfe99e · 8dfe99e
1 parent 83fae16
commit 8dfe99e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/Acheve.TestHost/Acheve.TestHost.csproj b/src/Acheve.TestHost/Acheve.TestHost.csproj
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <Folder Include="Routing\AttributeTemplates\" />
-    <Folder Include="Routing\Tokenizers\" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Acheve.TestHost/HttpResponseMessageExtensions.cs b/src/Acheve.TestHost/HttpResponseMessageExtensions.cs
@@ -22,6 +22,12 @@ public static async Task IsSuccessStatusCodeOrThrow(this HttpResponseMessage res
             throw new Exception($"Response status does not indicate success: {response.StatusCode:D} ({response.StatusCode}); \r\n{content}");
         }
 
+        /// <summary>
+        /// Deserialize HttpResponseMessage to T Class
+        /// </summary>
+        /// <typeparam name="T">Class</typeparam>
+        /// <param name="responseMessage">The httpResponseMessage instance</param>
+        /// <returns></returns>
         public static async Task<T> ReadContentAsAsync<T>(this HttpResponseMessage responseMessage)
         {
             var json = await responseMessage.Content.ReadAsStringAsync();

diff --git a/src/Acheve.TestHost/Routing/Tokenizers/ComplexParameterActionTokenizer.cs b/src/Acheve.TestHost/Routing/Tokenizers/ComplexParameterActionTokenizer.cs
@@ -18,7 +18,6 @@ public void AddTokens<TController>(TestServerAction action, TestServerTokenColle
                 var type = parameters[i].ParameterType;
                 var instance = action.ArgumentValues.Any(x => x.Key == i) ? action.ArgumentValues[i].Instance : null;
 
-
                 if (instance != null && !type.IsPrimitiveType())
                 {
                     if (!IgnoreBind(parameters[i]))

diff --git a/src/Acheve.TestHost/Routing/Tokenizers/PrimitiveParameterActionTokenizer.cs b/src/Acheve.TestHost/Routing/Tokenizers/PrimitiveParameterActionTokenizer.cs
@@ -16,10 +16,12 @@ public void AddTokens<TController>(TestServerAction action, TestServerTokenColle
 
             for (var i = 0; i < parameters.Length; i++)
             {
+                var tokenName = parameters[i].Name.ToLowerInvariant();
+
                 if (parameters[i].ParameterType.IsPrimitiveType()
                     && !IgnoreHeader(parameters[i]))
                 {
-                    var tokenName = parameters[i].Name.ToLowerInvariant();
+
                     var tokenValue = action.ArgumentValues.Any(x => x.Key == i) ? action.ArgumentValues[i].Instance : null;
 
                     if (tokenValue != null)
@@ -28,15 +30,15 @@ public void AddTokens<TController>(TestServerAction action, TestServerTokenColle
                     }
                 }
                 else if (parameters[i].ParameterType.IsArray
-                   && IsPrimitiveType(parameters[i].ParameterType.GetElementType()))
+                   && IsPrimitiveType(parameters[i].ParameterType.GetElementType())
+                   && !IgnoreHeader(parameters[i]))
                 {
                     var arrayValues = (Array)action.ArgumentValues[i].Instance;
 
                     if (arrayValues != null
                         && arrayValues.Length != 0
                         )
                     {
-                        var tokenName = parameters[i].Name.ToLowerInvariant();
                         var tokenValue = GetTokenValue(arrayValues, tokenName);
                         tokens.AddToken(tokenName, tokenValue, isConventional: false);
                     }

diff --git a/src/Acheve.TestHost/Routing/Tokenizers/TypeExtensions.cs b/src/Acheve.TestHost/Routing/Tokenizers/TypeExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Acheve.TestHost.Routing.Tokenizers
+namespace System
 {
     internal static class TypeExtensions
     {