From e20ae35b3ef813dfa32feaab0bbf6fc03391b303 Mon Sep 17 00:00:00 2001
From: Simon Hofer <simon.hofer@sbnet.ch>
Date: Wed, 17 Aug 2016 13:48:00 +0200
Subject: [PATCH] changed AcceptanceTestBase to print out proper formatted and
 valid json to make compare and copy/paste to test files easier

---
 .../AcceptanceTestsBase.cs                    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/AcceptanceTestsBase.cs b/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/AcceptanceTestsBase.cs
index 133548dc..d0594337 100644
--- a/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/AcceptanceTestsBase.cs
+++ b/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests/AcceptanceTestsBase.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Data.Common;
+using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Formatting;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -11,6 +13,9 @@
 using JSONAPI.Json;
 using Microsoft.Owin.Testing;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 using Owin;
 
 namespace JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp.Tests
@@ -39,13 +44,28 @@ protected virtual async Task AssertResponseContent(HttpResponseMessage response,
             {
                 var redactedResponse = GuidRegex.Replace(responseContent, "{{SOME_GUID}}");
                 actualResponse = StackTraceRegex.Replace(redactedResponse, "\"stackTrace\":\"{{STACK_TRACE}}\"");
+                actualResponse.Should().Be(expectedResponse);
             }
             else
             {
                 actualResponse = responseContent;
+                JsonSerializerSettings settings = new JsonSerializerSettings
+                {
+                    DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+                    DateFormatString = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff+00:00",
+                    Culture = CultureInfo.InvariantCulture,
+                    Formatting = Formatting.Indented
+                };
+
+                var actualResponseJObject = JsonConvert.DeserializeObject(actualResponse) as JObject;
+                var expectedResponseJObject = JsonConvert.DeserializeObject(expectedResponse) as JObject;
+                var equals = JToken.DeepEquals(actualResponseJObject, expectedResponseJObject);
+                if (!equals)
+                {
+                    Assert.Fail("should be: " + JsonConvert.SerializeObject(expectedResponseJObject, settings) + "\n but was: " + JsonConvert.SerializeObject(actualResponseJObject, settings));
+                }
             }
 
-            actualResponse.Should().Be(expectedResponse);
             response.Content.Headers.ContentType.MediaType.Should().Be(JsonApiContentType);
             response.Content.Headers.ContentType.CharSet.Should().Be("utf-8");