Refactored HttpRequest and HttpRequestBuilder, moving most of the logic to the HttpRequestBuilder.

Added ContentSummary to be able to describe the ContentData in a human readable form. (Useful for JsonRpc and FormData).

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -58,18 +58,20 @@ namespace NzbDrone.Common.Test.Http
 
             var response = Subject.Get<HttpBinResource>(request);
 
-            response.Resource.Url.Should().Be(request.Url.ToString());
+            response.Resource.Url.Should().Be(request.Url.AbsoluteUri);
         }
 
         [Test]
         public void should_execute_simple_post()
         {
+            var message = "{ my: 1 }";
+
             var request = new HttpRequest("http://eu.httpbin.org/post");
-            request.Body = "{ my: 1 }";
+            request.SetContent(message);
 
             var response = Subject.Post<HttpBinResource>(request);
 
-            response.Resource.Data.Should().Be(request.Body);
+            response.Resource.Data.Should().Be(message);
         }
 
         [TestCase("gzip")]
@@ -162,7 +164,7 @@ namespace NzbDrone.Common.Test.Http
         public void should_send_cookie()
         {
             var request = new HttpRequest("http://eu.httpbin.org/get");
-            request.AddCookie("my", "cookie");
+            request.Cookies["my"] = "cookie";
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -176,7 +178,7 @@ namespace NzbDrone.Common.Test.Http
         public void GivenOldCookie()
         {
             var oldRequest = new HttpRequest("http://eu.httpbin.org/get");
-            oldRequest.AddCookie("my", "cookie");
+            oldRequest.Cookies["my"] = "cookie";
 
             var oldClient = new HttpClient(new IHttpRequestInterceptor[0], Mocker.Resolve<ICacheManager>(), Mocker.Resolve<IRateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), Mocker.Resolve<Logger>());
 
@@ -260,7 +262,7 @@ namespace NzbDrone.Common.Test.Http
             var requestSet = new HttpRequest("http://eu.httpbin.org/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = false;
             requestSet.StoreResponseCookie = true;
-            requestSet.AddCookie("my", "oldcookie");
+            requestSet.Cookies["my"] = "oldcookie";
 
             var responseSet = Subject.Get(requestSet);
 
@@ -322,10 +324,10 @@ namespace NzbDrone.Common.Test.Http
             {
                 // the date is bad in the below - should be 13-Jul-2016
                 string malformedCookie = @"__cfduid=d29e686a9d65800021c66faca0a29b4261436890790; expires=Wed, 13-Jul-16 16:19:50 GMT; path=/; HttpOnly";
-                string url = "http://eu.httpbin.org/response-headers?Set-Cookie=" +
-                    System.Uri.EscapeUriString(malformedCookie);
+                var requestSet = new HttpRequestBuilder("http://eu.httpbin.org/response-headers")
+                    .AddQueryParam("Set-Cookie", malformedCookie)
+                    .Build();
 
-                var requestSet = new HttpRequest(url);
                 requestSet.AllowAutoRedirect = false;
                 requestSet.StoreResponseCookie = true;
 
@@ -376,6 +378,21 @@ namespace NzbDrone.Common.Test.Http
             {
             }
         }
+
+        public void should_submit_formparameters_in_body()
+        {
+            Assert.Fail();
+        }
+
+        public void should_submit_attachments_as_multipart()
+        {
+            Assert.Fail();
+        }
+
+        public void should_submit_formparameters_as_multipart_if_attachments_exist()
+        {
+            Assert.Fail();
+        }
     }
 
     public class HttpBinResource