From ef94441d3bf33bbf8691bfb8991b321d5ae46fd3 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 12 Nov 2015 16:16:22 +0100 Subject: [PATCH] Fix ContentTypeServiceTests, due to changes in service/repository --- .../Services/ContentTypeServiceTests.cs | 15 ++++++++------- .../TestHelpers/Entities/MockedContentTypes.cs | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs index f022cb2952..4b3b300dd5 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; using Umbraco.Core; +using Umbraco.Core.Exceptions; using Umbraco.Core.Models; using Umbraco.Core.Models.Rdbms; @@ -509,7 +510,7 @@ namespace Umbraco.Tests.Services // Assert Assert.That(added, Is.True); - Assert.Throws(() => service.Save(composition)); + Assert.Throws(() => service.Save(composition)); Assert.DoesNotThrow(() => service.GetContentType("simpleChildPage")); } @@ -555,9 +556,9 @@ namespace Umbraco.Tests.Services Assert.That(addedToMeta, Is.True); Assert.That(addedToSeo, Is.True); - Assert.Throws(() => service.Save(basePage)); - Assert.Throws(() => service.Save(metaComposition)); - Assert.Throws(() => service.Save(seoComposition)); + Assert.Throws(() => service.Save(basePage)); + Assert.Throws(() => service.Save(metaComposition)); + Assert.Throws(() => service.Save(seoComposition)); Assert.DoesNotThrow(() => service.GetContentType("contentPage")); Assert.DoesNotThrow(() => service.GetContentType("advancedPage")); @@ -621,7 +622,7 @@ namespace Umbraco.Tests.Services Assert.That(titleAdded, Is.True); Assert.That(compositionAdded, Is.True); - Assert.Throws(() => service.Save(basePage)); + Assert.Throws(() => service.Save(basePage)); Assert.DoesNotThrow(() => service.GetContentType("contentPage")); Assert.DoesNotThrow(() => service.GetContentType("advancedPage")); @@ -700,7 +701,7 @@ namespace Umbraco.Tests.Services Assert.That(seoCompositionAdded, Is.True); Assert.That(metaCompositionAdded, Is.True); - Assert.Throws(() => service.Save(metaComposition)); + Assert.Throws(() => service.Save(metaComposition)); Assert.DoesNotThrow(() => service.GetContentType("contentPage")); Assert.DoesNotThrow(() => service.GetContentType("advancedPage")); @@ -887,7 +888,7 @@ namespace Umbraco.Tests.Services Assert.That(titleAdded, Is.True); Assert.That(subtitleAdded, Is.True); - Assert.Throws(() => service.Save(advancedPage)); + Assert.Throws(() => service.Save(advancedPage)); Assert.DoesNotThrow(() => service.GetContentType("contentPage")); Assert.DoesNotThrow(() => service.GetContentType("advancedPage")); diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs index e88880bb13..b97f069b12 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs @@ -191,7 +191,7 @@ namespace Umbraco.Tests.TestHelpers.Entities if (foundPg != null) { //this exists on the parent, so set the parent id - pg.ParentId = foundPg.Id; + pg.SetLazyParentId(new Lazy(() => foundPg.Id)); } }