From 4d852102e869f5200a4a3c87ded8fc181f8a2724 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 23 May 2016 12:53:29 +0200 Subject: [PATCH] Refactor tests --- .../RepositoryCompositionRoot.cs | 2 +- .../Repositories/AuditRepositoryTest.cs | 2 +- .../Repositories/ContentRepositoryTest.cs | 56 +++++++++---------- .../Repositories/ContentTypeRepositoryTest.cs | 56 +++++++++---------- .../DataTypeDefinitionRepositoryTest.cs | 38 ++++++------- .../Repositories/DictionaryRepositoryTest.cs | 26 ++++----- .../Repositories/DomainRepositoryTest.cs | 26 ++++----- .../Repositories/LanguageRepositoryTest.cs | 24 ++++---- .../Repositories/MacroRepositoryTest.cs | 36 ++++++------ .../Repositories/MediaRepositoryTest.cs | 42 +++++++------- .../Repositories/MediaTypeRepositoryTest.cs | 32 +++++------ .../Repositories/MemberRepositoryTest.cs | 24 ++++---- .../Repositories/MemberTypeRepositoryTest.cs | 22 ++++---- .../NotificationsRepositoryTest.cs | 10 ++-- .../PublicAccessRepositoryTest.cs | 16 +++--- .../Repositories/RelationRepositoryTest.cs | 22 ++++---- .../RelationTypeRepositoryTest.cs | 20 +++---- .../ServerRegistrationRepositoryTest.cs | 24 ++++---- .../Repositories/TagRepositoryTest.cs | 42 +++++++------- .../Repositories/TaskRepositoryTest.cs | 18 +++--- .../Repositories/TaskTypeRepositoryTest.cs | 2 +- .../Repositories/TemplateRepositoryTest.cs | 44 +++++++-------- .../Repositories/UserRepositoryTest.cs | 36 ++++++------ .../Repositories/UserTypeRepositoryTest.cs | 22 ++++---- .../Persistence/UnitOfWorkTests.cs | 8 +-- .../Services/ContentServicePerformanceTest.cs | 8 +-- .../Services/ContentServiceTests.cs | 10 ++-- .../Services/MacroServiceTests.cs | 2 +- .../Services/MediaServiceTests.cs | 2 +- .../Services/MemberServiceTests.cs | 2 +- .../TestHelpers/BaseDatabaseFactoryTest.cs | 5 -- .../TestHelpers/BaseUmbracoApplicationTest.cs | 6 +- src/Umbraco.Tests/TestHelpers/TestObjects.cs | 14 ++++- 33 files changed, 353 insertions(+), 346 deletions(-) diff --git a/src/Umbraco.Core/DependencyInjection/RepositoryCompositionRoot.cs b/src/Umbraco.Core/DependencyInjection/RepositoryCompositionRoot.cs index ce79017c5d..92b5e8fe8d 100644 --- a/src/Umbraco.Core/DependencyInjection/RepositoryCompositionRoot.cs +++ b/src/Umbraco.Core/DependencyInjection/RepositoryCompositionRoot.cs @@ -63,7 +63,7 @@ namespace Umbraco.Core.DependencyInjection // the disabled one is used by those repositories that have an annotated ctor parameter container.RegisterSingleton(factory => CacheHelper.CreateDisabledCacheHelper(), DisabledCache); - // resolve ctor dependency from GetInstance() runtimeArguments, if possible - 'factory' is + // resolve ctor dependency from GetInstance() runtimeArguments, if possible - 'factory' is // the container, 'info' describes the ctor argument, and 'args' contains the args that // were passed to GetInstance() - use first arg if it is the right type, // diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs index 16717db3cd..a5ba3bec72 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Add_Audit_Entry() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs index 3faf46759f..32d1a8a782 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_Xml_Structures_With_Non_Latest_Version() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -115,7 +115,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -164,7 +164,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -232,7 +232,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Ensures_Permissions_Are_Set_If_Parent_Entity_Permissions_Exist() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -266,7 +266,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -290,7 +290,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_With_Default_Template() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -325,7 +325,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Save_Content_With_AtSign_In_Name_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -361,7 +361,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -392,7 +392,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -410,7 +410,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -433,7 +433,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_With_Null_Template() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -455,7 +455,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -484,7 +484,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -510,7 +510,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -528,7 +528,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_All_With_Many_Version() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -573,7 +573,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_Sorting_On_Custom_Property() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -608,7 +608,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForFirstPage_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -640,7 +640,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForSecondPage_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -661,7 +661,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithSinglePage_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -682,7 +682,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithDescendingOrder_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -703,7 +703,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingSome_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -727,7 +727,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingAll_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -751,7 +751,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -770,7 +770,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -791,7 +791,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -810,7 +810,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_ContentRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -829,7 +829,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Keys_Set() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -850,7 +850,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Content_By_Guid_Key() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 7c53ef3926..751e3e2f35 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -76,7 +76,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Maps_Templates_Correctly() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver); @@ -111,7 +111,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); @@ -157,7 +157,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); @@ -174,7 +174,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); @@ -194,7 +194,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Media_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid); @@ -215,7 +215,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Media_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid); @@ -246,7 +246,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -277,7 +277,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentTypeRepository_After_Model_Mapping() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -326,7 +326,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -402,7 +402,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentTypeRepository_After_Model_Mapping() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -465,7 +465,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -489,7 +489,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_With_Heirarchy_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -519,7 +519,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Query_On_ContentTypeRepository_Sort_By_Name() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -548,7 +548,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -566,7 +566,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Guid_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -588,7 +588,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Missing_Guid_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -604,7 +604,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -626,7 +626,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Guid_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -649,7 +649,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_ContentTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -666,7 +666,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_ContentType_With_PropertyType_Removed() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -690,7 +690,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_SimpleTextpage() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -708,7 +708,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_Textpage() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -726,7 +726,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyType_With_No_Group() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -760,7 +760,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_AllowedChildContentTypes_On_ContentType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -794,7 +794,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Removal_Of_Used_PropertyType_From_ContentType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository repository; @@ -821,7 +821,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Addition_Of_PropertyType_After_ContentType_Is_Used() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository repository; @@ -849,7 +849,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Usage_Of_New_PropertyType_On_Content() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository repository; @@ -883,7 +883,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_That_A_Combination_Of_Adding_And_Deleting_PropertyTypes_Doesnt_Cause_Issues_For_Content_And_ContentType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository repository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index f69e896071..6183aad18b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -82,7 +82,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -146,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -166,7 +166,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Data_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -186,7 +186,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Data_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -215,7 +215,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -241,7 +241,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -259,7 +259,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -279,7 +279,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -299,7 +299,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -319,7 +319,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -337,7 +337,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -363,7 +363,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -396,7 +396,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -427,7 +427,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_DataTypeDefinitionRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -445,7 +445,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_Collection() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -465,7 +465,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_As_String() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -485,7 +485,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_Collection_With_Cache() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); DataTypeDefinition dtd; using (var unitOfWork = provider.CreateUnitOfWork()) { @@ -515,7 +515,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_As_String_With_Cache() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); DataTypeDefinition dtd; object id; using (var unitOfWork = provider.CreateUnitOfWork()) diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs index f0a3e09cce..c7812137f1 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs @@ -36,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Key_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -68,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_UniqueId_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -100,7 +100,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -133,7 +133,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DictionaryRepository_When_No_Language_Assigned() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -159,7 +159,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -180,7 +180,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -200,7 +200,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -220,7 +220,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -238,7 +238,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var languageRepository = Container.GetInstance(unitOfWork); @@ -269,7 +269,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -296,7 +296,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_WithNewTranslation_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -326,7 +326,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -347,7 +347,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_DictionaryRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs index 8c1acc6449..1bf49453e1 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs @@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories private int CreateTestData(string isoName, out ContentType ct) { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -57,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -92,7 +92,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -125,7 +125,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -154,7 +154,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -187,7 +187,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId1 = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -237,7 +237,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -268,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -299,7 +299,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -330,7 +330,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -363,7 +363,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -398,7 +398,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; @@ -449,7 +449,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentType ct; var contentId = CreateTestData("en-AU", out ct); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentRepository contentRepo; diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs index bda8af7b98..1cc3f42abd 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs @@ -38,7 +38,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { unitOfWork.Database.EnableSqlTrace = true; @@ -58,7 +58,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Get_By_Iso_Code_On_LanguageRepository() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -85,7 +85,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Get_By_Culture_Name_On_LanguageRepository() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Get_WhenIdDoesntExist_ReturnsNull() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -130,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -150,7 +150,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -170,7 +170,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -190,7 +190,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -208,7 +208,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -228,7 +228,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -254,7 +254,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -275,7 +275,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_LanguageRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs index e1c73d622c..8ed839e950 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs @@ -31,7 +31,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Add_Duplicate_Macros() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -48,7 +48,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Update_To_Duplicate_Macro_Alias() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -65,7 +65,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -79,7 +79,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -110,7 +110,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -128,7 +128,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -146,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -164,7 +164,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -186,7 +186,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -228,7 +228,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -250,7 +250,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -269,7 +269,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Property_For_Macro() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -297,7 +297,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_New_Macro_With_Property() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -323,7 +323,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Remove_Macro_Property() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -349,7 +349,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Remove_Macro_Properties() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -381,7 +381,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Property_For_Macro() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -410,7 +410,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Macro_Property_Alias() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); @@ -440,7 +440,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 6f6fbb6a26..1407240fdf 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -72,7 +72,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -137,7 +137,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -168,7 +168,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_MediaRepository_With_RepositoryResolver() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -199,7 +199,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -218,7 +218,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -242,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -266,7 +266,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -293,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -312,7 +312,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForFirstPage_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -334,7 +334,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForSecondPage_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -356,7 +356,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithSinglePage_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -378,7 +378,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithDescendingOrder_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -400,7 +400,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WitAlternateOrder_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -422,7 +422,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingSome_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -447,7 +447,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingAll_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -472,7 +472,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -492,7 +492,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -512,7 +512,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -534,7 +534,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_MediaRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index fd0784bb82..dda9ce490b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -105,7 +105,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -127,7 +127,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Media_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -149,7 +149,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Media_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); @@ -181,7 +181,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -205,7 +205,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -243,7 +243,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -268,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -287,7 +287,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Guid_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -308,7 +308,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -330,7 +330,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Guid_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -356,7 +356,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_MediaTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -373,7 +373,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_MediaType_With_PropertyType_Removed() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -401,7 +401,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_Video_MediaType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -423,7 +423,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_File_MediaType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 49f39f8e95..b9d20b1261 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -47,7 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -76,7 +76,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -119,7 +119,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void MemberRepository_Can_Get_Member_By_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -138,7 +138,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Members_By_Ids() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -161,7 +161,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void MemberRepository_Can_Get_All_Members() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -187,7 +187,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Can_Perform_GetByQuery_With_Key() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -210,7 +210,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Persist_Member() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -234,7 +234,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void New_Member_Has_Built_In_Properties_By_Default() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -269,7 +269,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Does_Not_Replace_Password_When_Null() { IMember sut; - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -299,7 +299,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Can_Update_Email_And_Login_When_Changed() { IMember sut; - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -347,7 +347,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IMember CreateTestMember(IMemberType memberType = null, string name = null, string email = null, string password = null, string username = null, Guid? key = null) { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; @@ -371,7 +371,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IMemberType CreateTestMemberType(string alias = null) { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MemberTypeRepository memberTypeRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs index 3f02a68622..8b85f5de17 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Persist_Member_Type() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -64,7 +64,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Cannot_Persist_Member_Type_Without_Alias() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -80,7 +80,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Member_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -105,7 +105,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Member_Types_By_Guid_Ids() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -130,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Types_By_Guid_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -158,7 +158,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Members_When_No_Properties_Assigned() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -186,7 +186,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Type_By_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -202,7 +202,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Type_By_Guid_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -218,7 +218,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Built_In_Member_Type_Properties_Are_Automatically_Added_When_Creating() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -239,7 +239,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Built_In_Member_Type_Properties_Are_Not_Reused_For_Different_Member_Types() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -261,7 +261,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Delete_MemberType() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs index 8aeb184931..6ed5919203 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs @@ -20,7 +20,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void CreateNotification() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new NotificationsRepository(unitOfWork); @@ -42,7 +42,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void GetUserNotifications() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void GetEntityNotifications() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { @@ -101,7 +101,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Delete_By_Entity() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { @@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Delete_By_User() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index ff25f87bbb..17aa1d8729 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { unitOfWork.Database.EnableSqlTrace = true; @@ -94,7 +94,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { unitOfWork.Database.EnableSqlTrace = true; @@ -140,7 +140,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -178,7 +178,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -206,7 +206,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -244,7 +244,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -288,7 +288,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IEnumerable CreateTestData(int count) { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository ctRepo; diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index d4dd017b80..c7483889e3 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -109,7 +109,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -152,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -173,7 +173,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -193,7 +193,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -212,7 +212,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_RelationRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -234,7 +234,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Delete_Content_And_Verify_Relation_Is_Removed() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { RelationTypeRepository repositoryType; @@ -264,7 +264,7 @@ namespace Umbraco.Tests.Persistence.Repositories var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index c8a85dfae4..609167c556 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -38,7 +38,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -61,7 +61,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -108,7 +108,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -128,7 +128,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -148,7 +148,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -168,7 +168,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -187,7 +187,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -205,7 +205,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_RelationTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -234,7 +234,7 @@ namespace Umbraco.Tests.Persistence.Repositories var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs index 67f2706a39..e16f2c522b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Add_Duplicate_Server_Identities() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -56,7 +56,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Update_To_Duplicate_Server_Identities() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -73,7 +73,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -108,7 +108,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -128,7 +128,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_GetByQuery_On_Repository() //{ // // Arrange - // var provider = CreateUowProvider(); + // var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); // using (var unitOfWork = provider.GetUnitOfWork()) // using (var repository = CreateRepository(unitOfWork)) // { @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_Count_On_Repository() //{ // // Arrange - // var provider = CreateUowProvider(); + // var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); // using (var unitOfWork = provider.GetUnitOfWork()) // using (var repository = CreateRepository(unitOfWork)) // { @@ -162,7 +162,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -182,7 +182,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -208,7 +208,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -230,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -253,7 +253,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs index 2865277fb3..ea1ac67633 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs @@ -43,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -67,7 +67,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -101,7 +101,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -132,7 +132,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Append_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -172,7 +172,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Replace_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -215,7 +215,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Merge_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -256,7 +256,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Clear_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -293,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Remove_Specific_Tags_From_Property() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -338,7 +338,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_By_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -383,7 +383,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_By_Key() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -429,7 +429,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -465,7 +465,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_With_Ids() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -506,7 +506,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_For_Group() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -551,7 +551,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_By_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -597,7 +597,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_By_Key() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -642,7 +642,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_For_Group() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -688,7 +688,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Entity_Type() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -747,7 +747,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Entity_Type_For_Group() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -801,7 +801,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Cascade_Deletes_Tag_Relations() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { ContentTypeRepository contentTypeRepository; @@ -840,7 +840,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tagged_Entities_For_Tag_Group() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; @@ -925,7 +925,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tagged_Entities_For_Tag() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { MediaTypeRepository mediaTypeRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs index 199d0fd068..b9a2cae414 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs @@ -16,7 +16,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Add() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -77,7 +77,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Update() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -114,7 +114,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_By_Id() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -143,7 +143,7 @@ namespace Umbraco.Tests.Persistence.Repositories { CreateTestData(false, 20); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -159,7 +159,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10); CreateTestData(true, 5); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -175,7 +175,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10, -20); CreateTestData(false, 5, -21); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -191,7 +191,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10); CreateTestData(true, 5); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); @@ -203,7 +203,7 @@ namespace Umbraco.Tests.Persistence.Repositories private void CreateTestData(bool closed, int count, int entityId = -1) { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs index 9274351ed6..0028aa3933 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var taskType = new TaskType("asdfasdf"); diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs index 4c126f6b9c..c7b9e7fc6d 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs @@ -47,7 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_Detect_Content() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_With_Default_Content() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork, Mock.Of(x => x.DefaultRenderingEngine == RenderingEngine.WebForms)); @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_With_Default_Content_With_Parent() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork, Mock.Of(x => x.DefaultRenderingEngine == RenderingEngine.WebForms)); @@ -143,7 +143,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -164,7 +164,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View_With_Default_Content() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -191,7 +191,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View_With_Default_Content_With_Parent() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -220,7 +220,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_Unique_Alias() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -250,7 +250,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_Unique_Alias() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -286,7 +286,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_MasterPage() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -317,7 +317,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_View() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -346,7 +346,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_MasterPage() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -374,7 +374,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_View() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -402,7 +402,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_When_Assigned_To_Doc() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var templateRepository = CreateRepository(unitOfWork); @@ -443,7 +443,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Nested_Templates() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -483,7 +483,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Template_Tree() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -510,7 +510,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_All() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -538,7 +538,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Children() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -562,7 +562,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Children_At_Root() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -583,7 +583,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Descendants() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -608,7 +608,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Path_Is_Set_Correctly_On_Creation() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -671,7 +671,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Path_Is_Set_Correctly_On_Update() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index badb54146b..37f3b5ba1a 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -45,7 +45,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -66,7 +66,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -91,7 +91,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -114,7 +114,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -165,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -195,7 +195,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_Delete_On_UserRepository_With_Permissions_Assigned() //{ // // Arrange - // var provider = CreateUowProvider(); + // var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); // using (var unitOfWork = provider.GetUnitOfWork()) // UserTypeRepository userTypeRepository; //using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -247,7 +247,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -268,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -290,7 +290,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -312,7 +312,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -332,7 +332,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_UserRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -353,7 +353,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Remove_Section_For_User() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -389,7 +389,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Section_For_User() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -434,7 +434,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Section_For_User() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -463,7 +463,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Get_Users_Assigned_To_Section() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { UserTypeRepository userTypeRepository; @@ -493,7 +493,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Default_User_Permissions_Based_On_User_Type() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver); @@ -544,7 +544,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IUserType CreateAndCommitUserType() { - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs index b2b822e7bf..1382527e51 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -84,7 +84,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -106,7 +106,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -134,7 +134,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -161,7 +161,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -187,7 +187,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -207,7 +207,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -228,7 +228,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -249,7 +249,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); @@ -268,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_UserTypeRepository() { // Arrange - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = CreateRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/UnitOfWorkTests.cs b/src/Umbraco.Tests/Persistence/UnitOfWorkTests.cs index f006dffcd0..4875d0b6e7 100644 --- a/src/Umbraco.Tests/Persistence/UnitOfWorkTests.cs +++ b/src/Umbraco.Tests/Persistence/UnitOfWorkTests.cs @@ -17,7 +17,7 @@ namespace Umbraco.Tests.Persistence [Test] public void ReadLockNonExisting() { - var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); Assert.Throws(() => { using (var uow = provider.CreateUnitOfWork()) @@ -31,7 +31,7 @@ namespace Umbraco.Tests.Persistence [Test] public void ReadLockExisting() { - var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { uow.ReadLock(Constants.Locks.Servers); @@ -42,7 +42,7 @@ namespace Umbraco.Tests.Persistence [Test] public void WriteLockNonExisting() { - var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); Assert.Throws(() => { using (var uow = provider.CreateUnitOfWork()) @@ -56,7 +56,7 @@ namespace Umbraco.Tests.Persistence [Test] public void WriteLockExisting() { - var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { uow.WriteLock(Constants.Locks.Servers); diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index a24ebf1452..81f9cc8fa8 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver); @@ -177,7 +177,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver); @@ -207,7 +207,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver); @@ -240,7 +240,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index c19cd2170b..0405e3c3dc 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -863,7 +863,7 @@ namespace Umbraco.Tests.Services var content = contentService.GetById(NodeDto.NodeIdSeed + 1); bool published = contentService.Publish(content, 0); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { Assert.IsTrue(uow.Database.Exists(content.Id)); @@ -929,7 +929,7 @@ namespace Umbraco.Tests.Services } var allContent = rootContent.Concat(rootContent.SelectMany(x => x.Descendants(contentService))); //for testing we need to clear out the contentXml table so we can see if it worked - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { uow.Database.TruncateTable(SqlSyntax, "cmsContentXml"); @@ -963,7 +963,7 @@ namespace Umbraco.Tests.Services } var allContent = rootContent.Concat(rootContent.SelectMany(x => x.Descendants(contentService))).ToList(); //for testing we need to clear out the contentXml table so we can see if it worked - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { @@ -1602,7 +1602,7 @@ namespace Umbraco.Tests.Services contentService.Save(content); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { @@ -1626,7 +1626,7 @@ namespace Umbraco.Tests.Services contentService.Save(content); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs index 879f2129cc..80eef3b666 100644 --- a/src/Umbraco.Tests/Services/MacroServiceTests.cs +++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs @@ -26,7 +26,7 @@ namespace Umbraco.Tests.Services { base.CreateTestData(); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs index c323b43ebd..fba29ea369 100644 --- a/src/Umbraco.Tests/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Services mediaService.Save(media); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { Assert.IsTrue(uow.Database.Exists(media.Id)); diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs index af513629ec..14233283d7 100644 --- a/src/Umbraco.Tests/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs @@ -1057,7 +1057,7 @@ namespace Umbraco.Tests.Services var customMember = MockedMember.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello"); ServiceContext.MemberService.Save(customMember); - var provider = CreateUowProvider(); + var provider = TestObjects.GetDatabaseUnitOfWorkProvider(Logger); using (var uow = provider.CreateUnitOfWork()) { diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index 7f12b9b727..c1ef20f0b4 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -436,10 +436,5 @@ namespace Umbraco.Tests.TestHelpers "; } - - protected NPocoUnitOfWorkProvider CreateUowProvider() - { - return new NPocoUnitOfWorkProvider(Logger, MappingResolver); - } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs index b2143e8d13..8061fee0ab 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs @@ -210,14 +210,14 @@ namespace Umbraco.Tests.TestHelpers ApplicationContext.Current = new ApplicationContext( //assign the db context new DatabaseContext(new DefaultDatabaseFactory( - Core.Configuration.GlobalSettings.UmbracoConnectionName, - TestObjects.GetDefaultSqlSyntaxProviders(Logger), + Core.Configuration.GlobalSettings.UmbracoConnectionName, + TestObjects.GetDefaultSqlSyntaxProviders(Logger), Logger, new TestScopeContextAdapter(), Mock.Of()), Logger), //assign the service context TestObjects.GetServiceContext( Container.GetInstance(), - new NPocoUnitOfWorkProvider(Logger, Mock.Of()), + TestObjects.GetDatabaseUnitOfWorkProvider(Logger), new FileUnitOfWorkProvider(), CacheHelper, Logger, diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index a45a07db9e..1804f30a0a 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -3,13 +3,17 @@ using System.Collections.Generic; using System.Data.Common; using System.IO; using System.Linq; +using LightInject; +using Moq; using NPoco; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; +using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Persistence.UnitOfWork; using Umbraco.Core.Services; @@ -75,7 +79,6 @@ namespace Umbraco.Tests.TestHelpers /// A repository factory. /// A database unit of work provider. /// A file unit of work provider. - /// A publishing strategy. /// A cache. /// A logger. /// An event messages factory. @@ -196,5 +199,14 @@ namespace Umbraco.Tests.TestHelpers notificationService, externalLoginService); } + + public static IDatabaseUnitOfWorkProvider GetDatabaseUnitOfWorkProvider(ILogger logger) + { + var adapter = new DefaultScopeContextAdapter(); + var mappingResolver = Mock.Of(); + var databaseFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, adapter, mappingResolver); + var repositoryFactory = new RepositoryFactory(Mock.Of()); + return new NPocoUnitOfWorkProvider(databaseFactory, repositoryFactory); + } } }