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

Merge pull request #379 from aspnet/release/2.1 

Fix BOM test paths for Unix (#377)
This commit is contained in:
Jass Bagga 2018-03-19 16:07:10 -07:00 committed by GitHub
parent 0b58328143 6444acedfd
commit f036a26988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/Templates.Test/ByteOrderMarkTest.cs
View File

@ -10,6 +10,7 @@ namespace Templates.Test
public class ByteOrderMarkTest public class ByteOrderMarkTest
{ {
private readonly ITestOutputHelper _output; private readonly ITestOutputHelper _output;
private readonly char _separator = Path.DirectorySeparatorChar;
public ByteOrderMarkTest(ITestOutputHelper output) public ByteOrderMarkTest(ITestOutputHelper output)
{ {
@ -17,14 +18,16 @@ namespace Templates.Test
} }
[Theory] [Theory]
[InlineData(@"\Microsoft.AspNetCore.SpaTemplates\content")] [InlineData("Microsoft.AspNetCore.SpaTemplates")]
[InlineData(@"\Microsoft.DotNet.Web.ProjectTemplates\content")] [InlineData("Microsoft.DotNet.Web.ProjectTemplates")]
[InlineData(@"\Microsoft.DotNet.Web.Spa.ProjectTemplates\content")] [InlineData("Microsoft.DotNet.Web.Spa.ProjectTemplates")]
public void CheckForByteOrderMarkSpaTemplates(string path) public void CheckForByteOrderMarkSpaTemplates(string projectType)
{ {
var currentDirectory = Directory.GetCurrentDirectory(); var currentDirectory = Directory.GetCurrentDirectory();
var srcDirectory = Path.GetFullPath(Path.Combine(currentDirectory, @"..\..\..\..\..\src")); var repositoryPath = Directory.GetParent(currentDirectory).Parent.Parent.Parent.Parent.FullName;
var directories = Directory.GetDirectories(srcDirectory + path, "*Sharp"); var srcDirectory = Path.Combine(repositoryPath, "src");
var path = Path.Combine(projectType, "content");
var directories = Directory.GetDirectories(Path.Combine(srcDirectory, path), "*Sharp");
var filesWithBOMCharactersPresent = false; var filesWithBOMCharactersPresent = false;
foreach (var directory in directories) foreach (var directory in directories)