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

Cleanup, fix tests

Browse Source
This commit is contained in:
Stephan
2018-04-30 15:11:01 +02:00
parent bcd0c95ec1
commit 038fc87a40
35 changed files with 159 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
View File

@@ -43,7 +43,7 @@ namespace Umbraco.Tests.Strings
StringType = CleanStringType.LowerCase | CleanStringType.Ascii,
Separator = '-'
})
.WithConfig(new CultureInfo("fr-FR"), CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
.WithConfig("fr-FR", CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
{
PreFilter = FilterFrenchElisions,
IsTerm = (c, leading) => leading ? char.IsLetter(c) : (char.IsLetterOrDigit(c) || c == '_'),
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.Strings
IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii
})
.WithConfig(new CultureInfo("fr-FR"), CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
.WithConfig("fr-FR", CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
{
PreFilter = WhiteQuotes,
IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
@@ -588,16 +588,12 @@ namespace Umbraco.Tests.Strings
#endregion
public void CleanStringWithTypeAndCulture(string input, string expected, string culture, CleanStringType stringType)
{
var cinfo = culture == null ? CultureInfo.InvariantCulture : new CultureInfo(culture);
// picks the proper config per culture
// and overrides some stringType params (ascii...)
var output = _helper.CleanString(input, stringType, cinfo);
var output = _helper.CleanString(input, stringType, culture);
Assert.AreEqual(expected, output);
}
#region Cases
[TestCase("foo.txt", "foo.txt")]
[TestCase("foo", "foo")]