JSON body can be passed as string, logo and test update

* logo and test update

* Httptester client updates

* JSON body can be passed as string, small bug fixes and new tests

Author: mihaj

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.1</Version>
+    <Version>0.1.2</Version>
   </PropertyGroup>
 </Project>

qatoolkit-64x64.png

@@ -14,8 +14,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug With Project References|Any CPU.ActiveCfg = Debug With Project References|Any CPU
-		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug With Project References|Any CPU.Build.0 = Debug With Project References|Any CPU
+		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug With Project References|Any CPU.ActiveCfg = Debug|Any CPU
+		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug With Project References|Any CPU.Build.0 = Debug|Any CPU
 		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23F0CF6E-9A0A-4BE5-8F51-51DAF799A0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU

qatoolkit-engine-httptester-net.sln

@@ -1,8 +1,5 @@
 using QAToolKit.Core.HttpRequestTools;
 using QAToolKit.Core.Models;
-using QAToolKit.Engine.HttpTester.Exceptions;
-using QAToolKit.Engine.HttpTester.Extensions;
-using QAToolKit.Engine.HttpTester.Test.Fixtures;
 using QAToolKit.Source.Swagger;
 using System;
 using System.Collections.Generic;
@@ -12,7 +9,9 @@
 using System.Threading.Tasks;
 using Xunit;
 using ExpectedObjects;
-using System.Security.Authentication;
+using QAToolKit.Engine.HttpTester.Extensions;
+using QAToolKit.Engine.HttpTester.Test.Fixtures;
+using QAToolKit.Engine.HttpTester.Exceptions;
 
 namespace QAToolKit.Engine.HttpTester.Test
 {
@@ -301,5 +300,64 @@ public async Task HttpTesterClientGetWithBodyDisableSSLValidationWithInvalidCert
                  await Assert.ThrowsAsync<HttpRequestException>(async () => await client.Start());
             }
         }
+
+        [Fact]
+        public async Task HttpTesterClientReturnDynamic_Success()
+        {
+            using (var client = new HttpTesterClient())
+            {
+                var response = await client
+                 .CreateHttpRequest(new Uri("https://qatoolkitapi.azurewebsites.net"))
+                 .WithQueryParams(new Dictionary<string, string>() { { "api-version", "1" } })
+                 .WithMethod(HttpMethod.Post)
+                 .WithJsonBody(BicycleFixture.GetCfr())
+                 .WithPath("/api/bicycles")
+                 .Start();
+
+                var msg = await response.GetResponseBody<dynamic>();
+
+                Assert.True(client.Duration < 2000);
+                Assert.True(response.IsSuccessStatusCode);
+                Assert.Equal("Giant", msg.brand.ToString());
+            }
+        }
+
+        [Fact]
+        public async Task HttpTesterClientPostStringBodyWithFulUrl_Success()
+        {
+            using (var client = new HttpTesterClient())
+            {
+                var response = await client
+                   .CreateHttpRequest(new Uri("https://qatoolkitapi.azurewebsites.net/api/bicycles?api-version=1"))
+                   .WithJsonBody("{\"id\": 5,\"name\":\"EXCEED CFR\",\"brand\":\"Giant\",\"type\":2}")
+                   .WithMethod(HttpMethod.Post)
+                   .Start();
+
+                var msg = await response.Content.ReadAsStringAsync();
+
+                Assert.True(client.Duration < 2000);
+                Assert.True(response.IsSuccessStatusCode);
+                //Assert.Equal("Giant", msg.brand.ToString());
+            }
+        }
+
+        [Fact]
+        public async Task HttpTesterClientPostObjectBodyWithFulUrl_Success()
+        {
+            using (var client = new HttpTesterClient())
+            {
+                var response = await client
+                   .CreateHttpRequest(new Uri("https://qatoolkitapi.azurewebsites.net/api/bicycles?api-version=1"))
+                   .WithJsonBody(BicycleFixture.GetCfr())
+                   .WithMethod(HttpMethod.Post)
+                   .Start();
+
+                var msg = await response.GetResponseBody<dynamic>();
+
+                Assert.True(client.Duration < 2000);
+                Assert.True(response.IsSuccessStatusCode);
+                Assert.Equal("Giant", msg.brand.ToString());
+            }
+        }
     }
 }

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

@@ -14,7 +14,6 @@ namespace QAToolKit.Engine.HttpTester
     /// </summary>
     public class HttpTesterClient : IHttpTesterClient, IDisposable
     {
-
         /// <summary>
         /// HttpClient object
         /// </summary>
@@ -105,12 +104,24 @@ public IHttpTesterClient WithHeaders(Dictionary<string, string> headers)
         /// <summary>
         /// Add JSON body to the HTTP client
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="bodyObject"></param>
+        /// <typeparam name="T">Type of DTO object</typeparam>
+        /// <param name="bodyObject">DTO object that needs to be serialized to JSON</param>
         /// <returns></returns>
         public IHttpTesterClient WithJsonBody<T>(T bodyObject)
         {
-            _body = JsonConvert.SerializeObject(bodyObject);
+            if (bodyObject == null)
+            {
+                return this;
+            }
+
+            if (typeof(T) == typeof(String))
+            {
+                _body = bodyObject.ToString();
+            }
+            else
+            {
+                _body = JsonConvert.SerializeObject(bodyObject);
+            }
 
             return this;
         }
@@ -160,22 +171,20 @@ public async Task<HttpResponseMessage> Start()
                 throw new QAToolKitEngineHttpTesterException("'Get' method can not have a HTTP body.");
             }
 
-            //Process params
+            string queryString = "";
             if (_queryParameters != null)
             {
-                var queryString = "?";
+                queryString = "?";
 
                 foreach (var query in _queryParameters)
                 {
                     queryString += $"{query.Key}={query.Value}";
                 }
-
-                _path += queryString;
             }
 
             var sw = new Stopwatch();
             sw.Start();
-            using (var requestMessage = new HttpRequestMessage(_httpMethod, _path))
+            using (var requestMessage = new HttpRequestMessage(_httpMethod, _path + queryString))
             {
                 if (_headers != null)
                 {
@@ -216,13 +225,5 @@ protected virtual void Dispose(bool disposing)
         {
             HttpClient?.Dispose();
         }
-
-        /// <summary>
-        /// Destructor
-        /// </summary>
-        ~HttpTesterClient()
-        {
-            Dispose(false);
-        }
     }
 }

src/QAToolKit.Engine.HttpTester/HttpTesterClient.cs

@@ -16,7 +16,7 @@ public interface IHttpTesterClient
         /// <param name="baseAddress"></param>
         /// <param name="validateCertificate"></param>
         /// <returns></returns>
-        IHttpTesterClient CreateHttpRequest(Uri baseAddress, bool validateCertificate);
+        IHttpTesterClient CreateHttpRequest(Uri baseAddress, bool validateCertificate = true);
         /// <summary>
         /// Add URL path to the HTTP client
         /// </summary>