Fix cibuild

Author: Bart Koelman

test/JsonApiDotNetCoreExampleTests/Acceptance/SerializationTests.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCoreExampleTests.Acceptance.Spec;
+using JsonApiDotNetCoreExampleTests.Helpers.Extensions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
@@ -43,10 +44,9 @@ public async Task When_getting_person_it_must_match_JSON_text()
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
             var bodyText = await response.Content.ReadAsStringAsync();
-            var token = JsonConvert.DeserializeObject<JToken>(bodyText);
-            var bodyFormatted = NormalizeLineEndings(token.ToString());
+            var json = JsonConvert.DeserializeObject<JToken>(bodyText).ToString();
 
-            var expectedText = NormalizeLineEndings(@"{
+            var expected = @"{
   ""meta"": {
     ""copyright"": ""Copyright 2015 Example Corp."",
     ""authors"": [
@@ -123,13 +123,8 @@ public async Task When_getting_person_it_must_match_JSON_text()
       ""self"": ""http://localhost/api/v1/people/123""
     }
   }
-}");
-            Assert.Equal(expectedText, bodyFormatted);
-        }
-
-        private static string NormalizeLineEndings(string text)
-        {
-            return text.Replace("\r\n", "\n").Replace("\r", "\n");
+}";
+            Assert.Equal(expected.NormalizeLineEndings(), json.NormalizeLineEndings());
         }
     }
 }

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/FetchingRelationshipsTests.cs

@@ -8,6 +8,7 @@
 using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
+using JsonApiDotNetCoreExampleTests.Helpers.Extensions;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
@@ -60,7 +61,7 @@ public async Task When_getting_existing_ToOne_relationship_it_should_succeed()
 
             var json = JsonConvert.DeserializeObject<JObject>(body).ToString();
 
-            Assert.Equal(@"{
+            string expected = @"{
   ""links"": {
     ""self"": ""http://localhost/api/v1/todoItems/" + todoItem.StringId + @"/relationships/owner"",
     ""related"": ""http://localhost/api/v1/todoItems/" + todoItem.StringId + @"/owner""
@@ -69,7 +70,8 @@ public async Task When_getting_existing_ToOne_relationship_it_should_succeed()
     ""type"": ""people"",
     ""id"": """ + todoItem.Owner.StringId + @"""
   }
-}", json);
+}";
+            Assert.Equal(expected.NormalizeLineEndings(), json.NormalizeLineEndings());
         }
 
         [Fact]
@@ -112,7 +114,7 @@ public async Task When_getting_existing_ToMany_relationship_it_should_succeed()
 
             var json = JsonConvert.DeserializeObject<JObject>(body).ToString();
 
-            Assert.Equal(@"{
+            var expected = @"{
   ""links"": {
     ""self"": ""http://localhost/api/v1/authors/" + author.StringId + @"/relationships/articles"",
     ""related"": ""http://localhost/api/v1/authors/" + author.StringId + @"/articles""
@@ -127,7 +129,9 @@ public async Task When_getting_existing_ToMany_relationship_it_should_succeed()
       ""id"": """ + author.Articles[1].StringId + @"""
     }
   ]
-}", json);
+}";
+
+            Assert.Equal(expected.NormalizeLineEndings(), json.NormalizeLineEndings());
         }
 
         [Fact]
@@ -156,7 +160,8 @@ public async Task When_getting_related_missing_to_one_resource_it_should_succeed
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
             var json = JsonConvert.DeserializeObject<JObject>(body).ToString();
-            Assert.Equal(@"{
+
+            var expected = @"{
   ""meta"": {
     ""copyright"": ""Copyright 2015 Example Corp."",
     ""authors"": [
@@ -169,7 +174,9 @@ public async Task When_getting_related_missing_to_one_resource_it_should_succeed
     ""self"": ""http://localhost/api/v1/todoItems/" + todoItem.StringId + @"/owner""
   },
   ""data"": null
-}", json);
+}";
+
+            Assert.Equal(expected.NormalizeLineEndings(), json.NormalizeLineEndings());
         }
 
         [Fact]

test/JsonApiDotNetCoreExampleTests/Helpers/Extensions/StringExtensions.cs

@@ -0,0 +1,10 @@
+namespace JsonApiDotNetCoreExampleTests.Helpers.Extensions
+{
+    public static class StringExtensions
+    {
+        public static string NormalizeLineEndings(this string text)
+        {
+            return text.Replace("\r\n", "\n").Replace("\r", "\n");
+        }
+    }
+}