From a7c134a3758e1f4c4ceea86b5fc0656dee27b684 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 4 Feb 2015 12:11:10 +1100 Subject: [PATCH] fixes last failing test --- src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs | 4 ++-- src/Umbraco.Web/Models/DynamicPublishedContent.cs | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs index 6e4f3e8c12..c57010d29f 100644 --- a/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs +++ b/src/Umbraco.Tests/Services/LocalizedTextServiceTests.cs @@ -364,7 +364,7 @@ namespace Umbraco.Tests.Services } [Test] - public void Using_XDocument_Throws_When_No_Culture_Found() + public void Using_XDocument_Returns_Default_Text_When_No_Culture_Found() { var culture = CultureInfo.GetCultureInfo("en-US"); var txtService = new LocalizedTextService( @@ -378,7 +378,7 @@ namespace Umbraco.Tests.Services } }); - Assert.Throws(() => txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU"))); + Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU"))); } } } diff --git a/src/Umbraco.Web/Models/DynamicPublishedContent.cs b/src/Umbraco.Web/Models/DynamicPublishedContent.cs index 83874623b8..26a5517039 100644 --- a/src/Umbraco.Web/Models/DynamicPublishedContent.cs +++ b/src/Umbraco.Web/Models/DynamicPublishedContent.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Dynamic; using System.Linq; -using System.Runtime.CompilerServices; using System.Web; using Umbraco.Core.Cache; using Umbraco.Core.Dynamics; @@ -16,8 +15,6 @@ using Umbraco.Core.Models; using Umbraco.Core; using System.Reflection; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Strings; -using ContentType = umbraco.cms.businesslogic.ContentType; namespace Umbraco.Web.Models {