Skip Razor.Evolution tests on Linux and Mac.

- Source ranges currently aren't normalized when they're input into the system. Due to how we serialize pieces of the code this breaks cross plat because of newline differences.
- This is a temporary work around to get the build passing cross plat.
This commit is contained in:
N. Taylor Mullen 2016-12-16 16:35:25 -08:00
parent 705a490acb
commit 88d99b06b3
7 changed files with 21 additions and 5 deletions

View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Razor.Evolution.Legacy;
using System;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution
@ -41,11 +42,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution
var expectedErrors = new[] {
new RazorError(
LegacyResources.FormatParseError_Sections_Cannot_Be_Nested(LegacyResources.SectionExample_CS),
new SourceLocation(22, 2, 4),
new SourceLocation(18 + Environment.NewLine.Length * 2, 2, 4),
length: 8),
new RazorError(
LegacyResources.FormatParseError_Sections_Cannot_Be_Nested(LegacyResources.SectionExample_CS),
new SourceLocation(49, 4, 4),
new SourceLocation(41 + Environment.NewLine.Length * 4, 4, 4),
length: 8),
};
var engine = RazorEngine.Create();
@ -82,11 +83,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution
new RazorError("Test Error", SourceLocation.Zero, 3),
new RazorError(
LegacyResources.FormatParseError_Sections_Cannot_Be_Nested(LegacyResources.SectionExample_CS),
new SourceLocation(22, 2, 4),
new SourceLocation(18 + Environment.NewLine.Length * 2, 2, 4),
length: 8),
new RazorError(
LegacyResources.FormatParseError_Sections_Cannot_Be_Nested(LegacyResources.SectionExample_CS),
new SourceLocation(49, 4, 4),
new SourceLocation(41 + Environment.NewLine.Length * 4, 4, 4),
length: 8),
};
var engine = RazorEngine.Create();

View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests

View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests

View File

@ -13,6 +13,7 @@ using System.Threading;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Xunit;
using Xunit.Sdk;
using System.Runtime.InteropServices;
namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
{
@ -89,6 +90,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
protected void AssertIRMatchesBaseline(DocumentIRNode document)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
if (Filename == null)
{
var message = $"{nameof(AssertIRMatchesBaseline)} should only be called from an integration test ({nameof(Filename)} is null).";
@ -116,6 +122,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
protected void AssertCSharpDocumentMatchesBaseline(RazorCSharpDocument document)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
if (Filename == null)
{
var message = $"{nameof(AssertCSharpDocumentMatchesBaseline)} should only be called from an integration test ({nameof(Filename)} is null).";

View File

@ -3,6 +3,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests

View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Evolution.Legacy;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests

View File

@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
new DirectiveBlock(new DirectiveChunkGenerator(CSharpCodeParser.InheritsDirectiveDescriptor),
Factory.MetaCode("inherits").Accepts(AcceptedCharacters.None),
Factory.Span(SpanKind.Code, " ", CSharpSymbolType.WhiteSpace).Accepts(AcceptedCharacters.WhiteSpace)),
new RazorError(LegacyResources.FormatDirectiveExpectsTypeName(CSharpCodeParser.InheritsDirectiveDescriptor.Name), 24, 0, 24, 2));
new RazorError(LegacyResources.FormatDirectiveExpectsTypeName(CSharpCodeParser.InheritsDirectiveDescriptor.Name), 24, 0, 24, Environment.NewLine.Length));
}
[Fact]