From 6cf510a9bead8ff817da6e60d6a4f96027121e73 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 4 Nov 2013 19:47:09 +1100 Subject: [PATCH] More tests fixed --- .../PublishedContent/PublishedContentExtensionTests.cs | 2 +- src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs | 4 +++- src/Umbraco.Tests/TestHelpers/BaseWebTest.cs | 2 +- src/Umbraco.Web/PublishedContentExtensions.cs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs index cb7a12b07a..3df4b23a34 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs @@ -18,7 +18,7 @@ namespace Umbraco.Tests.PublishedContent protected override DatabaseBehavior DatabaseTestBehavior { - get { return DatabaseBehavior.NewDbFileAndSchemaPerFixture; } + get { return DatabaseBehavior.NewSchemaPerFixture; } } [SetUp] diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index 5c300ab7a4..c0bc7a5c79 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -214,7 +214,9 @@ namespace Umbraco.Tests.TestHelpers if (_isFirstRunInTestSession || DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerTest - || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerFixture)) + || DatabaseTestBehavior == DatabaseBehavior.NewDbFileAndSchemaPerTest + || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerFixture) + || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewDbFileAndSchemaPerFixture)) { //Create the umbraco database and its base data DatabaseContext.Database.CreateDatabaseSchema(false); diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index 95475da802..30b1efc71d 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -78,4 +78,4 @@ namespace Umbraco.Tests.TestHelpers } } -} +} diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index ace1dc55b2..efdb5813dc 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -611,7 +611,7 @@ namespace Umbraco.Web { var contentTypeService = UmbracoContext.Current.Application.Services.ContentTypeService; var type = contentTypeService.GetContentType(content.DocumentTypeAlias); - while (type.ParentId > 0) + while (type != null && type.ParentId > 0) { type = contentTypeService.GetContentType(type.ParentId); if (type.Alias.InvariantEquals(docTypeAlias))