From 16bb9df623947d99f43880cd8d1b6315c9a69157 Mon Sep 17 00:00:00 2001 From: sitereactor Date: Tue, 30 Oct 2012 15:20:54 -0100 Subject: [PATCH] Refactoring usage of the DatabaseContext --- .../ContentStores/PublishContentStoreTests.cs | 2 +- .../TestHelpers/BaseDatabaseFactoryTest.cs | 10 +++++----- src/Umbraco.Tests/TestHelpers/BaseWebTest.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs b/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs index be70bd007f..2650c21a6d 100644 --- a/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs +++ b/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs @@ -72,7 +72,7 @@ namespace Umbraco.Tests.ContentStores _umbracoContext = new UmbracoContext(_httpContextFactory.HttpContext, new ApplicationContext(), ServiceContext.Current, - DatabaseContext.Current, + new DatabaseContext(), new DefaultRoutesCache(false)); _umbracoContext.GetXmlDelegate = () => diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index c06a1c7039..12725894c8 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -36,7 +36,7 @@ namespace Umbraco.Tests.TestHelpers Resolution.Freeze(); ApplicationContext = new ApplicationContext() { IsReady = true }; ServiceContext = ServiceContext.Current; - DatabaseContext = DatabaseContext.Current; + DatabaseContext = new DatabaseContext(); //we need to clear out all currently created template files var masterPages = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Masterpages)); @@ -58,10 +58,10 @@ namespace Umbraco.Tests.TestHelpers var engine = new SqlCeEngine(settings.ConnectionString); engine.CreateDatabase(); - SyntaxConfig.SqlSyntaxProvider = SqlCeSyntaxProvider.Instance; - - //Create the umbraco database - DatabaseFactory.Current.Database.Initialize(); + //Configure the Database and Sql Syntax based on connection string set in config + DatabaseContext.Initialize(); + //Create the umbraco database and its base data + DatabaseContext.Database.Initialize(); CreateTestData(); } diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index aab970ea39..63608f42ee 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -32,7 +32,7 @@ namespace Umbraco.Tests.TestHelpers Resolution.Freeze(); ApplicationContext = new ApplicationContext() { IsReady = true }; ServiceContext = ServiceContext.Current; - DatabaseContext = DatabaseContext.Current; + DatabaseContext = new DatabaseContext(); //we need to clear out all currently created template files var masterPages = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Masterpages)); masterPages.GetFiles().ForEach(x => x.Delete());