Add FluentAssertions.

5 files changed, 119 insertions, 117 deletions

diff --git a/Timeline.Tests/Helpers/AssertionResponseExtensions.cs b/Timeline.Tests/Helpers/AssertionResponseExtensions.cs
new file mode 100644
index 00000000..b56340ea
--- /dev/null
+++ b/Timeline.Tests/Helpers/AssertionResponseExtensions.cs
@@ -0,0 +1,114 @@
+using FluentAssertions;

+using FluentAssertions.Execution;

+using FluentAssertions.Primitives;

+using Newtonsoft.Json;

+using System;

+using System.Net;

+using System.Net.Http;

+using Timeline.Models.Http;

+

+namespace Timeline.Tests.Helpers

+{

+    public class HttpResponseMessageAssertions

+        : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>

+    {

+        public HttpResponseMessageAssertions(HttpResponseMessage instance)

+        {

+            Subject = instance;

+        }

+

+        protected override string Identifier => "HttpResponseMessage";

+

+        public AndConstraint<HttpResponseMessage> HaveStatusCode(HttpStatusCode expected, string because = "", params object[] becauseArgs)

+        {

+            Execute.Assertion.BecauseOf(because, becauseArgs)

+                .ForCondition(Subject.StatusCode == expected)

+                .FailWith("Expected status code is {}, but found {}.", expected, Subject.StatusCode);

+            return new AndConstraint<HttpResponseMessage>(Subject);

+        }

+

+        public AndWhichConstraint<HttpResponseMessage, T> HaveBodyAsJson<T>(string because = "", params object[] becauseArgs)

+        {

+            var a = Execute.Assertion.BecauseOf(because, becauseArgs);

+            string body;

+            try

+            {

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

+            }

+            catch (Exception e)

+            {

+                a.FailWith("Failed to read response body. Exception is {}.", e);

+                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("Failed to convert response body to {}. Exception is {}.", typeof(T).FullName, e);

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

+            }

+        }

+    }

+

+    public static class AssertionResponseExtensions

+    {

+        public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)

+        {

+            return new HttpResponseMessageAssertions(instance);

+        }

+

+        public static AndConstraint<HttpResponseMessage> HaveStatusCodeOk(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        {

+            return assertions.HaveStatusCode(HttpStatusCode.OK, because, becauseArgs);

+        }

+

+        public static AndConstraint<HttpResponseMessage> HaveStatusCodeCreated(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        {

+            return assertions.HaveStatusCode(HttpStatusCode.Created, because, becauseArgs);

+        }

+

+        public static AndConstraint<HttpResponseMessage> HaveStatusCodeBadRequest(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        {

+            return assertions.HaveStatusCode(HttpStatusCode.BadRequest, because, becauseArgs);

+        }

+

+        public static AndConstraint<HttpResponseMessage> HaveStatusCodeNotFound(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        {

+            return assertions.HaveStatusCode(HttpStatusCode.NotFound, because, becauseArgs);

+        }

+

+        public static AndWhichConstraint<HttpResponseMessage, CommonResponse> HaveBodyAsCommonResponse(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

+        {

+            return assertions.HaveBodyAsJson<CommonResponse>(because, becauseArgs);

+        }

+

+        public static void HaveBodyAsCommonResponseWithCode(this HttpResponseMessageAssertions assertions, int expected, string because = "", params object[] becauseArgs)

+        {

+            assertions.HaveBodyAsCommonResponse(because, becauseArgs).Which.Code.Should().Be(expected, because, becauseArgs);

+        }

+

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

+        {

+            assertions.HaveStatusCodeCreated(because, becauseArgs).And.Should().HaveBodyAsCommonResponse(because, becauseArgs).Which.Should().BeEquivalentTo(CommonPutResponse.Created, because, becauseArgs);

+        }

+

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

+        {

+            assertions.HaveStatusCodeOk(because, becauseArgs).And.Should().HaveBodyAsCommonResponse(because, becauseArgs).Which.Should().BeEquivalentTo(CommonPutResponse.Modified, because, becauseArgs);

+        }

+

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

+        {

+            assertions.HaveStatusCodeOk(because, becauseArgs).And.Should().HaveBodyAsCommonResponse(because, becauseArgs).Which.Should().BeEquivalentTo(CommonDeleteResponse.Deleted, because, becauseArgs);

+        }

+

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

+        {

+            assertions.HaveStatusCodeOk(because, becauseArgs).And.Should().HaveBodyAsCommonResponse(because, becauseArgs).Which.Should().BeEquivalentTo(CommonDeleteResponse.NotExists, because, becauseArgs);

+        }

+    }

+}

diff --git a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
index 8a44c852..c8a79e58 100644
--- a/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
+++ b/Timeline.Tests/Helpers/Authentication/AuthenticationExtensions.cs
@@ -14,7 +14,7 @@ namespace Timeline.Tests.Helpers.Authentication
         public static async Task<CreateTokenResponse> CreateUserTokenAsync(this HttpClient client, string username, string password, int? expireOffset = null)

         {

             var response = await client.PostAsJsonAsync(CreateTokenUrl, new CreateTokenRequest { Username = username, Password = password, ExpireOffset = expireOffset });

-            response.AssertOk();

+            response.Should().HaveStatusCodeOk();

             var result = JsonConvert.DeserializeObject<CreateTokenResponse>(await response.Content.ReadAsStringAsync());

             return result;

         }

diff --git a/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs b/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs
index 1c079d0e..af432095 100644
--- a/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs
+++ b/Timeline.Tests/Helpers/InvalidModelTestHelpers.cs
@@ -1,8 +1,6 @@
-using System.Net;

 using System.Net.Http;

 using System.Threading.Tasks;

 using Timeline.Models.Http;

-using Xunit;

 

 namespace Timeline.Tests.Helpers

 {

@@ -11,17 +9,15 @@ namespace Timeline.Tests.Helpers
         public static async Task TestPostInvalidModel<T>(HttpClient client, string url, T body)

         {

             var response = await client.PostAsJsonAsync(url, body);

-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);

-            var responseBody = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonResponse.ErrorCodes.InvalidModel, responseBody.Code);

+            response.Should().HaveStatusCodeBadRequest()

+                .And.Should().HaveBodyAsCommonResponseWithCode(CommonResponse.ErrorCodes.InvalidModel);

         }

 

         public static async Task TestPutInvalidModel<T>(HttpClient client, string url, T body)

         {

             var response = await client.PutAsJsonAsync(url, body);

-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);

-            var responseBody = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonResponse.ErrorCodes.InvalidModel, responseBody.Code);

+            response.Should().HaveStatusCodeBadRequest()

+                .And.Should().HaveBodyAsCommonResponseWithCode(CommonResponse.ErrorCodes.InvalidModel);

         }

     }

 }

diff --git a/Timeline.Tests/Helpers/ResponseExtensions.cs b/Timeline.Tests/Helpers/ResponseExtensions.cs
deleted file mode 100644
index 46c9e81d..00000000
--- a/Timeline.Tests/Helpers/ResponseExtensions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Newtonsoft.Json;

-using System.Net;

-using System.Net.Http;

-using System.Threading.Tasks;

-using Timeline.Models.Http;

-using Xunit;

-

-namespace Timeline.Tests.Helpers

-{

-    public static class ResponseExtensions

-    {

-        public static void AssertOk(this HttpResponseMessage response)

-        {

-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);

-        }

-

-        public static void AssertNotFound(this HttpResponseMessage response)

-        {

-            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);

-        }

-

-        public static void AssertBadRequest(this HttpResponseMessage response)

-        {

-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);

-        }

-

-        public static async Task AssertIsPutCreated(this HttpResponseMessage response)

-        {

-            Assert.Equal(HttpStatusCode.Created, response.StatusCode);

-            var body = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonPutResponse.CreatedCode, body.Code);

-        }

-

-        public static async Task AssertIsPutModified(this HttpResponseMessage response)

-        {

-            response.AssertOk();

-            var body = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonPutResponse.ModifiedCode, body.Code);

-        }

-

-

-        public static async Task AssertIsDeleteDeleted(this HttpResponseMessage response)

-        {

-            response.AssertOk();

-            var body = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonDeleteResponse.DeletedCode, body.Code);

-        }

-

-        public static async Task AssertIsDeleteNotExist(this HttpResponseMessage response)

-        {

-            response.AssertOk();

-            var body = await response.ReadBodyAsJson<CommonResponse>();

-            Assert.Equal(CommonDeleteResponse.NotExistsCode, body.Code);

-        }

-

-        public static async Task<T> ReadBodyAsJson<T>(this HttpResponseMessage response)

-        {

-            return JsonConvert.DeserializeObject<T>(await response.Content.ReadAsStringAsync());

-        }

-    }

-}

diff --git a/Timeline.Tests/Helpers/UserInfoComparers.cs b/Timeline.Tests/Helpers/UserInfoComparers.cs
deleted file mode 100644
index 1a1c652d..00000000
--- a/Timeline.Tests/Helpers/UserInfoComparers.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;

-using Timeline.Models;

-

-namespace Timeline.Tests.Helpers

-{

-    public static class UserInfoComparers

-    {

-        public static IEqualityComparer<UserInfo> EqualityComparer { get; } = new EqualityComparerImpl();

-        public static IComparer<UserInfo> Comparer { get; } = Comparer<UserInfo>.Create(Compare);

-

-

-        private class EqualityComparerImpl : IEqualityComparer<UserInfo>

-        {

-            bool IEqualityComparer<UserInfo>.Equals(UserInfo x, UserInfo y)

-            {

-                return Compare(x, y) == 0;

-            }

-

-            int IEqualityComparer<UserInfo>.GetHashCode(UserInfo obj)

-            {

-                return obj.Username.GetHashCode() ^ obj.Administrator.GetHashCode();

-            }

-        }

-

-        public static int Compare(UserInfo left, UserInfo right)

-        {

-            if (left == null)

-            {

-                if (right == null)

-                    return 0;

-                return -1;

-            }

-

-            if (right == null)

-                return 1;

-

-            var uc = string.Compare(left.Username, right.Username);

-            if (uc != 0)

-                return uc;

-

-            if (left.Administrator == right.Administrator)

-                return 0;

-

-            return left.Administrator ? -1 : 1;

-        }

-    }

-}