Port 7.7 - WIP

This commit is contained in:
Stephan
2017-09-14 19:29:12 +02:00
parent 4634eb28e7
commit d9aaba192c
63 changed files with 2701 additions and 1384 deletions

View File

@@ -118,6 +118,33 @@ namespace Umbraco.Tests.Strings
Assert.AreEqual("aeoa-and-aeoa-and-and-and-grosser-bbddzhzh-page", output);
}
[Test]
public void U4_4056_TryAscii()
{
var settings = SettingsForTests.GenerateMockSettings();
var contentMock = Mock.Get(settings.RequestHandler);
contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty<IChar>());
contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
SettingsForTests.ConfigureSettings(settings);
const string input1 = "ÆØÅ and æøå and 中文测试 and אודות האתר and größer БбДдЖж page";
const string input2 = "ÆØÅ and æøå and größer БбДдЖж page";
var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(settings)); // unicode
Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
Assert.AreEqual("æøå-and-æøå-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input2));
helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(settings)
.WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
{
IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
StringType = CleanStringType.LowerCase | CleanStringType.TryAscii, // try ascii
Separator = '-'
}));
Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
Assert.AreEqual("aeoa-and-aeoa-and-grosser-bbddzhzh-page", helper.CleanStringForUrlSegment(input2));
}
[Test]
public void CleanStringUnderscoreInTerm()
{