...

3 files changed, 37 insertions, 46 deletions

diff --git a/Timeline.Tests/Helpers/AssertionResponseExtensions.cs b/Timeline.Tests/Helpers/AssertionResponseExtensions.cs
index 5ce025ee..08f10b2b 100644
--- a/Timeline.Tests/Helpers/AssertionResponseExtensions.cs
+++ b/Timeline.Tests/Helpers/AssertionResponseExtensions.cs
@@ -82,22 +82,14 @@ namespace Timeline.Tests.Helpers
             {

                 body = Subject.Content.ReadAsStringAsync().Result;

             }

-            catch (Exception e)

+            catch (AggregateException e)

             {

-                a.FailWith("Expected response body of {context:HttpResponseMessage} to be json string{reason}, but failed to read it or it was not a string. Exception is {0}.", e);

+                a.FailWith("Expected response body of {context:HttpResponseMessage} to be json string{reason}, but failed to read it or it was not a string. Exception is {0}.", e.InnerExceptions);

                 return new AndWhichConstraint<HttpResponseMessage, T>(Subject, null);

             }

 

-            try

-            {

-                var result = JsonConvert.DeserializeObject<T>(body);

-                return new AndWhichConstraint<HttpResponseMessage, T>(Subject, result);

-            }

-            catch (Exception e)

-            {

-                a.FailWith("Expected response body of {context:HttpResponseMessage} to be able to convert to {0} instance{reason}, but failed. Exception is {1}.", typeof(T).FullName, e);

-                return new AndWhichConstraint<HttpResponseMessage, T>(Subject, null);

-            }

+            var result = JsonConvert.DeserializeObject<T>(body);

+            return new AndWhichConstraint<HttpResponseMessage, T>(Subject, result);

         }

     }

 

@@ -118,28 +110,22 @@ namespace Timeline.Tests.Helpers
             return assertions.HaveJsonBody<CommonDataResponse<TData>>(because, becauseArgs);

         }

 

-        public static void BePutCreate(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

-        {

-            assertions.HaveStatusCode(201, because, becauseArgs)

-                .And.Should().HaveCommonDataBody<CommonPutResponse.ResponseData>(because, becauseArgs).Which.Should().BeEquivalentTo(CommonPutResponse.Create(), because, becauseArgs);

-        }

-

-        public static void BePutModify(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

-        {

-            assertions.HaveStatusCode(200, because, becauseArgs)

-                .And.Should().HaveCommonDataBody<CommonPutResponse.ResponseData>(because, becauseArgs).Which.Should().BeEquivalentTo(CommonPutResponse.Modify(), because, becauseArgs);

-        }

-

-        public static void BeDeleteDelete(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        public static void BePut(this HttpResponseMessageAssertions assertions, bool create, string because = "", params object[] becauseArgs)

         {

-            assertions.HaveStatusCode(200, because, becauseArgs)

-                .And.Should().HaveCommonDataBody<CommonDeleteResponse.ResponseData>(because, becauseArgs).Which.Should().BeEquivalentTo(CommonDeleteResponse.Delete(), because, becauseArgs);

+            var body = assertions.HaveStatusCode(create ? 201 : 200, because, becauseArgs)

+                .And.Should().HaveJsonBody<CommonPutResponse>(because, becauseArgs)

+                .Which;

+            body.Code.Should().Be(0);

+            body.Data.Create.Should().Be(create);

         }

 

-        public static void BeDeleteNotExist(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        public static void BeDelete(this HttpResponseMessageAssertions assertions, bool delete, string because = "", params object[] becauseArgs)

         {

-            assertions.HaveStatusCode(200, because, becauseArgs)

-                .And.Should().HaveCommonDataBody<CommonDeleteResponse.ResponseData>(because, becauseArgs).Which.Should().BeEquivalentTo(CommonDeleteResponse.NotExist(), because, becauseArgs);

+            var body = assertions.HaveStatusCode(200, because, becauseArgs)

+                .And.Should().HaveJsonBody<CommonDeleteResponse>(because, becauseArgs)

+                .Which;

+            body.Code.Should().Be(0);

+            body.Data.Delete.Should().Be(delete);

         }

 

         public static void BeInvalidModel(this HttpResponseMessageAssertions assertions, string message = null)

diff --git a/Timeline.Tests/Helpers/HttpClientExtensions.cs b/Timeline.Tests/Helpers/HttpClientExtensions.cs
index e3beea1d..38641f90 100644
--- a/Timeline.Tests/Helpers/HttpClientExtensions.cs
+++ b/Timeline.Tests/Helpers/HttpClientExtensions.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;

+using System;

 using System.Net.Http;

 using System.Net.Http.Headers;

 using System.Net.Mime;

@@ -11,12 +12,24 @@ namespace Timeline.Tests.Helpers
     {

         public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(this HttpClient client, string url, T body)

         {

+            return client.PatchAsJsonAsync(new Uri(url, UriKind.RelativeOrAbsolute), body);

+        }

+

+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope")]

+        public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(this HttpClient client, Uri url, T body)

+        {

             return client.PatchAsync(url, new StringContent(

                 JsonConvert.SerializeObject(body), Encoding.UTF8, MediaTypeNames.Application.Json));

         }

 

         public static Task<HttpResponseMessage> PutByteArrayAsync(this HttpClient client, string url, byte[] body, string mimeType)

         {

+            return client.PutByteArrayAsync(new Uri(url, UriKind.RelativeOrAbsolute), body, mimeType);

+        }

+

+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope")]

+        public static Task<HttpResponseMessage> PutByteArrayAsync(this HttpClient client, Uri url, byte[] body, string mimeType)

+        {

             var content = new ByteArrayContent(body);

             content.Headers.ContentLength = body.Length;

             content.Headers.ContentType = new MediaTypeHeaderValue(mimeType);

diff --git a/Timeline.Tests/Helpers/ImageHelper.cs b/Timeline.Tests/Helpers/ImageHelper.cs
index 2a2f3870..9bed0917 100644
--- a/Timeline.Tests/Helpers/ImageHelper.cs
+++ b/Timeline.Tests/Helpers/ImageHelper.cs
@@ -9,26 +9,18 @@ namespace Timeline.Tests.Helpers
     {

         public static byte[] CreatePngWithSize(int width, int height)

         {

-            using (var image = new Image<Rgba32>(width, height))

-            {

-                using (var stream = new MemoryStream())

-                {

-                    image.SaveAsPng(stream);

-                    return stream.ToArray();

-                }

-            }

+            using var image = new Image<Rgba32>(width, height);

+            using var stream = new MemoryStream();

+            image.SaveAsPng(stream);

+            return stream.ToArray();

         }

 

         public static byte[] CreateImageWithSize(int width, int height, IImageFormat format)

         {

-            using (var image = new Image<Rgba32>(width, height))

-            {

-                using (var stream = new MemoryStream())

-                {

-                    image.Save(stream, format);

-                    return stream.ToArray();

-                }

-            }

+            using var image = new Image<Rgba32>(width, height);

+            using var stream = new MemoryStream();

+            image.Save(stream, format);

+            return stream.ToArray();

         }

     }

 }