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

Core.Strings - fix unit tests

Browse Source
This commit is contained in:
Stephan
2013-02-19 14:00:17 -01:00
parent e10fc26729
commit 7493426e25
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Tests/CoreStrings/DefaultShortStringHelperTests.cs
View File

@@ -30,16 +30,16 @@ namespace Umbraco.Tests.CoreStrings
.WithConfig(CleanStringType.Alias, StripQuotes)
.WithConfig(new CultureInfo("fr-FR"), CleanStringType.Alias, WhiteQuotes);
//ShortStringHelperResolver.Reset();
//ShortStringHelperResolver.Current = new ShortStringHelperResolver(_helper);
//Resolution.Freeze();
ShortStringHelperResolver.Reset();
ShortStringHelperResolver.Current = new ShortStringHelperResolver(_helper);
Resolution.Freeze();
}
//[TearDown]
//public void TearDown()
//{
// ShortStringHelperResolver.Reset();
//}
[TearDown]
public void TearDown()
{
ShortStringHelperResolver.Reset();
}
static readonly Regex FrenchElisionsRegex = new Regex("\\b(c|d|j|l|m|n|qu|s|t)('|\u8217)", RegexOptions.Compiled | RegexOptions.IgnoreCase);

24
src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs
View File

@@ -208,11 +208,9 @@ namespace Umbraco.Tests.CoreStrings
#endregion
public void CleanStringToAscii(string input, string expected)
{
Assert.Throws<NotImplementedException>(() =>
{
var output = _helper.CleanString(input, CleanStringType.Ascii | CleanStringType.CamelCase);
Assert.AreEqual(expected, output);
});
var output = _helper.CleanString(input, CleanStringType.Ascii | CleanStringType.CamelCase);
// legacy does nothing
Assert.AreEqual(input, output);
}
#region Cases
@@ -267,11 +265,9 @@ namespace Umbraco.Tests.CoreStrings
#endregion
public void CleanStringToAsciiWithCase(string input, string expected, CleanStringType caseType)
{
Assert.Throws<NotImplementedException>(() =>
{
var output = _helper.CleanString(input, caseType | CleanStringType.Ascii);
Assert.AreEqual(expected, output);
});
var output = _helper.CleanString(input, caseType | CleanStringType.Ascii);
// legacy does nothing
Assert.AreEqual(input, output);
}
#region Cases
@@ -296,11 +292,9 @@ namespace Umbraco.Tests.CoreStrings
#endregion
public void CleanStringToAsciiWithCaseAndSeparator(string input, string expected, char separator, CleanStringType caseType)
{
Assert.Throws<NotImplementedException>(() =>
{
var output = _helper.CleanString(input, caseType | CleanStringType.Ascii, separator);
Assert.AreEqual(expected, output);
});
var output = _helper.CleanString(input, caseType | CleanStringType.Ascii, separator);
// legacy does nothing
Assert.AreEqual(input, output);
}
}
}

4
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -10,6 +10,7 @@ using Umbraco.Web.Models;
using Umbraco.Web.Mvc;
using Umbraco.Web.Routing;
using umbraco.BusinessLogic;
using Umbraco.Core.Strings;
namespace Umbraco.Tests.Routing
{
@@ -24,6 +25,8 @@ namespace Umbraco.Tests.Routing
SurfaceControllerResolver.Current = new SurfaceControllerResolver(
PluginManager.Current.ResolveSurfaceControllers());
ShortStringHelperResolver.Current = new ShortStringHelperResolver(new LegacyShortStringHelper());
base.Initialize();
SettingsForTests.UmbracoPath = "~/umbraco";
@@ -41,6 +44,7 @@ namespace Umbraco.Tests.Routing
UmbracoContext.Current = null;
RouteTable.Routes.Clear();
SurfaceControllerResolver.Reset();
ShortStringHelperResolver.Reset();
PluginManager.Current = null;
}