filterin fix for swagger File source

Author: mihaj

src/QAToolKit.Source.Swagger/SwaggerFileSource.cs

@@ -49,7 +49,16 @@ public async Task<IList<HttpTestRequest>> Load(IList<FileInfo> source)
                     var textWritter = new OpenApiJsonWriter(new StringWriter());
                     openApiDocument.SerializeAsV3(textWritter);
 
-                    restRequests.AddRange(processor.MapFromOpenApiDocument(_swaggerOptions.BaseUrl, openApiDocument, _swaggerOptions.ReplacementValues));
+                    var requests = processor.MapFromOpenApiDocument(_swaggerOptions.BaseUrl, openApiDocument, _swaggerOptions.ReplacementValues);
+
+                    if (_swaggerOptions.UseRequestFilter)
+                    {
+                        restRequests.AddRange(SwaggerRequestFilter.FilterRequests(requests, _swaggerOptions.RequestFilter));
+                    }
+                    else
+                    {
+                        restRequests.AddRange(requests);
+                    }
                 }
             }
 

src/QAToolKit.Source.Swagger/SwaggerRequestFilter.cs

@@ -0,0 +1,40 @@
+using QAToolKit.Core.Models;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace QAToolKit.Source.Swagger
+{
+    /// <summary>
+    /// Swagger request filtering
+    /// </summary>
+    public static class SwaggerRequestFilter
+    {
+        /// <summary>
+        /// Filter out the requests by the specified filters
+        /// </summary>
+        /// <param name="requests"></param>
+        /// <param name="requestFilter"></param>
+        /// <returns></returns>
+        public static IList<HttpTestRequest> FilterRequests(IList<HttpTestRequest> requests, RequestFilter requestFilter)
+        {
+            var requestsLocal = new List<HttpTestRequest>();
+
+            if (requestFilter.AuthenticationTypes != null)
+            {
+                requestsLocal.AddRange(requests.Where(request => requestFilter.AuthenticationTypes.ToList().Any(x => x == request.AuthenticationTypes)));
+            }
+
+            if (requestFilter.TestTypes != null)
+            {
+                requestsLocal.AddRange(requests.Where(request => requestFilter.TestTypes.ToList().Any(x => x == request.TestTypes)));
+            }
+
+            if (requestFilter.EndpointNameWhitelist != null)
+            {
+                requestsLocal.AddRange(requests.Where(request => requestFilter.EndpointNameWhitelist.Any(x => x == request.OperationId)));
+            }
+
+            return requestsLocal.ToList();
+        }
+    }
+}

src/QAToolKit.Source.Swagger/SwaggerUrlSource.cs

@@ -46,7 +46,6 @@ public async Task<IList<HttpTestRequest>> Load(Uri[] source)
             {
                 using (var httpClient = new HttpClient())
                 {
-
                     if (_swaggerOptions.UseBasicAuth)
                     {
                         var authenticationString = $"{_swaggerOptions.UserName}:{_swaggerOptions.Password}";
@@ -64,7 +63,7 @@ public async Task<IList<HttpTestRequest>> Load(Uri[] source)
 
                     if (_swaggerOptions.UseRequestFilter)
                     {
-                        restRequests.AddRange(FilterRequests(requests, _swaggerOptions.RequestFilter));
+                        restRequests.AddRange(SwaggerRequestFilter.FilterRequests(requests, _swaggerOptions.RequestFilter));
                     }
                     else
                     {
@@ -76,26 +75,6 @@ public async Task<IList<HttpTestRequest>> Load(Uri[] source)
             return restRequests;
         }
 
-        private IList<HttpTestRequest> FilterRequests(IList<HttpTestRequest> requests, RequestFilter requestFilter)
-        {
-            var requestsLocal = new List<HttpTestRequest>();
-
-            if (requestFilter.AuthenticationTypes != null)
-            {
-                requestsLocal.AddRange(requests.Where(request => requestFilter.AuthenticationTypes.ToList().Any(x => x == request.AuthenticationTypes)));
-            }
-
-            if (requestFilter.TestTypes != null)
-            {
-                requestsLocal.AddRange(requests.Where(request => requestFilter.TestTypes.ToList().Any(x => x == request.TestTypes)));
-            }
-
-            if (requestFilter.EndpointNameWhitelist != null)
-            {
-                requestsLocal.AddRange(requests.Where(request => requestFilter.EndpointNameWhitelist.Any(x => x == request.OperationId)));
-            }
 
-            return requestsLocal.ToList();
-        }
     }
 }