Test framework WiP

Author: codeape2

netmockery/ForwardResponseCreator.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Http;
 using System.Net.Http.Headers;
 using System.Text.RegularExpressions;
+using System.Diagnostics;
 //using Microsoft.Net.Http.Headers;
 
 namespace netmockery
@@ -44,7 +45,8 @@ public override async Task<byte[]> CreateResponseAsync(IHttpRequestWrapper reque
                 requestPath = Regex.Replace(requestPath, StripPath, "");
             }
             var httpMsg = new HttpRequestMessage(HttpMethod.Post, Url + requestPath);
-            
+
+            Debug.Assert(request.Headers != null);
             foreach (var header in request.Headers)
             {
                 if (! HEADERS_TO_SKIP.Contains(header.Key.ToLower()))
@@ -53,8 +55,11 @@ public override async Task<byte[]> CreateResponseAsync(IHttpRequestWrapper reque
                 }
             }
             httpMsg.Content = new ByteArrayContent(body);
-            httpMsg.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(request.Headers["Content-Type"]);
-
+            if ((string) request.Headers["Content-Type"] != null)
+            {
+                httpMsg.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(request.Headers["Content-Type"]);
+            }
+            
             var httpClient = 
                 ProxyUrl == null ? 
                 new HttpClient() : 

netmockery/JSONReader.cs

@@ -19,13 +19,9 @@ public static Endpoint ReadEndpoint(string jsonString, string rootDir)
     public class JSONTest
     {
         /*
-             {
-                'name': '/foo/ request works',
-                'requestpath': '/foo/',
-                'requestbody': 'heisann test',
-                'expectedresponsebody': 'FOOBARBOOBAR'
-            }
-
+         * Typer tester vi boer stoette:
+         * - expectedendpointname
+         * - expectedrequestmatcher
          */
         public string name;
         public string requestpath;
@@ -34,7 +30,11 @@ public class JSONTest
 
         public NetmockeryTestCase CreateTestCase()
         {
-            return new NetmockeryTestCase { Name = name, RequestPath = requestpath, RequestBody = requestbody, ExpectedResponseBody = expectedresponsebody };
+            if (requestpath == null)
+            {
+                throw new ArgumentNullException(nameof(requestpath));
+            }
+            return new NetmockeryTestCase { Name = name, RequestPath = requestpath, RequestBody = requestbody ?? "", ExpectedResponseBody = expectedresponsebody };
         }
     }
 

netmockery/NetmockeryTestCase.cs

@@ -12,7 +12,7 @@ namespace netmockery
     public class TestCaseHttpRequest : IHttpRequestWrapper
     {
         private string path;
-        private HeaderDictionary headerDictionary;
+        private HeaderDictionary headerDictionary = new HeaderDictionary();
 
         public TestCaseHttpRequest(string path)
         {
@@ -100,6 +100,11 @@ async public Task<NetmockeryTestCaseResult> ExecuteAsync(EndpointCollection endp
                         var responseBody = Encoding.UTF8.GetString(responseBodyBytes);
                         retval.OK = responseBody == ExpectedResponseBody;
                         retval.Error = !retval.OK;
+                    
+                        if (retval.Error)
+                        {
+                            retval.Message = $"Expected response body:\n{ExpectedResponseBody}\n\nActual response body:\n{responseBody}";
+                        }
                     }
                     else
                     {
@@ -125,5 +130,32 @@ public class NetmockeryTestCaseResult
         public string Message;
         public Exception Exception;
         public NetmockeryTestCase TestCase;
+
+        public string ResultAsString
+        {
+            get
+            {
+                var shortstatus = "";
+                if (OK)
+                {
+                    shortstatus = "OK";
+                }
+                if (Error)
+                {
+                    shortstatus = "Fail";
+                }
+                if (Exception != null)
+                {
+                    shortstatus = "Error";
+                }
+
+                var retval = $"{shortstatus}\n{Message}";
+                if (Exception != null)
+                {
+                    retval += "\n" + Exception.ToString();
+                }
+                return retval;
+            }
+        }
     }
 }

netmockery/Program.cs

@@ -63,6 +63,10 @@ public static void Main(string[] args)
                             ViewScript(commandArgs);
                             break;
 
+                        case "test":
+                            Test(commandArgs);
+                            break;
+
                         default:
                             Error.WriteLine($"Unknown command {commandName}");
                             break;
@@ -76,6 +80,32 @@ public static void Main(string[] args)
         }
 
 
+        public static void Test(string[] commandArgs)
+        {
+            if (EndpointTestDefinition.HasTestSuite(EndpointCollection.SourceDirectory))
+            {
+                var testDefinitions = EndpointTestDefinition.ReadFromDirectory(EndpointCollection.SourceDirectory);
+                var errors = 0;
+                foreach (var test in testDefinitions.Tests)
+                {
+                    Write(test.Name.PadRight(40));
+                    var result = test.ExecuteAsync(EndpointCollection).Result;
+                    WriteLine(result.ResultAsString);
+                    if (result.Error)
+                    {
+                        errors++;
+                    }
+                }
+                WriteLine();
+                WriteLine($"Total: {testDefinitions.Tests.Count()} Errors: {errors}");
+            }
+            else
+            {
+                Error.WriteLine("ERROR: No test suite found");
+            }
+        }
+
+
         public static void RunScript(string[] commandArgs)
         {
             var scriptfile = commandArgs[0];