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

Fixing event subscription which caused a series of unit tests to fail

Browse Source
This commit is contained in:
sitereactor
2012-11-01 15:06:35 -01:00
parent 3d7376824d
commit a98fddbd58
4 changed files with 8 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseCreation.cs
View File

@@ -123,75 +123,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
_database.CreateTable<User2AppDto>();
_database.CreateTable<User2NodeNotifyDto>();
_database.CreateTable<User2NodePermissionDto>();
//NOTE Please mind the order of the table creation, as some references requires other tables.
/*using (var transaction = _database.GetTransaction())
{
_database.CreateTable<NodeDto>();
_database.CreateTable<TemplateDto>();
_database.CreateTable<ContentDto>();
_database.CreateTable<ContentVersionDto>();
_database.CreateTable<DocumentDto>();
_database.CreateTable<ContentTypeDto>();
_database.CreateTable<DocumentTypeDto>();
_database.CreateTable<AppDto>();
_database.CreateTable<AppTreeDto>();
_database.CreateTable<DataTypeDto>();
_database.CreateTable<DataTypePreValueDto>();
_database.CreateTable<DictionaryDto>();
_database.CreateTable<LanguageTextDto>();
_database.CreateTable<LanguageDto>();
_database.CreateTable<DomainDto>();
_database.CreateTable<LogDto>();
_database.CreateTable<MacroDto>();
_database.CreateTable<MacroPropertyTypeDto>();
_database.CreateTable<MacroPropertyDto>();
_database.CreateTable<MemberTypeDto>();
_database.CreateTable<MemberDto>();
_database.CreateTable<Member2MemberGroupDto>();
_database.CreateTable<ContentXmlDto>();
_database.CreateTable<PreviewXmlDto>();
_database.CreateTable<PropertyTypeGroupDto>();
_database.CreateTable<PropertyTypeDto>();
_database.CreateTable<PropertyDataDto>();
_database.CreateTable<RelationTypeDto>();
_database.CreateTable<RelationDto>();
_database.CreateTable<StylesheetDto>();
_database.CreateTable<StylesheetPropertyDto>();
_database.CreateTable<TagDto>();
_database.CreateTable<TagRelationshipDto>();
_database.CreateTable<UserLoginDto>();
_database.CreateTable<UserTypeDto>();
_database.CreateTable<UserDto>();
_database.CreateTable<TaskTypeDto>();
_database.CreateTable<TaskDto>();
_database.CreateTable<ContentType2ContentTypeDto>();
_database.CreateTable<ContentTypeAllowedContentTypeDto>();
_database.CreateTable<User2AppDto>();
_database.CreateTable<User2NodeNotifyDto>();
_database.CreateTable<User2NodePermissionDto>();
transaction.Complete();
}*/
}
FireAfterCreation(e);

4
src/Umbraco.Core/Persistence/PetaPocoExtensions.cs
View File

@@ -35,7 +35,6 @@ namespace Umbraco.Core.Persistence
var foreignSql = SyntaxConfig.SqlSyntaxProvider.ToCreateForeignKeyStatements(tableDefinition);
var indexSql = SyntaxConfig.SqlSyntaxProvider.ToCreateIndexStatements(tableDefinition);
/*
#if DEBUG
Console.WriteLine(createSql);
Console.WriteLine(createPrimaryKeySql);
@@ -48,7 +47,6 @@ namespace Umbraco.Core.Persistence
Console.WriteLine(sql);
}
#endif
*/
var tableExist = db.TableExist(tableName);
if (overwrite && tableExist)
@@ -127,6 +125,8 @@ namespace Umbraco.Core.Persistence
var creation = new DatabaseCreation(db);
creation.InitializeDatabaseSchema();
NewTable -= PetaPocoExtensions_NewTable;
}
private static void PetaPocoExtensions_NewTable(string tableName, Database db, TableCreationEventArgs e)

2
src/Umbraco.Tests/Services/ContentServiceTests.cs
View File

@@ -13,7 +13,7 @@ namespace Umbraco.Tests.Services
/// This is more of an integration test as it involves multiple layers
/// as well as configuration.
/// </summary>
[TestFixture]
[TestFixture, RequiresSTA]
public class ContentServiceTests : BaseDatabaseFactoryTest
{
[SetUp]

11
src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
View File

@@ -9,7 +9,6 @@ using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.ObjectResolution;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Tests.Stubs;
using Umbraco.Web;
using Umbraco.Web.Routing;
@@ -33,11 +32,6 @@ namespace Umbraco.Tests.TestHelpers
string path = TestHelper.CurrentAssemblyDirectory;
AppDomain.CurrentDomain.SetData("DataDirectory", path);
Resolution.Freeze();
ApplicationContext = new ApplicationContext() { IsReady = true };
ServiceContext = ServiceContext.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());
@@ -58,6 +52,11 @@ namespace Umbraco.Tests.TestHelpers
var engine = new SqlCeEngine(settings.ConnectionString);
engine.CreateDatabase();
Resolution.Freeze();
ApplicationContext = new ApplicationContext() { IsReady = true };
ServiceContext = ServiceContext.Current;
DatabaseContext = new DatabaseContext();
//Configure the Database and Sql Syntax based on connection string set in config
DatabaseContext.Initialize();
//Create the umbraco database and its base data