From 070307ea888ee0b89203626d99ce09fe20c4df83 Mon Sep 17 00:00:00 2001 From: berg Date: Wed, 21 Oct 2020 21:04:10 +0200 Subject: [PATCH] Ensure unit tests run on linux Signed-off-by: berg --- .../Models/ImagingCacheSettings.cs | 2 +- .../Models/ModelsBuilderSettings.cs | 4 +-- .../CoreXml/RenamedRootNavigatorTests.cs | 25 ++++++++++++------- .../Packaging/PackageExtractionTests.cs | 2 +- .../HealthChecks/HealthCheckResultsTests.cs | 6 ++--- .../Builders/StylesheetBuilderTests.cs | 5 ++-- .../Umbraco.Web.Common/FileNameTests.cs | 8 +++--- .../Macros/MacroParserTests.cs | 2 +- 8 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/Umbraco.Core/Configuration/Models/ImagingCacheSettings.cs b/src/Umbraco.Core/Configuration/Models/ImagingCacheSettings.cs index 90249abc15..44f5ae89b6 100644 --- a/src/Umbraco.Core/Configuration/Models/ImagingCacheSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ImagingCacheSettings.cs @@ -12,6 +12,6 @@ namespace Umbraco.Core.Configuration.Models public uint CachedNameLength { get; set; } = 8; - public string CacheFolder { get; set; } = Path.Combine("..", "Umbraco", "MediaCache"); + public string CacheFolder { get; set; } = Path.Combine("..", "umbraco", "mediacache"); } } diff --git a/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs b/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs index 9667a5eb2d..f0b56561e2 100644 --- a/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs @@ -5,10 +5,10 @@ namespace Umbraco.Core.Configuration.Models /// /// Represents the models builder configuration. /// - public class ModelsBuilderSettings + public class ModelsBuilderSettings { // TODO: This should not go into App_Data - that folder isn't really a real thing anymore - public static string DefaultModelsDirectory => "~/App_Data/Models"; + public static string DefaultModelsDirectory => "~/umbraco/models"; /// /// Gets a value indicating whether the whole models experience is enabled. diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs index bdc4e710c0..c904f7fbf9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs @@ -1,4 +1,5 @@ -using System.Xml; +using System.Runtime.InteropServices; +using System.Xml; using System.Xml.XPath; using NUnit.Framework; using Umbraco.Core.Xml.XPath; @@ -18,10 +19,10 @@ namespace Umbraco.Tests.CoreXml "); var nav = doc.CreateNavigator(); var xml = nav.OuterXml; - Assert.AreEqual(@" + Assert.AreEqual(EnsureNativeLineEndings(@" -".CrLf(), xml); +"), xml); } [Test] @@ -34,10 +35,10 @@ namespace Umbraco.Tests.CoreXml "); var nav = doc.CreateNavigator(); var xml = nav.OuterXml; - Assert.AreEqual(@" + Assert.AreEqual(EnsureNativeLineEndings(@" -".CrLf(), xml); +"), xml); } [Test] @@ -50,10 +51,16 @@ namespace Umbraco.Tests.CoreXml "); var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test"); var xml = nav.OuterXml; - Assert.AreEqual(@" + Assert.AreEqual(EnsureNativeLineEndings(@" -".CrLf(), xml); +"), xml); + } + + private string EnsureNativeLineEndings(string text) + { + var useCrLf = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + return useCrLf ? text.CrLf() : text.Lf(); } [Test] @@ -66,10 +73,10 @@ namespace Umbraco.Tests.CoreXml "); var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test"); var xml = nav.OuterXml; - Assert.AreEqual(@" + Assert.AreEqual(EnsureNativeLineEndings(@" -".CrLf(), xml); +"), xml); } [Test] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs index ad76b060ce..140173282c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs @@ -14,7 +14,7 @@ namespace Umbraco.Tests.Packaging private static FileInfo GetTestPackagePath(string packageName) { - const string testPackagesDirName = "Umbraco.Core\\Packaging\\Packages"; + var testPackagesDirName = Path.Combine("Umbraco.Core","Packaging","Packages"); var testDir = TestContext.CurrentContext.TestDirectory.Split("bin")[0]; var path = Path.Combine(testDir, testPackagesDirName, packageName); return new FileInfo(path); diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs index e18ab64716..17e528fb05 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs @@ -137,7 +137,7 @@ namespace Umbraco.Tests.Web.HealthChecks var results = new HealthCheckResults(checks); var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary); - Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success'\r\n") > -1); + Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1); } [Test] @@ -151,8 +151,8 @@ namespace Umbraco.Tests.Web.HealthChecks var results = new HealthCheckResults(checks); var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Detailed); - Assert.IsFalse(resultAsMarkdown.IndexOf("Result: 'Success'\r\n") > -1); - Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success', Message: 'First check was successful'\r\n") > -1); + Assert.IsFalse(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1); + Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success', Message: 'First check was successful'" + Environment.NewLine) > -1); } } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs index a9104b5dd4..c770860b9c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using NUnit.Framework; using Umbraco.Core.Routing; using Umbraco.Tests.Common.Builders; @@ -24,7 +25,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders .Build(); // Assert - Assert.AreEqual("\\css\\styles.css", stylesheet.Path); + Assert.AreEqual(Path.DirectorySeparatorChar + Path.Combine("css", "styles.css"), stylesheet.Path); Assert.AreEqual(testContent, stylesheet.Content); } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index e7cf097dd5..bee0b8bf15 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -48,7 +48,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common var viewResult = await sut.Index() as ViewResult; var fileName = GetViewName(viewResult, Path.DirectorySeparatorChar.ToString()); - var views = GetUiFiles(new[] { "Umbraco", "UmbracoInstall" }); + var views = GetUiFiles(new[] { "umbraco", "UmbracoInstall" }); Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't"); } @@ -63,7 +63,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common var viewResult = sut.Index() as ViewResult; var fileName = GetViewName(viewResult); - var views = GetUiFiles(new[] { "Umbraco", "UmbracoBackOffice" }); + var views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" }); Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't"); } @@ -85,7 +85,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common var viewResult = await sut.Default() as ViewResult; var fileName = GetViewName(viewResult); - var views = GetUiFiles(new[] { "Umbraco", "UmbracoBackOffice" }); + var views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" }); Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't"); } @@ -94,7 +94,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common [Test] public void LanguageFilesAreLowercase() { - var files = GetUiFiles(new[] { "Umbraco", "config", "lang" }); + var files = GetUiFiles(new[] { "umbraco", "config", "lang" }); foreach (var fileName in files) { Assert.AreEqual(fileName.ToLower(), fileName, diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs index 1d9e9012e0..afa74ed213 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs @@ -323,7 +323,7 @@ test""> Macro alias: Map -

asdfasdf

".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); +

asdfasdf

".NoCrLf(), result.NoCrLf()); } [Test]