HttpTester client now has WithPathReplacementValues, bug fix with query parameters (#21)

* HttpTester client now has WithPathReplacementValues, bug fix with query parameters

* small update

Author: mihaj

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.2.9</Version>
+    <Version>0.2.11</Version>
   </PropertyGroup>
 </Project>

src/QAToolKit.Engine.HttpTester.Test/Fixtures/BicycleFixture.cs

@@ -15,6 +15,31 @@ public static Bicycle Get()
             };
         }
 
+        public static Bicycle GetCannondale()
+        {
+            return new Bicycle
+            {
+                Id = 2,
+                Name = "CAADX",
+                Brand = "Cannondale",
+                Type = BicycleType.Gravel
+            };
+        }
+
+        public static List<Bicycle> GetCannondaleArray()
+        {
+            return new List<Bicycle>()
+            {
+                new Bicycle()
+                {
+                    Id = 2,
+                    Name = "CAADX",
+                    Brand = "Cannondale",
+                    Type = BicycleType.Gravel
+                }
+            };
+        }
+
         public static Bicycle GetFoil()
         {
             return new Bicycle

src/QAToolKit.Engine.HttpTester.Test/HttpTestAsserterTests.cs

@@ -31,7 +31,7 @@ public async Task HttpTestAsserterSimple_Success()
                 var duration = client.Duration;
                 var assertResults = asserter
                     .ResponseContentContains("scott")
-                    .RequestDurationEquals(duration, (x) => x < 1000)
+                    .RequestDurationEquals(duration, (x) => x < 2000)
                     .ResponseStatusCodeEquals(HttpStatusCode.OK)
                     .ResponseHasHttpHeader("Date")
                     .AssertAll();
@@ -116,7 +116,7 @@ public async Task HttpTestAsserterHeaderMissing_Fails()
                 var duration = client.Duration;
                 Assert.Throws<ArgumentNullException>(() => asserter
                     .ResponseContentContains("scott")
-                    .RequestDurationEquals(duration, (x) => x < 1000)
+                    .RequestDurationEquals(duration, (x) => x < 2000)
                     .ResponseStatusCodeEquals(HttpStatusCode.OK)
                     .ResponseHasHttpHeader(null)
                     .AssertAll());

src/QAToolKit.Engine.HttpTester.Test/HttpTesterClientTests.cs

@@ -548,7 +548,7 @@ public void HttpTesterClientBrochureUploadMultipartPresent_Fails()
                  .WithMultipart("Metadata.Year", "2000")
                  .WithMultipart("Metadata.Name", "Brochure 2000");
 
-               var exception = Assert.Throws<QAToolKitEngineHttpTesterException>(() => client.WithJsonBody<string>("1234"));
+                var exception = Assert.Throws<QAToolKitEngineHttpTesterException>(() => client.WithJsonBody<string>("1234"));
                 Assert.StartsWith("Body multipart/form-data already defined", exception.Message);
             }
         }
@@ -617,5 +617,74 @@ public async Task HttpTesterClientAddGetHttpRequest_Success()
                 Assert.True(response.IsSuccessStatusCode);
             }
         }
+
+        [Fact]
+        public async Task HttpTesterClientGetBikeByIdRequest_Success()
+        {
+            var urlSource = new SwaggerUrlSource(options =>
+            {
+                options.AddBaseUrl(new Uri("https://qatoolkitapi.azurewebsites.net/"));
+                options.AddRequestFilters(new RequestFilter()
+                {
+                    EndpointNameWhitelist = new string[] { "GetBike" }
+                });
+                options.UseSwaggerExampleValues = true;
+            });
+
+            var requests = await urlSource.Load(new Uri[] {
+                new Uri("https://qatoolkitapi.azurewebsites.net/swagger/v2/swagger.json")
+            });
+
+            using (var client = new HttpTesterClient())
+            {
+                var response = await client
+                 .CreateHttpRequest(requests.FirstOrDefault())
+                 .WithPathReplacementValues(new Dictionary<string, string>() { { "id", "2" } })
+                 .WithQueryParams(new Dictionary<string, string>() { { "api-version", "2" } })
+                 .Start();
+
+                var msg = await response.GetResponseBody<Bicycle>();
+
+                var expecterResponse = BicycleFixture.GetCannondale().ToExpectedObject();
+                expecterResponse.ShouldEqual(msg);
+
+                Assert.True(client.Duration < 2000);
+                Assert.True(response.IsSuccessStatusCode);
+            }
+        }
+
+        [Fact]
+        public async Task HttpTesterClientGetBikesByTypeHttpRequest_Success()
+        {
+            var urlSource = new SwaggerUrlSource(options =>
+            {
+                options.AddBaseUrl(new Uri("https://qatoolkitapi.azurewebsites.net/"));
+                options.AddRequestFilters(new RequestFilter()
+                {
+                    EndpointNameWhitelist = new string[] { "GetAllBikes" }
+                });
+                options.UseSwaggerExampleValues = true;
+            });
+
+            var requests = await urlSource.Load(new Uri[] {
+                new Uri("https://qatoolkitapi.azurewebsites.net/swagger/v2/swagger.json")
+            });
+
+            using (var client = new HttpTesterClient())
+            {
+                var response = await client
+                 .CreateHttpRequest(requests.FirstOrDefault())
+                 .WithQueryParams(new Dictionary<string, string>() { { "api-version", "2" }, {"bicycleType", "1" } })
+                 .Start();
+
+                var msg = await response.GetResponseBody<List<Bicycle>>();
+
+                var expecterResponse = BicycleFixture.GetCannondaleArray().ToExpectedObject();
+                expecterResponse.ShouldEqual(msg);
+
+                Assert.True(client.Duration < 2000);
+                Assert.True(response.IsSuccessStatusCode);
+            }
+        }
     }
 }

src/QAToolKit.Engine.HttpTester/HttpTestAsserter.cs

@@ -3,7 +3,6 @@
 using QAToolKit.Engine.HttpTester.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 
@@ -97,7 +96,7 @@ public IHttpTestAsserter ResponseHasHttpHeader(string headerName)
                 Name = nameof(ResponseHasHttpHeader),
                 Message = $"Contains header '{headerName}'.",
                 IsTrue = _httpResponseMessage.Headers.TryGetValues(headerName, out var values)
-        });
+            });
 
             return this;
         }