From 4d4f2fe00ffa7c1b9ea08164f9f26a51a392d007 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 13 Aug 2020 12:29:06 +1200 Subject: [PATCH] Fix GeneratedCodeTests and trailing whitespace (#24855) --- .../Kestrel/test/GeneratedCodeTests.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs index da53ab050b..52201ce333 100644 --- a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs +++ b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs @@ -3,8 +3,6 @@ using System; using System.IO; -using System.Linq; -using System.Reflection; using Microsoft.AspNetCore.Testing; using Xunit; @@ -52,12 +50,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var testTransportMultiplxedConnectionGenerated = File.ReadAllText(testTransportMultiplexedConnectionGeneratedPath); var testTransportConnectionGenerated = File.ReadAllText(testTransportConnectionGeneratedPath); - Assert.Equal(currentHttpHeadersGenerated, testHttpHeadersGenerated, ignoreLineEndingDifferences: true); - Assert.Equal(currentHttpProtocolGenerated, testHttpProtocolGenerated, ignoreLineEndingDifferences: true); - Assert.Equal(currentHttpUtilitiesGenerated, testHttpUtilitiesGenerated, ignoreLineEndingDifferences: true); - Assert.Equal(currentHttp2ConnectionGenerated, testHttp2ConnectionGenerated, ignoreLineEndingDifferences: true); - Assert.Equal(currentTransportConnectionBaseGenerated, testTransportMultiplxedConnectionGenerated, ignoreLineEndingDifferences: true); - Assert.Equal(currentTransportConnectionGenerated, testTransportConnectionGenerated, ignoreLineEndingDifferences: true); + AssertFileContentEqual(currentHttpHeadersGenerated, testHttpHeadersGenerated); + AssertFileContentEqual(currentHttpProtocolGenerated, testHttpProtocolGenerated); + AssertFileContentEqual(currentHttpUtilitiesGenerated, testHttpUtilitiesGenerated); + AssertFileContentEqual(currentHttp2ConnectionGenerated, testHttp2ConnectionGenerated); + AssertFileContentEqual(currentTransportConnectionBaseGenerated, testTransportMultiplxedConnectionGenerated); + AssertFileContentEqual(currentTransportConnectionGenerated, testTransportConnectionGenerated); } finally { @@ -69,5 +67,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests File.Delete(testTransportConnectionGeneratedPath); } } + + private void AssertFileContentEqual(string expected, string actual) + { + Assert.Equal(expected.Trim(), actual.Trim(), ignoreLineEndingDifferences: true); + } } }