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

Merge branch '7.1.5' of https://github.com/henrikrossen/Umbraco-CMS into henrikrossen-7.1.5

Browse Source
This commit is contained in:
Shannon
2014-10-03 12:51:27 +10:00
parent 1d42a9225f
commit 2b2891b6f4
4 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Tests/CoreStrings/StringExtensionsTests.cs
View File

@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Security;
using System.Text;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Strings;
@@ -62,7 +59,7 @@ namespace Umbraco.Tests.CoreStrings
for (int j = 0; j < chars.Length; j++)
valueToTest += chars[j].ToString();
var encrypted = valueToTest.ToString().EncryptWithMachineKey();
var encrypted = valueToTest.EncryptWithMachineKey();
var decrypted = encrypted.DecryptWithMachineKey();
Assert.AreNotEqual(valueToTest, encrypted);
Assert.AreEqual(valueToTest, decrypted);
@@ -132,14 +129,14 @@ namespace Umbraco.Tests.CoreStrings
[Test]
public void ToUrlAlias()
{
var output = "JUST-ANYTHING".ToUrlAlias(null, false, false, false);
var output = "JUST-ANYTHING".ToUrlSegment();
Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
}
[Test]
public void FormatUrl()
{
var output = "JUST-ANYTHING".FormatUrl();
var output = "JUST-ANYTHING".ToUrlSegment();
Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
}
@@ -195,7 +192,7 @@ namespace Umbraco.Tests.CoreStrings
[Test]
public void ConvertCase()
{
var output = "JUST-ANYTHING".ConvertCase(StringAliasCaseType.Unchanged);
var output = "JUST-ANYTHING".ToCleanString(CleanStringType.Unchanged);
Assert.AreEqual("CLEAN-STRING-A::JUST-ANYTHING", output);
}