Fix #109

test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs

@@ -97,7 +97,7 @@ namespace WireMock.Net.Tests
                     Url = _serverForProxyForwarding.Urls[0],
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new[] { "bbb" }
+                    BlackListedHeaders = new[] { "blacklisted" }
                 }
             };
             _server = FluentMockServer.Start(settings);
@@ -112,12 +112,14 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(_server.Urls[0]),
                 Content = new StringContent("stringContent")
             };
-            requestMessage.Content.Headers.Add("bbb", "test");
+            requestMessage.Headers.Add("blacklisted", "test");
+            requestMessage.Headers.Add("ok", "ok-value");
             await new HttpClient().SendAsync(requestMessage);
 
             // then
             var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
-            Check.That(receivedRequest.Headers).ContainsKey("bbb");
+            Check.That(receivedRequest.Headers).Not.ContainsKey("bbb");
+            Check.That(receivedRequest.Headers).ContainsKey("ok");
 
             //var mapping = _server.Mappings.Last();
             //var matcher = ((Request)mapping.RequestMatcher).GetRequestMessageMatchers<RequestMessageHeaderMatcher>().FirstOrDefault(m => m.Name == "bbb");

test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NFluent;
+using WireMock.Http;
+using WireMock.Util;
+using Xunit;
+
+namespace WireMock.Net.Tests.Http
+{
+    public class HttpRequestMessageHelperTests
+    {
+        private const string ClientIp = "::1";
+
+        [Fact]
+        public void HttpRequestMessageHelper_Create()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "x", new[] { "value-1" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>"
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(message.Headers.GetValues("x")).ContainsExactly("value-1");
+        }
+
+        [Fact]
+        public async void HttpRequestMessageHelper_Create_Bytes()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsBytes = Encoding.UTF8.GetBytes("hi")
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(await message.Content.ReadAsByteArrayAsync()).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
+        }
+
+        [Fact]
+        public async void HttpRequestMessageHelper_Create_Json()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = 42 }
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}");
+        }
+
+        [Fact]
+        public async void HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/json" } } };
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = 42 }
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}");
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
+        }
+
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>"
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=utf-8");
+        }
+
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_UTF8()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=UTF-8" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>"
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=utf-8");
+        }
+
+        [Fact]
+        public void HttpRequestMessageHelper_Create_String_With_ContentType_ApplicationXml_ASCII()
+        {
+            // Assign
+            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml; charset=Ascii" } } };
+            var body = new BodyData
+            {
+                BodyAsString = "<xml>hello</xml>"
+            };
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+
+            // Act
+            var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+            // Assert
+            Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=us-ascii");
+        }
+    }
+}