diff --git a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
index 0f4b4a4f9e..41414cb81a 100644
--- a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
+++ b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
@@ -1162,13 +1162,4 @@ namespace Umbraco.Tests.CoreXml
}
#endregion
-
- static class StringCrLfExtensions
- {
- public static string Lf(this string s)
- {
- if (string.IsNullOrEmpty(s)) return s;
- return s.Replace("\r", ""); // remove Cr
- }
- }
}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index a8cc8b41e3..7630e0aaf7 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -102,7 +102,7 @@ namespace Umbraco.Tests.Persistence.Repositories
-", template.Content);
+".CrLf(), template.Content);
}
}
@@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(_masterPageFileSystem.FileExists("test2.master"), Is.True);
Assert.AreEqual(@"<%@ Master Language=""C#"" MasterPageFile=""~/masterpages/test.master"" AutoEventWireup=""true"" %>
-", template2.Content);
+".CrLf(), template2.Content);
}
}
diff --git a/src/Umbraco.Tests/StringNewlineExtensions.cs b/src/Umbraco.Tests/StringNewlineExtensions.cs
new file mode 100644
index 0000000000..7e52e0f061
--- /dev/null
+++ b/src/Umbraco.Tests/StringNewlineExtensions.cs
@@ -0,0 +1,30 @@
+namespace Umbraco.Tests
+{
+ static class StringNewLineExtensions
+ {
+ ///
+ /// Ensures Lf only everywhere.
+ ///
+ /// The text to filter.
+ /// The filtered text.
+ public static string Lf(this string text)
+ {
+ if (string.IsNullOrEmpty(text)) return text;
+ text = text.Replace("\r", ""); // remove CR
+ return text;
+ }
+
+ ///
+ /// Ensures CrLf everywhere.
+ ///
+ /// The text to filter.
+ /// The filtered text.
+ public static string CrLf(this string text)
+ {
+ if (string.IsNullOrEmpty(text)) return text;
+ text = text.Replace("\r", ""); // remove CR
+ text = text.Replace("\n", "\r\n"); // add CR everywhere
+ return text;
+ }
+ }
+}
diff --git a/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs b/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs
index 3f9f972b16..94c44e8114 100644
--- a/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs
+++ b/src/Umbraco.Tests/Strings/StylesheetHelperTests.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Strings
});
Assert.AreEqual(@"body {font-family:Arial;}/**umb_name:My new rule*/
-p{font-size:1em; color:blue;} /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}", result);
+p{font-size:1em; color:blue;} /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}".CrLf(), result);
}
[Test]
@@ -40,7 +40,7 @@ p{font-size:1em; color:blue;} /** umb_name: Test2 */ li {padding:0px;} table {m
Assert.AreEqual(@"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}
/**umb_name:My new rule*/
-p{font-size:1em; color:blue;}", result);
+p{font-size:1em; color:blue;}".CrLf(), result);
}
[Test]
@@ -95,7 +95,7 @@ font-size: 1em;
//Assert.IsTrue(results.First().RuleId.Value.Value.ToString() == file.Id.Value.Value + "/" + name);
Assert.AreEqual(name, results.First().Name);
Assert.AreEqual(selector, results.First().Selector);
- Assert.AreEqual(styles, results.First().Styles);
+ Assert.AreEqual(styles.CrLf(), results.First().Styles);
}
// No Name: keyword
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index af7a5061b2..eb81fddb30 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -181,6 +181,7 @@
+