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

Changed BaseWebTest to use same logic as BaseDatabaseFactoryTests since we need the ServiceContext now. Fixed a bunch of failing tests... still have some more to fix though.

Browse Source
This commit is contained in:
Shannon Deminick
2013-01-05 23:36:38 +03:00
parent 97ffed5ee7
commit dbf38fbeb8
3 changed files with 106 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
View File

@@ -1,4 +1,6 @@
using System;
using System.Configuration;
using System.Data.SqlServerCe;
using System.IO;
using System.Web.Routing;
using System.Xml;
@@ -9,6 +11,10 @@ using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.ObjectResolution;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Tests.Stubs;
using Umbraco.Web;
using Umbraco.Web.Routing;
@@ -24,45 +30,107 @@ namespace Umbraco.Tests.TestHelpers
[SetUp]
public virtual void Initialize()
{
TestHelper.SetupLog4NetForTests();
TestHelper.InitializeContentDirectories();
TestHelper.SetupLog4NetForTests();
TestHelper.InitializeContentDirectories();
AppDomain.CurrentDomain.SetData("DataDirectory", TestHelper.CurrentAssemblyDirectory);
string path = TestHelper.CurrentAssemblyDirectory;
AppDomain.CurrentDomain.SetData("DataDirectory", path);
if (RequiresDbSetup)
TestHelper.InitializeDatabase();
UmbracoSettings.UseLegacyXmlSchema = false;
Resolution.Freeze();
RepositoryResolver.Current = new RepositoryResolver(
new RepositoryFactory());
//NOTE: We are not constructing with the service context here because it is not required for these tests (currently)
// if we do, this means that we have to initialized the RepositoryResolver too.
ApplicationContext.Current = new ApplicationContext
{
IsReady = true,
//assign the db context
DatabaseContext = new DatabaseContext(new DefaultDatabaseFactory())
};
//Ensure that any database connections from a previous test is disposed. This is really just double safety as its also done in the TearDown.
if (ApplicationContext != null && DatabaseContext != null)
DatabaseContext.Database.Dispose();
SqlCeContextGuardian.CloseBackgroundConnection();
//Delete database file before continueing
string filePath = string.Concat(path, "\\UmbracoPetaPocoTests.sdf");
if (File.Exists(filePath))
{
File.Delete(filePath);
}
//Get the connectionstring settings from config
var settings = ConfigurationManager.ConnectionStrings[Core.Configuration.GlobalSettings.UmbracoConnectionName];
ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf");
//Create the Sql CE database
var engine = new SqlCeEngine(settings.ConnectionString);
if (RequiresDbSetup)
{
engine.CreateDatabase();
}
Resolution.Freeze();
ApplicationContext.Current = new ApplicationContext(
//assign the db context
new DatabaseContext(new DefaultDatabaseFactory()),
//assign the service context
new ServiceContext(new PetaPocoUnitOfWorkProvider(), new FileUnitOfWorkProvider(), new PublishingStrategy())) { IsReady = true };
//Configure the Database and Sql Syntax based on connection string set in config
DatabaseContext.Initialize();
if (RequiresDbSetup)
{
//Create the umbraco database and its base data
DatabaseContext.Database.CreateDatabaseSchema();
}
//if (RequiresDbSetup)
// TestHelper.InitializeDatabase();
}
[TearDown]
public virtual void TearDown()
{
TestHelper.CleanContentDirectories();
DatabaseContext.Database.Dispose();
//reset the app context
ApplicationContext.ApplicationCache.ClearAllCache();
//reset the app context
DatabaseContext.Database.Dispose();
ApplicationContext.ApplicationCache.ClearAllCache();
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
SyntaxConfig.SqlSyntaxProvider = null;
if (RequiresDbSetup)
{
TestHelper.ClearDatabase();
SqlCeContextGuardian.CloseBackgroundConnection();
}
if (RequiresDbSetup)
{
//legacy API database connection close - because a unit test using PetaPoco db-layer can trigger the usage of SqlHelper we need to ensure that a possible connection is closed.
SqlCeContextGuardian.CloseBackgroundConnection();
}
AppDomain.CurrentDomain.SetData("DataDirectory", null);
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
RepositoryResolver.Reset();
TestHelper.CleanContentDirectories();
string path = TestHelper.CurrentAssemblyDirectory;
AppDomain.CurrentDomain.SetData("DataDirectory", null);
string filePath = string.Concat(path, "\\UmbracoPetaPocoTests.sdf");
if (File.Exists(filePath))
{
File.Delete(filePath);
}
//TestHelper.CleanContentDirectories();
////reset the app context
//DatabaseContext.Database.Dispose();
//ApplicationContext.ApplicationCache.ClearAllCache();
//ApplicationContext.Current = null;
//Resolution.IsFrozen = false;
//RepositoryResolver.Reset();
//if (RequiresDbSetup)
//{
// TestHelper.ClearDatabase();
// SqlCeContextGuardian.CloseBackgroundConnection();
//}
//AppDomain.CurrentDomain.SetData("DataDirectory", null);
Cache.ClearAllCache();

40
src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Linq;
using Examine;
using Examine.LuceneEngine.Providers;
using Lucene.Net.Analysis.Standard;
@@ -18,36 +19,17 @@ namespace Umbraco.Tests.UmbracoExamine
var i = new UmbracoContentIndexer(new IndexCriteria(
new[]
{
new TestIndexField { Name = "id", EnableSorting = true, Type = "Number" },
new TestIndexField { Name = "nodeName", EnableSorting = true },
new TestIndexField { Name = "updateDate", EnableSorting = true, Type = "DateTime" },
new TestIndexField { Name = "writerName" },
new TestIndexField { Name = "path" },
new TestIndexField { Name = "nodeTypeAlias" },
new TestIndexField { Name = "parentID" }
new TestIndexField {Name = "id", EnableSorting = true, Type = "Number"},
new TestIndexField {Name = "nodeName", EnableSorting = true},
new TestIndexField {Name = "updateDate", EnableSorting = true, Type = "DateTime"},
new TestIndexField {Name = "writerName"},
new TestIndexField {Name = "path"},
new TestIndexField {Name = "nodeTypeAlias"},
new TestIndexField {Name = "parentID"}
},
new[]
{
new TestIndexField { Name = "headerText" },
new TestIndexField { Name = "bodyText" },
new TestIndexField { Name = "metaDescription" },
new TestIndexField { Name = "metaKeywords" },
new TestIndexField { Name = "bodyTextColOne" },
new TestIndexField { Name = "bodyTextColTwo" },
new TestIndexField { Name = "xmlStorageTest" }
},
new[]
{
"CWS_Home",
"CWS_Textpage",
"CWS_TextpageTwoCol",
"CWS_NewsEventsList",
"CWS_NewsItem",
"CWS_Gallery",
"CWS_EventItem",
"Image",
},
new string[] { },
Enumerable.Empty<IIndexField>(),
Enumerable.Empty<string>(),
new string[] {},
-1),
luceneDir, //custom lucene directory
new TestDataService(),

1
src/UmbracoExamine/UmbracoExamine.csproj
View File

@@ -118,6 +118,7 @@
<Compile Include="IndexTypes.cs" />
<Compile Include="LegacyLibrary.cs" />
<Compile Include="LoggingLevel.cs" />
<Compile Include="UmbracoEventManager.cs" />
<Compile Include="UmbracoMemberIndexer.cs" />
<Compile Include="ContentExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />