yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes to use StripWhitespace to fix tests

Browse Source
This commit is contained in:
Shannon
2016-02-04 18:09:17 +01:00
parent 7449e3bf1d
commit 0d9fef5457
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
View File

@@ -104,7 +104,7 @@ namespace Umbraco.Tests.Persistence.Repositories
<asp:Content ContentPlaceHolderID=""ContentPlaceHolderDefault"" runat=""server"">
</asp:Content>
".StripBlockWhitespace(), template.Content.StripBlockWhitespace());
".StripWhitespace(), template.Content.StripWhitespace());
}
}
@@ -133,7 +133,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"" %>
".StripBlockWhitespace(), template2.Content.StripBlockWhitespace());
".StripWhitespace(), template2.Content.StripWhitespace());
}
}
@@ -178,8 +178,8 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(repository.Get("test"), Is.Not.Null);
Assert.That(_viewsFileSystem.FileExists("test.cshtml"), Is.True);
Assert.AreEqual(
@"@inherits Umbraco.Web.Mvc.UmbracoTemplatePage @{ Layout = null;}".StripBlockWhitespace(),
template.Content.StripBlockWhitespace());
@"@inherits Umbraco.Web.Mvc.UmbracoTemplatePage @{ Layout = null;}".StripWhitespace(),
template.Content.StripWhitespace());
}
}
@@ -207,8 +207,8 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(repository.Get("test2"), Is.Not.Null);
Assert.That(_viewsFileSystem.FileExists("test2.cshtml"), Is.True);
Assert.AreEqual(
"@inherits Umbraco.Web.Mvc.UmbracoTemplatePage @{ Layout = \"test.cshtml\";}".StripBlockWhitespace(),
template2.Content.StripBlockWhitespace());
"@inherits Umbraco.Web.Mvc.UmbracoTemplatePage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
template2.Content.StripWhitespace());
}
}

6
src/Umbraco.Tests/Strings/StylesheetHelperTests.cs
View File

@@ -23,7 +23,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;}".StripBlockWhitespace(), result.StripBlockWhitespace());
p{font-size:1em; color:blue;} /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}".StripWhitespace(), result.StripWhitespace());
}
[Test]
@@ -41,7 +41,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;}".StripBlockWhitespace(), result.StripBlockWhitespace());
p{font-size:1em; color:blue;}".StripWhitespace(), result.StripWhitespace());
}
[Test]
@@ -96,7 +96,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.StripBlockWhitespace(), results.First().Styles.StripBlockWhitespace());
Assert.AreEqual(styles.StripWhitespace(), results.First().Styles.StripWhitespace());
}
// No Name: keyword