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")]

20
src/Umbraco.Tests/Strings/MockShortStringHelper.cs
View File

@@ -19,17 +19,7 @@ namespace Umbraco.Tests.Strings
return "SAFE-ALIAS::" + text;
}
public string CleanStringForSafeCamelAlias(string text)
{
return "SAFE-ALIAS::" + text;
}
public string CleanStringForSafeAlias(string text, System.Globalization.CultureInfo culture)
{
return "SAFE-ALIAS-CULTURE::" + text;
}
public string CleanStringForSafeCamelAlias(string text, System.Globalization.CultureInfo culture)
public string CleanStringForSafeAlias(string text, string culture)
{
return "SAFE-ALIAS-CULTURE::" + text;
}
@@ -39,7 +29,7 @@ namespace Umbraco.Tests.Strings
return "URL-SEGMENT::" + text;
}
public string CleanStringForUrlSegment(string text, System.Globalization.CultureInfo culture)
public string CleanStringForUrlSegment(string text, string culture)
{
return "URL-SEGMENT-CULTURE::" + text;
}
@@ -49,7 +39,7 @@ namespace Umbraco.Tests.Strings
return "SAFE-FILE-NAME::" + text;
}
public string CleanStringForSafeFileName(string text, System.Globalization.CultureInfo culture)
public string CleanStringForSafeFileName(string text, string culture)
{
return "SAFE-FILE-NAME-CULTURE::" + text;
}
@@ -69,12 +59,12 @@ namespace Umbraco.Tests.Strings
return "CLEAN-STRING-B::" + text;
}
public string CleanString(string text, CleanStringType stringType, System.Globalization.CultureInfo culture)
public string CleanString(string text, CleanStringType stringType, string culture)
{
return "CLEAN-STRING-C::" + text;
}
public string CleanString(string text, CleanStringType stringType, char separator, System.Globalization.CultureInfo culture)
public string CleanString(string text, CleanStringType stringType, char separator, string culture)
{
return "CLEAN-STRING-D::" + text;
}

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

@@ -188,7 +188,7 @@ namespace Umbraco.Tests.Strings
[Test]
public void ToSafeAliasWithCulture()
{
var output = "JUST-ANYTHING".ToSafeAlias(CultureInfo.InvariantCulture);
var output = "JUST-ANYTHING".ToSafeAlias(null);
Assert.AreEqual("SAFE-ALIAS-CULTURE::JUST-ANYTHING", output);
}
@@ -202,7 +202,7 @@ namespace Umbraco.Tests.Strings
[Test]
public void ToUrlSegmentWithCulture()
{
var output = "JUST-ANYTHING".ToUrlSegment(CultureInfo.InvariantCulture);
var output = "JUST-ANYTHING".ToUrlSegment(null);
Assert.AreEqual("URL-SEGMENT-CULTURE::JUST-ANYTHING", output);
}
@@ -216,7 +216,7 @@ namespace Umbraco.Tests.Strings
[Test]
public void ToSafeFileNameWithCulture()
{
var output = "JUST-ANYTHING".ToSafeFileName(CultureInfo.InvariantCulture);
var output = "JUST-ANYTHING".ToSafeFileName(null);
Assert.AreEqual("SAFE-FILE-NAME-CULTURE::JUST-ANYTHING", output);
}