huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix GeneratedCodeTests and trailing whitespace (#24855)

This commit is contained in:
James Newton-King 2020-08-13 12:29:06 +12:00 committed by GitHub
parent aeb3537b61
commit 4d4f2fe00f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
View File

@ -3,8 +3,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Xunit; using Xunit;
@ -52,12 +50,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
var testTransportMultiplxedConnectionGenerated = File.ReadAllText(testTransportMultiplexedConnectionGeneratedPath); var testTransportMultiplxedConnectionGenerated = File.ReadAllText(testTransportMultiplexedConnectionGeneratedPath);
var testTransportConnectionGenerated = File.ReadAllText(testTransportConnectionGeneratedPath); var testTransportConnectionGenerated = File.ReadAllText(testTransportConnectionGeneratedPath);
Assert.Equal(currentHttpHeadersGenerated, testHttpHeadersGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentHttpHeadersGenerated, testHttpHeadersGenerated);
Assert.Equal(currentHttpProtocolGenerated, testHttpProtocolGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentHttpProtocolGenerated, testHttpProtocolGenerated);
Assert.Equal(currentHttpUtilitiesGenerated, testHttpUtilitiesGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentHttpUtilitiesGenerated, testHttpUtilitiesGenerated);
Assert.Equal(currentHttp2ConnectionGenerated, testHttp2ConnectionGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentHttp2ConnectionGenerated, testHttp2ConnectionGenerated);
Assert.Equal(currentTransportConnectionBaseGenerated, testTransportMultiplxedConnectionGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentTransportConnectionBaseGenerated, testTransportMultiplxedConnectionGenerated);
Assert.Equal(currentTransportConnectionGenerated, testTransportConnectionGenerated, ignoreLineEndingDifferences: true); AssertFileContentEqual(currentTransportConnectionGenerated, testTransportConnectionGenerated);
} }
finally finally
{ {
@ -69,5 +67,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
File.Delete(testTransportConnectionGeneratedPath); File.Delete(testTransportConnectionGeneratedPath);
} }
} }
private void AssertFileContentEqual(string expected, string actual)
{
Assert.Equal(expected.Trim(), actual.Trim(), ignoreLineEndingDifferences: true);
}
} }
} }