U4-6147 - repositories are not disposable (in progress)

src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs

@@ -987,20 +987,5 @@ namespace Umbraco.Core.Persistence.Repositories
 
             return currentName;
         }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _contentTypeRepository.Dispose();
-            _templateRepository.Dispose();
-            _tagRepository.Dispose();
-            _contentPreviewRepository.Dispose();
-            _contentXmlRepository.Dispose();
-        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs

@@ -663,19 +663,5 @@ AND umbracoNode.id <> @id",
                 return new PreValueCollection(dictionary);
             }
         }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _contentTypeRepository.Dispose();
-            _preValRepository.Dispose();
-        }
     }
-
-
 }

src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs

@@ -246,18 +246,16 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public IDictionaryItem Get(Guid uniqueId)
         {
-            using (var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, RepositoryCache, Logger, _mappingResolver))
-            {
-                return uniqueIdRepo.Get(uniqueId);
-            }
+            // fixme - this is ugly
+            var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, RepositoryCache, Logger, _mappingResolver);
+            return uniqueIdRepo.Get(uniqueId);
         }
 
         public IDictionaryItem Get(string key)
         {
-            using (var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, RepositoryCache, Logger, _mappingResolver))
-            {
-                return keyRepo.Get(key);
-            }
+            // fixme - this is ugly
+            var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, RepositoryCache, Logger, _mappingResolver);
+            return keyRepo.Get(key);
         }
         
         private IEnumerable<IDictionaryItem> GetRootDictionaryItems()

src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepository.cs

@@ -10,9 +10,9 @@ namespace Umbraco.Core.Persistence.Repositories
 	/// Currently this interface is empty but it is useful for flagging a repository without having generic parameters, it also might
 	/// come in handy if we need to add anything to the base/non-generic repository interface.
 	/// </remarks>
-	public interface IRepository : IDisposable
+	public interface IRepository
 	{
-		
+
 	}
 
     public interface IReadRepository<in TId, out TEntity> : IRepository

src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs

@@ -620,19 +620,5 @@ namespace Umbraco.Core.Persistence.Repositories
 
             return currentName;
         }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _mediaTypeRepository.Dispose();
-            _tagRepository.Dispose();
-            _contentXmlRepository.Dispose();
-            _contentPreviewRepository.Dispose();
-        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs

@@ -736,21 +736,5 @@ namespace Umbraco.Core.Persistence.Repositories
             ((Entity)member).ResetDirtyProperties(false);
             return member;
         }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _memberTypeRepository.Dispose();
-            _tagRepository.Dispose();
-            _memberGroupRepository.Dispose();
-            _contentXmlRepository.Dispose();
-            _contentPreviewRepository.Dispose();
-        }
-
     }
 }

src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs

@@ -156,16 +156,5 @@ namespace Umbraco.Core.Persistence.Repositories
         }
 
         #endregion
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _relationTypeRepository.Dispose();
-        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Collections;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
 
@@ -12,50 +10,38 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class RepositoryBase : DisposableObject
+    internal abstract class RepositoryBase
     {
-        private readonly IUnitOfWork _work;
-        private readonly CacheHelper _cache;
-
         protected RepositoryBase(IUnitOfWork work, CacheHelper cache, ILogger logger)
         {
-            if (work == null) throw new ArgumentNullException("work");
-            if (cache == null) throw new ArgumentNullException("cache");
-            if (logger == null) throw new ArgumentNullException("logger");
+            if (work == null) throw new ArgumentNullException(nameof(work));
+            if (cache == null) throw new ArgumentNullException(nameof(cache));
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
             Logger = logger;
-            _work = work;
-            _cache = cache;
+            UnitOfWork = work;
+            RepositoryCache = cache;
         }
 
         /// <summary>
         /// Returns the Unit of Work added to the repository
         /// </summary>
-        protected internal IUnitOfWork UnitOfWork
-        {
-            get { return _work; }
-        }
+        protected internal IUnitOfWork UnitOfWork { get; }
 
-        protected CacheHelper RepositoryCache
-        {
-            get { return _cache; }
-        }
+        protected CacheHelper RepositoryCache { get; }
 
         /// <summary>
         /// The runtime cache used for this repo - by standard this is the runtime cache exposed by the CacheHelper but can be overridden
         /// </summary>
-        protected virtual IRuntimeCacheProvider RuntimeCache
-        {
-            get { return _cache.RuntimeCache; }
-        }
+        protected virtual IRuntimeCacheProvider RuntimeCache => RepositoryCache.RuntimeCache;
 
         public static string GetCacheIdKey<T>(object id)
         {
-            return string.Format("{0}{1}", GetCacheTypeKey<T>(), id);
+            return $"{GetCacheTypeKey<T>()}{id}";
         }
 
         public static string GetCacheTypeKey<T>()
         {
-            return string.Format("uRepo_{0}_", typeof(T).Name);
+            return $"uRepo_{typeof (T).Name}_";
         }
 
         protected ILogger Logger { get; private set; }
@@ -93,10 +79,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <summary>
         /// The runtime cache used for this repo by default is the isolated cache for this type
         /// </summary>
-        protected override IRuntimeCacheProvider RuntimeCache
-        {
-            get { return RepositoryCache.IsolatedRuntimeCache.GetOrCreateCache<TEntity>(); }
-        }
+        protected override IRuntimeCacheProvider RuntimeCache => RepositoryCache.IsolatedRuntimeCache.GetOrCreateCache<TEntity>();
 
         private IRepositoryCachePolicyFactory<TEntity, TId> _cachePolicyFactory;
         /// <summary>
@@ -143,10 +126,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="entity"></param>
         public virtual void Delete(TEntity entity)
         {
-            if (UnitOfWork != null)
-            {
-                UnitOfWork.RegisterRemoved(entity, this);
-            }
+            UnitOfWork?.RegisterRemoved(entity, this);
         }
 
         protected abstract TEntity PerformGet(TId id);
@@ -274,17 +254,5 @@ namespace Umbraco.Core.Persistence.Repositories
         protected abstract void PersistNewItem(TEntity item);
         protected abstract void PersistUpdatedItem(TEntity item);
         protected abstract void PersistDeletedItem(TEntity item);
-
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            UnitOfWork.DisposeIfDisposable();
-        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -421,16 +421,5 @@ namespace Umbraco.Core.Persistence.Repositories
                     return userFactory.BuildEntity(dto);
                 });
         }
-
-        /// <summary>
-        /// Dispose disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Ensure the unit of work is disposed
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            _userTypeRepository.Dispose();
-        }
     }
 }

src/Umbraco.Core/Persistence/UnitOfWorkExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence
+{
+    internal static class UnitOfWorkExtensions
+    {
+        public static IPartialViewRepository CreatePartialViewRepository(this IUnitOfWork uow, PartialViewType partialViewType)
+        {
+            switch (partialViewType)
+            {
+                case PartialViewType.PartialView:
+                    return uow.CreateRepository<IPartialViewRepository>();
+                case PartialViewType.PartialViewMacro:
+                    return uow.CreateRepository<IPartialViewMacroRepository>();
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(partialViewType));
+            }
+        }
+
+        public static IEntityContainerRepository CreateContainerRepository(this IUnitOfWork uow, Guid containerObjectType)
+        {
+            if (containerObjectType == Constants.ObjectTypes.DocumentTypeContainerGuid)
+                return uow.CreateRepository<IDocumentTypeContainerRepository>();
+            if (containerObjectType == Constants.ObjectTypes.MediaTypeContainerGuid)
+                return uow.CreateRepository<IMediaTypeContainerRepository>();
+            throw new ArgumentOutOfRangeException(nameof(containerObjectType));
+        }
+    }
+}

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -162,7 +162,7 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var repo = GetContainerRepository(uow, containerObjectType);
+                var repo = uow.CreateContainerRepository(containerObjectType);
                 repo.AddOrUpdate(container);
                 uow.Commit();
             }
@@ -174,15 +174,6 @@ namespace Umbraco.Core.Services
             return OperationStatus.Success(evtMsgs);
         }
 
-        private IEntityContainerRepository GetContainerRepository(IDatabaseUnitOfWork uow, Guid containerObjectType)
-        {
-            if (containerObjectType == Constants.ObjectTypes.DocumentTypeContainerGuid)
-                return uow.CreateRepository<IDocumentTypeContainerRepository>();
-            if (containerObjectType == Constants.ObjectTypes.MediaTypeContainerGuid)
-                return uow.CreateRepository<IMediaTypeContainerRepository>();
-            throw new ArgumentException("Object type is not supported.", nameof(containerObjectType));
-        }
-
         public EntityContainer GetContentTypeContainer(int containerId)
         {
             return GetContainer(containerId, Constants.ObjectTypes.DocumentTypeContainerGuid);
@@ -197,7 +188,7 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var repo = GetContainerRepository(uow, containerObjectType);
+                var repo = uow.CreateContainerRepository(containerObjectType);
                 var container = repo.Get(containerId);
                 return container;
             }
@@ -274,7 +265,7 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var repo = GetContainerRepository(uow, containerObjectType);
+                var repo = uow.CreateContainerRepository(containerObjectType);
                 var container = ((EntityContainerRepository)repo).Get(containerId);
                 return container;
             }

src/Umbraco.Core/Services/FileService.cs

@@ -682,9 +682,9 @@ namespace Umbraco.Core.Services
                 }
             }
 
-            var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = GetPartialViewRepository(partialViewType, uow))
+            using (var uow = _fileUowProvider.GetUnitOfWork())
             {
+                var repository = uow.CreatePartialViewRepository(partialViewType);
                 repository.AddOrUpdate(partialView);
                 uow.Commit();
 
@@ -708,9 +708,9 @@ namespace Umbraco.Core.Services
 
         private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = 0)
         {
-            var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = GetPartialViewRepository(partialViewType, uow))
-            {
+            using (var uow = _fileUowProvider.GetUnitOfWork())
+            { 
+                var repository = uow.CreatePartialViewRepository(partialViewType);
                 var partialView = repository.Get(path);
                 if (partialView == null)
                     return true;
@@ -745,9 +745,9 @@ namespace Umbraco.Core.Services
             if (SavingPartialView.IsRaisedEventCancelled(new SaveEventArgs<IPartialView>(partialView), this))
                 return Attempt<IPartialView>.Fail();
 
-            var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = GetPartialViewRepository(partialViewType, uow))
+            using (var uow = _fileUowProvider.GetUnitOfWork())
             {
+                var repository = uow.CreatePartialViewRepository(partialViewType);
                 repository.AddOrUpdate(partialView);
                 uow.Commit();
             }
@@ -796,18 +796,6 @@ namespace Umbraco.Core.Services
                 : Attempt<string>.Fail();
         }
 
-        private IPartialViewRepository GetPartialViewRepository(PartialViewType partialViewType, IUnitOfWork uow)
-        {
-            switch (partialViewType)
-            {
-                case PartialViewType.PartialView:
-                    return uow.CreateRepository<IPartialViewRepository>();
-                case PartialViewType.PartialViewMacro:
-                    return uow.CreateRepository<IPartialViewMacroRepository>();
-            }
-            throw new ArgumentOutOfRangeException("partialViewType");
-        }
-
         #endregion
 
         private void Audit(AuditType type, string message, int userId, int objectId)

src/Umbraco.Core/Umbraco.Core.csproj

@@ -382,6 +382,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Persistence\IUmbracoDatabaseConfig.cs" />
+    <Compile Include="Persistence\UnitOfWorkExtensions.cs" />
     <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
     <Compile Include="Persistence\Mappers\IMappingResolver.cs" />
     <Compile Include="Persistence\Migrations\IMigrationResolver.cs" />

src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs

@@ -16,9 +16,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Add_Audit_Entry()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
                 repo.AddOrUpdate(new AuditItem(-1, "This is a System audit trail", AuditType.System, 0));
                 unitOfWork.Commit();
             }

src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs

@@ -61,10 +61,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_Xml_Structures_With_Non_Latest_Version()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
+
                 var contentType1 = MockedContentTypes.CreateSimpleContentType("Textpage1", "Textpage1");
                 contentTypeRepository.AddOrUpdate(contentType1);
 
@@ -91,7 +92,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 for (int i = 0; i < allCreated.Count; i++)
                 {
                     allCreated[i].Name = "blah" + i;
-                    //IMPORTANT testing note here: We need to changed the published state here so that 
+                    //IMPORTANT testing note here: We need to changed the published state here so that
                     // it doesn't automatically think this is simply publishing again - this forces the latest
                     // version to be Saved and not published
                     allCreated[i].ChangePublishedState(PublishedState.Saved);
@@ -99,7 +100,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -113,10 +114,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
 
                 var contentType1 = MockedContentTypes.CreateSimpleContentType("Textpage1", "Textpage1");
                 contentTypeRepository.AddOrUpdate(contentType1);
@@ -146,7 +147,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -160,10 +161,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures_For_Content_Type()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 var contentType1 = MockedContentTypes.CreateSimpleContentType("Textpage1", "Textpage1");
                 var contentType2 = MockedContentTypes.CreateSimpleContentType("Textpage2", "Textpage2");
                 var contentType3 = MockedContentTypes.CreateSimpleContentType("Textpage3", "Textpage3");
@@ -211,7 +212,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 }
                 unitOfWork.Commit();
 
-                //delete all xml                 
+                //delete all xml
                 unitOfWork.Database.Execute("DELETE FROM cmsContentXml");
                 Assert.AreEqual(0, unitOfWork.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM cmsContentXml"));
 
@@ -226,11 +227,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 contentType.AllowedContentTypes = new List<ContentTypeSort>
                 {
@@ -260,10 +260,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 Content textpage = MockedContent.CreateSimpleContent(contentType);
 
@@ -284,11 +284,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            TemplateRepository templateRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository, out templateRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                TemplateRepository templateRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository, out templateRepository);
+
                 var template = new Template("hello", "hello");
                 templateRepository.AddOrUpdate(template);
                 unitOfWork.Commit();
@@ -316,10 +317,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 contentTypeRepository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
@@ -350,10 +351,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 Content textpage = MockedContent.CreateSimpleContent(contentType);
 
@@ -381,10 +382,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 3);
                 bool dirty = ((Content)content).IsDirty();
@@ -399,10 +400,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
                 content.Name = "About 2";
@@ -422,10 +423,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
                 content.Template = null;
@@ -444,10 +445,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 var contentType = contentTypeRepository.Get(NodeDto.NodeIdSeed);
                 var content = new Content("Textpage 2 Child Node", NodeDto.NodeIdSeed + 3, contentType);
                 content.CreatorId = 0;
@@ -473,10 +474,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 3);
 
@@ -499,10 +500,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 var result = repository.GetByQuery(query);
@@ -517,10 +518,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 var result = repository.GetAll().ToArray();
                 foreach (var content in result)
                 {
@@ -562,16 +563,16 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Name.Contains("Text"));
                 long totalRecords;
-                
+
                 try
-                {                    
+                {
                     DatabaseContext.Database.EnableSqlTrace = true;
                     DatabaseContext.Database.EnableSqlCount();
 
@@ -581,14 +582,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Assert.AreEqual(2, result.Count());
 
                     result = repository.GetPagedResultsByQuery(query, 1, 2, out totalRecords, "title", Direction.Ascending, false);
-                    
+
                     Assert.AreEqual(1, result.Count());
                 }
                 finally
-                {                
+                {
                     DatabaseContext.Database.EnableSqlTrace = false;
                     DatabaseContext.Database.DisableSqlCount();
-                }                
+                }
             }
         }
 
@@ -597,10 +598,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -629,10 +630,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -650,10 +651,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -671,10 +672,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -692,10 +693,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -713,10 +714,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Level == 2);
                 long totalRecords;
@@ -734,10 +735,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var contents = repository.GetAll(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3);
 
@@ -753,10 +754,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var contents = repository.GetAll();
 
@@ -774,10 +775,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var exists = repository.Exists(NodeDto.NodeIdSeed + 1);
 
@@ -793,10 +794,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 int level = 2;
                 var query = repository.Query.Where(x => x.Level == level);
@@ -812,10 +813,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var textpage = repository.Get(NodeDto.NodeIdSeed + 1);
                 var subpage = repository.Get(NodeDto.NodeIdSeed + 2);
@@ -833,10 +834,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
                 // Act
                 var query = repository.Query.Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
                 var content = repository.GetByQuery(query).SingleOrDefault();

src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs

@@ -76,10 +76,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
+                var repository = CreateRepository(unitOfWork);
                 var templates = new[]
                 {
                     new Template("test1", "test1"),
@@ -93,7 +93,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
 
                 var contentType = MockedContentTypes.CreateSimpleContentType();
-                contentType.AllowedTemplates = new[] {templates[0], templates[1]};
+                contentType.AllowedTemplates = new[] { templates[0], templates[1] };
                 contentType.SetDefaultTemplate(templates[0]);
                 repository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
@@ -111,10 +111,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Move()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid);
+                var repository = CreateRepository(unitOfWork);
                 var container1 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah1" };
                 containerRepository.AddOrUpdate(container1);
                 unitOfWork.Commit();
@@ -123,7 +123,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 containerRepository.AddOrUpdate(container2);
                 unitOfWork.Commit();
 
-                var contentType = (IContentType) MockedContentTypes.CreateBasicContentType("asdfasdf");
+                var contentType = (IContentType)MockedContentTypes.CreateBasicContentType("asdfasdf");
                 contentType.ParentId = container2.Id;
                 repository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
@@ -157,17 +157,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid);
+                var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
                 Assert.That(container.Id, Is.GreaterThan(0));
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNotNull(found);
             }
@@ -177,22 +174,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid);
+                var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNull(found);
             }
@@ -202,10 +194,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container_Containing_Media_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid);
+                var repository = CreateRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
@@ -223,24 +215,19 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container_Containing_Media_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            IMediaType contentType;
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid))
-            using (var repository = CreateMediaTypeRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid);
+                var repository = CreateMediaTypeRepository(unitOfWork);
+                var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
 
-                contentType = MockedContentTypes.CreateSimpleMediaType("test", "Test", propertyGroupName: "testGroup");
+                IMediaType contentType = MockedContentTypes.CreateSimpleMediaType("test", "Test", propertyGroupName: "testGroup");
                 contentType.ParentId = container.Id;
                 repository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid))
-            using (var repository = CreateMediaTypeRepository(unitOfWork))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
@@ -259,9 +246,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup");
                 repository.AddOrUpdate(contentType);
@@ -290,9 +277,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType2("test", "Test", propertyGroupName: "testGroup");
 
@@ -339,14 +326,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 contentType.Thumbnail = "Doc2.png";
-            contentType.PropertyGroups["Content"].PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext, "subtitle")
+                contentType.PropertyGroups["Content"].PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext, "subtitle")
                 {
                     Name = "Subtitle",
                     Description = "Optional Subtitle",
@@ -415,9 +402,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
@@ -478,9 +465,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = MockedContentTypes.CreateSimpleContentType();
                 repository.AddOrUpdate(contentType);
@@ -502,9 +489,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var ctMain = MockedContentTypes.CreateSimpleContentType();
                 var ctChild1 = MockedContentTypes.CreateSimpleContentType("child1", "Child 1", ctMain, true);
                 var ctChild2 = MockedContentTypes.CreateSimpleContentType("child2", "Child 2", ctChild1, true);
@@ -532,9 +519,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
                 var child1 = MockedContentTypes.CreateSimpleContentType("aabc", "aabc", contentType, randomizeAliases: true);
                 repository.AddOrUpdate(child1);
@@ -561,9 +548,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -579,9 +566,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
                 var childContentType = MockedContentTypes.CreateSimpleContentType("blah", "Blah", contentType, randomizeAliases:true);
                 repository.AddOrUpdate(childContentType);
@@ -601,9 +588,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var result = repository.Get(Guid.NewGuid());
 
@@ -617,9 +604,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var contentTypes = repository.GetAll();
@@ -639,9 +626,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var allGuidIds = repository.GetAll().Select(x => x.Key).ToArray();
 
                 // Act
@@ -662,9 +649,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(NodeDto.NodeIdSeed);
@@ -679,9 +666,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 // Act
@@ -703,9 +690,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var contentType = repository.Get(NodeDto.NodeIdSeed);
@@ -721,9 +708,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -739,9 +726,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 // Act
@@ -773,9 +760,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 var subpageContentType = MockedContentTypes.CreateSimpleContentType("umbSubpage", "Subpage");
                 var simpleSubpageContentType = MockedContentTypes.CreateSimpleContentType("umbSimpleSubpage", "Simple Subpage");
@@ -807,10 +794,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository repository;
-            using (var contentRepository = CreateRepository(unitOfWork, out repository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository repository;
+                var contentRepository = CreateRepository(unitOfWork, out repository);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
@@ -834,10 +821,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository repository;
-            using (var contentRepository = CreateRepository(unitOfWork, out repository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository repository;
+                var contentRepository = CreateRepository(unitOfWork, out repository);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
@@ -862,10 +849,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository repository;
-            using (var contentRepository = CreateRepository(unitOfWork, out repository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository repository;
+                var contentRepository = CreateRepository(unitOfWork, out repository);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
@@ -892,16 +879,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         }
 
         [Test]
-        public void
-            Can_Verify_That_A_Combination_Of_Adding_And_Deleting_PropertyTypes_Doesnt_Cause_Issues_For_Content_And_ContentType
-            ()
+        public void Can_Verify_That_A_Combination_Of_Adding_And_Deleting_PropertyTypes_Doesnt_Cause_Issues_For_Content_And_ContentType()
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository repository;
-            using (var contentRepository = CreateRepository(unitOfWork, out repository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository repository;
+                var contentRepository = CreateRepository(unitOfWork, out repository);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);

src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs

@@ -16,6 +16,7 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -82,10 +83,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Move()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
                 var container1 = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah1" };
                 containerRepository.AddOrUpdate(container1);
                 unitOfWork.Commit();
@@ -94,7 +95,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 containerRepository.AddOrUpdate(container2);
                 unitOfWork.Commit();
 
-                var dataType = (IDataTypeDefinition) new DataTypeDefinition(container2.Id, Constants.PropertyEditors.RadioButtonListAlias)
+                var dataType = (IDataTypeDefinition)new DataTypeDefinition(container2.Id, Constants.PropertyEditors.RadioButtonListAlias)
                 {
                     Name = "dt1"
                 };
@@ -129,17 +130,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
                 Assert.That(container.Id, Is.GreaterThan(0));
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNotNull(found);
             }
@@ -149,22 +147,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNull(found);
             }
@@ -174,10 +167,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container_Containing_Data_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
@@ -194,23 +187,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container_Containing_Data_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            IDataTypeDefinition dataType;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
+                var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
 
-                dataType = new DataTypeDefinition(container.Id, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
+                IDataTypeDefinition dataType = new DataTypeDefinition(container.Id, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
                 repository.AddOrUpdate(dataType);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
@@ -228,22 +216,19 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            int id;
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) {Name = "test"};
+                var repository = CreateRepository(unitOfWork);
+                IDataTypeDefinition dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) {Name = "test"};
 
                 repository.AddOrUpdate(dataTypeDefinition);
 
                 unitOfWork.Commit();
-                id = dataTypeDefinition.Id;
+                var id = dataTypeDefinition.Id;
                 Assert.That(id, Is.GreaterThan(0));
-            }
-            using (var repository = CreateRepository(unitOfWork))
-            {
+
                 // Act
-                var dataTypeDefinition = repository.Get(id);
+                dataTypeDefinition = repository.Get(id);
 
                 // Assert
                 Assert.That(dataTypeDefinition, Is.Not.Null);
@@ -257,9 +242,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 // Act
                 var dataTypeDefinition = repository.Get(-42);
 
@@ -268,7 +253,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(dataTypeDefinition.HasIdentity, Is.True);
                 Assert.That(dataTypeDefinition.Name, Is.EqualTo("Dropdown"));
             }
-
         }
 
         [Test]
@@ -276,9 +260,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var dataTypeDefinitions = repository.GetAll();
@@ -296,9 +280,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var dataTypeDefinitions = repository.GetAll(-40, -41, -42);
@@ -316,9 +300,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<IDataTypeDefinition>(SqlSyntax, MappingResolver).Where(x => x.PropertyEditorAlias == Constants.PropertyEditors.RadioButtonListAlias);
@@ -336,9 +320,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<IDataTypeDefinition>(SqlSyntax, MappingResolver).Where(x => x.Name.StartsWith("D"));
@@ -354,16 +338,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-
-            var dataTypeDefinition = new DataTypeDefinition("Test.TestEditor")
-                    {
-                        DatabaseType = DataTypeDatabaseType.Integer,
-                        Name = "AgeDataType",
-                        CreatorId = 0
-                    };
+                var repository = CreateRepository(unitOfWork);
+                var dataTypeDefinition = new DataTypeDefinition("Test.TestEditor")
+                {
+                    DatabaseType = DataTypeDatabaseType.Integer,
+                    Name = "AgeDataType",
+                    CreatorId = 0
+                };
 
                 // Act
                 repository.AddOrUpdate(dataTypeDefinition);
@@ -381,23 +364,22 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-
-            var dataTypeDefinition = new DataTypeDefinition("Test.blah")
-                    {
-                        DatabaseType = DataTypeDatabaseType.Integer,
-                        Name = "AgeDataType",
-                        CreatorId = 0
-                    };
+                var repository = CreateRepository(unitOfWork);
+                var dataTypeDefinition = new DataTypeDefinition("Test.blah")
+                {
+                    DatabaseType = DataTypeDatabaseType.Integer,
+                    Name = "AgeDataType",
+                    CreatorId = 0
+                };
                 repository.AddOrUpdate(dataTypeDefinition);
                 unitOfWork.Commit();
 
                 // Act
                 var definition = repository.Get(dataTypeDefinition.Id);
                 definition.Name = "AgeDataType Updated";
-            definition.PropertyEditorAlias = "Test.TestEditor"; //change
+                definition.PropertyEditorAlias = "Test.TestEditor"; //change
                 repository.AddOrUpdate(definition);
                 unitOfWork.Commit();
 
@@ -406,7 +388,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Assert
                 Assert.That(definitionUpdated, Is.Not.Null);
                 Assert.That(definitionUpdated.Name, Is.EqualTo("AgeDataType Updated"));
-            Assert.That(definitionUpdated.PropertyEditorAlias, Is.EqualTo("Test.TestEditor"));
+                Assert.That(definitionUpdated.PropertyEditorAlias, Is.EqualTo("Test.TestEditor"));
             }
         }
 
@@ -415,16 +397,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-
-            var dataTypeDefinition = new DataTypeDefinition("Test.TestEditor")
-                    {
-                        DatabaseType = DataTypeDatabaseType.Integer,
-                        Name = "AgeDataType",
-                        CreatorId = 0
-                    };
+                var repository = CreateRepository(unitOfWork);
+                var dataTypeDefinition = new DataTypeDefinition("Test.TestEditor")
+                {
+                    DatabaseType = DataTypeDatabaseType.Integer,
+                    Name = "AgeDataType",
+                    CreatorId = 0
+                };
 
                 // Act
                 repository.AddOrUpdate(dataTypeDefinition);
@@ -447,9 +428,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(1034); //Content picker
@@ -465,22 +446,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Pre_Value_Collection()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            int dtid;
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
                 repository.AddOrUpdate(dataTypeDefinition);
                 unitOfWork.Commit();
-                dtid = dataTypeDefinition.Id;
-            }
+                var dtid = dataTypeDefinition.Id;
 
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtid, SortOrder = 0, Value = "test1"});
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtid, SortOrder = 1, Value = "test2" });
+                unitOfWork.Database.Insert(new DataTypePreValueDto { DataTypeNodeId = dtid, SortOrder = 0, Value = "test1"});
+                unitOfWork.Database.Insert(new DataTypePreValueDto { DataTypeNodeId = dtid, SortOrder = 1, Value = "test2" });
 
-            using (var repository = CreateRepository(unitOfWork))
-            {
                 var collection = repository.GetPreValuesCollectionByDataTypeId(dtid);
                 Assert.AreEqual(2, collection.PreValuesAsArray.Count());
             }
@@ -490,22 +466,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Pre_Value_As_String()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            int dtid;
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
                 repository.AddOrUpdate(dataTypeDefinition);
                 unitOfWork.Commit();
-                dtid = dataTypeDefinition.Id;
-            }
+                var dtid = dataTypeDefinition.Id;
 
-            var id = DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtid, SortOrder = 0, Value = "test1" });
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtid, SortOrder = 1, Value = "test2" });
+                var id = unitOfWork.Database.Insert(new DataTypePreValueDto { DataTypeNodeId = dtid, SortOrder = 0, Value = "test1" });
+                unitOfWork.Database.Insert(new DataTypePreValueDto { DataTypeNodeId = dtid, SortOrder = 1, Value = "test2" });
 
-            using (var repository = CreateRepository(unitOfWork))
-            {
                 var val = repository.GetPreValueAsString(Convert.ToInt32(id));
                 Assert.AreEqual("test1", val);
             }
@@ -515,22 +486,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Pre_Value_Collection_With_Cache()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             DataTypeDefinition dtd;
-            using (var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
+                var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork);
+                    dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
                 repository.AddOrUpdate(dtd);
                 unitOfWork.Commit();
-            }
 
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 1, Value = "test2" });
+                unitOfWork.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
+                unitOfWork.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 1, Value = "test2" });
 
-            //this will cache the result
-            using (var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork))
-            {
+                //this will cache the result
                 var collection = repository.GetPreValuesCollectionByDataTypeId(dtd.Id);
             }
 
@@ -549,22 +516,19 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Pre_Value_As_String_With_Cache()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             DataTypeDefinition dtd;
-            using (var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork))
+            object id;
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork);
                 dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
                 repository.AddOrUpdate(dtd);
                 unitOfWork.Commit();
-            }
 
-            var id = DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
-            DatabaseContext.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 1, Value = "test2" });
+                id = unitOfWork.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
+                unitOfWork.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 1, Value = "test2" });
 
-            //this will cache the result
-            using (var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork))
-            {
+                //this will cache the result
                 var val = repository.GetPreValueAsString(Convert.ToInt32(id));
             }
 
@@ -578,8 +542,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             Assert.AreEqual(1, cached.Count());
             Assert.AreEqual(2, cached.Single().FormatAsDictionary().Count);
 
-            using (var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = Container.GetInstance<IDatabaseUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork);
                 //ensure it still gets resolved!
                 var val = repository.GetPreValueAsString(Convert.ToInt32(id));
                 Assert.AreEqual("test1", val);

src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs

@@ -37,10 +37,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
                 {
                     Translations = new List<IDictionaryTranslation>
@@ -70,10 +69,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
                 {
                     Translations = new List<IDictionaryTranslation>
@@ -103,10 +101,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
                 {
                     Translations = new List<IDictionaryTranslation>
@@ -137,10 +134,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
                 var dictionaryItem = (IDictionaryItem) new DictionaryItem("Testing1235");                
 
                 repository.AddOrUpdate(dictionaryItem);
@@ -164,9 +160,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var dictionaryItem = repository.Get(1);
@@ -185,9 +181,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var dictionaryItems = repository.GetAll(1, 2);
@@ -205,9 +201,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<IDictionaryItem>(SqlSyntax, MappingResolver).Where(x => x.ItemKey == "Article");
@@ -225,9 +221,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<IDictionaryItem>(SqlSyntax, MappingResolver).Where(x => x.ItemKey.StartsWith("Read"));
@@ -243,10 +239,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var languageRepository = Container.GetInstance<IDatabaseUnitOfWork, ILanguageRepository>(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var languageRepository = Container.GetInstance<IDatabaseUnitOfWork, ILanguageRepository>(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
 
                 var language = languageRepository.Get(1);
 
@@ -274,9 +270,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var item = repository.Get(1);
@@ -329,9 +325,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var item = repository.Get(1);
@@ -350,9 +346,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(1);

src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs

@@ -31,14 +31,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         private int CreateTestData(string isoName, out ContentType ct)
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = new Language(isoName);
                 langRepo.AddOrUpdate(lang);
 
@@ -54,18 +54,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Create_And_Get_By_Id()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -89,18 +89,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Create_And_Get_By_Id_Empty_lang()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var content = contentRepo.Get(contentId);
 
                 var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id };
@@ -122,18 +122,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Cant_Create_Duplicate_Domain_Name()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -145,28 +145,24 @@ namespace Umbraco.Tests.Persistence.Repositories
                 repo.AddOrUpdate(domain2);
 
                 Assert.Throws<DuplicateNameException>(unitOfWork.Commit);
-
-
             }
-
-
         }
 
         [Test]
         public void Can_Delete()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -183,25 +179,23 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 Assert.IsNull(domain);                
             }
-
-
         }
 
         [Test]
         public void Can_Update()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId1 = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var content1 = contentRepo.Get(contentId1);
 
                 //more test data
@@ -234,26 +228,24 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual(lang2.Id, domain.LanguageId);
                 Assert.AreEqual(lang2.IsoCode, domain.LanguageIsoCode);
             }
-
-
         }
 
 
         [Test]
         public void Exists()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -273,18 +265,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_By_Name()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -304,18 +296,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_All()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -335,18 +327,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_All_Ids()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -368,18 +360,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_All_Without_Wildcards()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var lang = langRepo.GetByIsoCode("en-AU");
                 var content = contentRepo.Get(contentId);
 
@@ -403,18 +395,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_All_For_Content()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var contentItems = new List<IContent>();
 
                 var lang = langRepo.GetByIsoCode("en-AU");
@@ -454,18 +446,18 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_All_For_Content_Without_Wildcards()
         {
-            var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
             ContentType ct;
             var contentId = CreateTestData("en-AU", out ct);
 
-            ContentRepository contentRepo;
-            LanguageRepository langRepo;
-            ContentTypeRepository contentTypeRepo;
-
-            using (var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentRepository contentRepo;
+                LanguageRepository langRepo;
+                ContentTypeRepository contentTypeRepo;
+
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+
                 var contentItems = new List<IContent>();
 
                 var lang = langRepo.GetByIsoCode("en-AU");
@@ -496,9 +488,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var all2 = repo.GetAssignedDomains(contentItems[1].Id, false);
                 Assert.AreEqual(0, all2.Count());
-
             }
         }
-
     }
 }

src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs

@@ -38,10 +38,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            unitOfWork.Database.EnableSqlTrace = true;
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                unitOfWork.Database.EnableSqlTrace = true;
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var language = repository.Get(1);
 
@@ -57,9 +58,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Get_By_Iso_Code_On_LanguageRepository()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var au = CultureInfo.GetCultureInfo("en-AU");
                 var language = (ILanguage)new Language(au.Name)
                 {
@@ -83,9 +85,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Get_By_Culture_Name_On_LanguageRepository()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var au = CultureInfo.GetCultureInfo("en-AU");
                 var language = (ILanguage)new Language(au.Name)
                 {
@@ -110,9 +113,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var language = repository.Get(0);
 
@@ -126,9 +130,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var languages = repository.GetAll();
@@ -146,9 +150,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         { 
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var languages = repository.GetAll(1, 2);
@@ -166,9 +170,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<ILanguage>(SqlSyntax, MappingResolver).Where(x => x.IsoCode == "da-DK");
@@ -186,9 +190,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<ILanguage>(SqlSyntax, MappingResolver).Where(x => x.IsoCode.StartsWith("D"));
@@ -204,9 +208,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var languageBR = new Language("pt-BR") {CultureName = "pt-BR"};
@@ -224,9 +228,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var language = repository.Get(5);
@@ -250,9 +254,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var language = repository.Get(3);
@@ -271,9 +275,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(3);

src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs

@@ -31,11 +31,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = new Macro("test1", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
                 repository.AddOrUpdate(macro);
 
@@ -49,11 +48,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = repository.Get(1);
                 macro.Alias = "test2";
                 repository.AddOrUpdate(macro);
@@ -67,11 +65,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Assert
                 Assert.That(repository, Is.Not.Null);
             }
@@ -82,9 +79,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var macro = repository.Get(1);
 
@@ -112,9 +110,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var macros = repository.GetAll();
 
@@ -129,9 +128,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var query = new Query<IMacro>(SqlSyntax, MappingResolver).Where(x => x.Alias.ToUpper() == "TEST1");
                 var result = repository.GetByQuery(query);
@@ -146,9 +146,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var query = new Query<IMacro>(SqlSyntax, MappingResolver).Where(x => x.Name.StartsWith("Test"));
                 int count = repository.Count(query);
@@ -163,9 +164,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var macro = new Macro("test", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
                 macro.Properties.Add(new MacroProperty("test", "Test", 0, "test"));
@@ -174,7 +176,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Assert
                 Assert.That(macro.HasIdentity, Is.True);
-                Assert.That(macro.Id, Is.EqualTo(4));//With 3 existing entries the Id should be 4   
+                Assert.That(macro.Id, Is.EqualTo(4));//With 3 existing entries the Id should be 4
                 Assert.Greater(macro.Properties.Single().Id, 0);
             }
         }
@@ -184,9 +186,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var macro = repository.Get(2);
                 macro.Name = "Hello";
@@ -225,9 +228,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var macro = repository.Get(3);
                 Assert.IsNotNull(macro);
@@ -246,9 +250,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 // Act
                 var exists = repository.Exists(3);
                 var doesntExist = repository.Exists(10);
@@ -264,12 +269,13 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
-                
+
                 repository.AddOrUpdate(macro);
 
                 unitOfWork.Commit();
@@ -282,8 +288,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual("new1", result.Properties.First().Alias);
                 Assert.AreEqual("New1", result.Properties.First().Name);
                 Assert.AreEqual(3, result.Properties.First().SortOrder);
-                
-            }            
+
+            }
         }
 
         [Test]
@@ -291,9 +297,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
 
@@ -316,9 +323,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
                 repository.AddOrUpdate(macro);
@@ -332,7 +340,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Assert
                 result = repository.Get(macro.Id);
                 Assert.AreEqual(0, result.Properties.Count());
-                
+
             }
         }
 
@@ -341,9 +349,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 var prop1 = new MacroProperty("blah1", "New1", 4, "test.editor");
                 var prop2 = new MacroProperty("blah2", "New2", 3, "test.editor");
@@ -354,13 +363,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 macro.Properties.Remove(prop1);
                 macro.Properties.Remove("blah2");
                 macro.Properties.Add(prop2);
-                
+
                 repository.AddOrUpdate(macro);
                 unitOfWork.Commit();
 
                 // Assert
                 var result = repository.Get(macro.Id);
-                
+
                 Assert.AreEqual(1, result.Properties.Count());
                 Assert.AreEqual("blah2", result.Properties.Single().Alias);
 
@@ -372,15 +381,16 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
                 repository.AddOrUpdate(macro);
                 unitOfWork.Commit();
 
-                //Act 
+                //Act
                 macro = repository.Get(1);
                 macro.Properties["new1"].Name = "this is a new name";
                 repository.AddOrUpdate(macro);
@@ -388,7 +398,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
 
                 // Assert
-                var result = repository.Get(1);                
+                var result = repository.Get(1);
                 Assert.AreEqual("new1", result.Properties.First().Alias);
                 Assert.AreEqual("this is a new name", result.Properties.First().Name);
 
@@ -400,20 +410,21 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
                 repository.AddOrUpdate(macro);
                 unitOfWork.Commit();
 
-                //Act 
+                //Act
                 macro = repository.Get(1);
                 macro.Properties.UpdateProperty("new1", newAlias: "newAlias");
                 repository.AddOrUpdate(macro);
                 unitOfWork.Commit();
-                
+
                 // Assert
                 var result = repository.Get(1);
                 Assert.AreEqual("newAlias", result.Properties.First().Alias);
@@ -430,8 +441,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
                 repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
                 repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));

src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs

@@ -45,10 +45,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 var mediaType = mediaTypeRepository.Get(1032);
 
@@ -73,10 +73,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures_For_Content_Type()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 var imageMediaType = mediaTypeRepository.Get(1032);
                 var fileMediaType = mediaTypeRepository.Get(1033);
@@ -114,10 +114,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 var mediaType = mediaTypeRepository.Get(1032);
                 var image = MockedMedia.CreateMediaImage(mediaType, -1);
@@ -138,10 +138,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 var mediaType = mediaTypeRepository.Get(1032);
                 var file = MockedMedia.CreateMediaFile(mediaType, -1);
@@ -169,10 +169,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 var mediaType = mediaTypeRepository.Get(1032);
                 var file = MockedMedia.CreateMediaFile(mediaType, -1);
@@ -200,10 +200,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var media = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -219,10 +219,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
@@ -243,10 +243,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var media = repository.Get(NodeDto.NodeIdSeed + 2);
@@ -267,10 +267,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var media = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -294,10 +294,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 var result = repository.GetByQuery(query);
@@ -312,10 +313,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -333,10 +335,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -354,10 +357,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -375,10 +379,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -396,10 +401,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -417,10 +423,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -438,10 +445,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
+
                 // Act
                 var query = new Query<IMedia>(SqlSyntax, MappingResolver).Where(x => x.Level == 2);
                 long totalRecords;
@@ -459,10 +467,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var medias = repository.GetAll(NodeDto.NodeIdSeed + 1, NodeDto.NodeIdSeed + 2);
@@ -479,10 +487,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var medias = repository.GetAll();
@@ -499,10 +507,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 var exists = repository.Exists(NodeDto.NodeIdSeed + 1);
@@ -521,10 +529,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MediaTypeRepository mediaTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MediaTypeRepository mediaTypeRepository;
+                var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
                 int level = 2;

src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs

@@ -41,10 +41,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Move()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
+
                 var container1 = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah1" };
                 containerRepository.AddOrUpdate(container1);
                 unitOfWork.Commit();
@@ -87,17 +88,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+
+                var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
                 Assert.That(container.Id, Is.GreaterThan(0));
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNotNull(found);
             }
@@ -107,23 +106,19 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+
+                var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
                 Assert.That(container.Id, Is.GreaterThan(0));
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            {
+
                 var found = containerRepository.Get(container.Id);
                 Assert.IsNull(found);
             }
@@ -133,10 +128,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Create_Container_Containing_Media_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
+
                 var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
@@ -154,24 +150,20 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete_Container_Containing_Media_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            EntityContainer container;
-            IMediaType contentType;
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
+                var containerRepository = CreateContainerRepository(unitOfWork);
+                var repository = CreateRepository(unitOfWork);
+
+                var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" };
                 containerRepository.AddOrUpdate(container);
                 unitOfWork.Commit();
 
-                contentType = MockedContentTypes.CreateVideoMediaType();
+                IMediaType contentType = MockedContentTypes.CreateVideoMediaType();
                 contentType.ParentId = container.Id;
                 repository.AddOrUpdate(contentType);
                 unitOfWork.Commit();
-            }
-            using (var containerRepository = CreateContainerRepository(unitOfWork))
-            using (var repository = CreateRepository(unitOfWork))
-            {
+
                 // Act
                 containerRepository.Delete(container);
                 unitOfWork.Commit();
@@ -190,9 +182,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var contentType = MockedContentTypes.CreateVideoMediaType();
                 repository.AddOrUpdate(contentType);
@@ -213,9 +206,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var videoMediaType = MockedContentTypes.CreateVideoMediaType();
                 repository.AddOrUpdate(videoMediaType);
                 unitOfWork.Commit();
@@ -250,9 +244,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
@@ -275,9 +269,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var mediaType = repository.Get(1033); //File
@@ -294,9 +288,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var mediaType = repository.Get(1033); //File
 
                 // Act
@@ -314,9 +309,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var mediaTypes = repository.GetAll();
                 int count =
@@ -335,9 +331,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var allGuidIds = repository.GetAll().Select(x => x.Key).ToArray();
 
                 // Act
@@ -360,9 +357,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(1032); //Image
@@ -377,9 +374,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
                 repository.AddOrUpdate(mediaType);
                 unitOfWork.Commit();
@@ -404,9 +402,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
                 repository.AddOrUpdate(mediaType);
                 unitOfWork.Commit();
@@ -425,9 +424,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var contentType = repository.Get(1033); //File

src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs

@@ -48,11 +48,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var memberType1 = CreateTestMemberType();
 
                 for (var i = 0; i < 100; i++)
@@ -76,11 +77,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Rebuild_All_Xml_Structures_For_Content_Type()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
 
                 var memberType1 = CreateTestMemberType("mt1");
                 var memberType2 = CreateTestMemberType("mt2");
@@ -119,11 +120,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void MemberRepository_Can_Get_Member_By_Id()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var member = CreateTestMember();
 
                 member = repository.Get(member.Id);
@@ -137,11 +139,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Members_By_Ids()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var type = CreateTestMemberType();
                 var m1 = CreateTestMember(type, "Test 1", "test1@test.com", "pass1", "test1");
                 var m2 = CreateTestMember(type, "Test 2", "test2@test.com", "pass2", "test2");
@@ -159,11 +162,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void MemberRepository_Can_Get_All_Members()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var type = CreateTestMemberType();
                 for (var i = 0; i < 5; i++)
                 {
@@ -184,11 +188,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var key = Guid.NewGuid();
                 var member = CreateTestMember(key: key);
 
@@ -206,11 +211,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Persist_Member()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var member = CreateTestMember();
 
                 var sut = repository.Get(member.Id);
@@ -229,11 +235,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void New_Member_Has_Built_In_Properties_By_Default()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberTypeRepository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -263,11 +270,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             IMember sut;
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberTypeRepository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -292,11 +300,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             IMember sut;
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberTypeRepository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -339,11 +348,12 @@ 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 = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 if (memberType == null)
                 {
                     memberType = MockedContentTypes.CreateSimpleMemberType();
@@ -362,11 +372,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         private IMemberType CreateTestMemberType(string alias = null)
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            MemberTypeRepository memberTypeRepository;
-            MemberGroupRepository memberGroupRepository;
-            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                MemberTypeRepository memberTypeRepository;
+                MemberGroupRepository memberGroupRepository;
+                var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType(alias);
                 memberTypeRepository.AddOrUpdate(memberType);
                 unitOfWork.Commit();

src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs

@@ -39,9 +39,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Persist_Member_Type()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -63,9 +64,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Cannot_Persist_Member_Type_Without_Alias()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberType.Alias = null;
                 repository.AddOrUpdate(memberType);
@@ -78,9 +80,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_All_Member_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType1);
                 unitOfWork.Commit();
@@ -102,9 +105,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_All_Member_Types_By_Guid_Ids()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType1);
                 unitOfWork.Commit();
@@ -126,9 +130,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Member_Types_By_Guid_Id()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType1);
                 unitOfWork.Commit();
@@ -153,9 +158,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_All_Members_When_No_Properties_Assigned()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 memberType1.PropertyTypeCollection.Clear();
                 repository.AddOrUpdate(memberType1);
@@ -180,9 +186,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Member_Type_By_Id()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -195,9 +202,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Member_Type_By_Guid_Id()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -210,9 +218,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Built_In_Member_Type_Properties_Are_Automatically_Added_When_Creating()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType);
                 unitOfWork.Commit();
@@ -230,9 +239,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Built_In_Member_Type_Properties_Are_Not_Reused_For_Different_Member_Types()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 IMemberType memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 IMemberType memberType2 = MockedContentTypes.CreateSimpleMemberType("test2");
                 repository.AddOrUpdate(memberType1);
@@ -251,9 +261,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
                 repository.AddOrUpdate(memberType);

src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs

@@ -26,9 +26,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
 
                 var entry = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
@@ -55,10 +55,11 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            unitOfWork.Database.EnableSqlTrace = true;
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                unitOfWork.Database.EnableSqlTrace = true;
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -94,10 +95,11 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            unitOfWork.Database.EnableSqlTrace = true;
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                unitOfWork.Database.EnableSqlTrace = true;
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -139,9 +141,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -176,9 +179,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -203,9 +207,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
-            {                
+            using (var unitOfWork = provider.GetUnitOfWork())
+            {
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry1 = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -240,9 +245,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             var content = CreateTestData(3).ToArray();
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var entry1 = new PublicAccessEntry(content[0], content[1], content[2], new[]
                 {
                     new PublicAccessRule
@@ -283,10 +289,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         private IEnumerable<IContent> CreateTestData(int count)
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            ContentTypeRepository ctRepo;
-            using (var repo = CreateRepository(unitOfWork, out ctRepo))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository ctRepo;
+                var repo = CreateRepository(unitOfWork, out ctRepo);
+
                 var ct = MockedContentTypes.CreateBasicContentType("testing");
                 ctRepo.AddOrUpdate(ct);
                 unitOfWork.Commit();

src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs

@@ -40,10 +40,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relationType = repositoryType.Get(1);
@@ -62,10 +62,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relation = repository.Get(1);
@@ -87,10 +87,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relation = repository.Get(2);
@@ -109,10 +109,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relation = repository.Get(1);
@@ -131,10 +131,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relations = repository.GetAll();
@@ -152,10 +152,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var relations = repository.GetAll(1, 2);
@@ -173,10 +173,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var exists = repository.Exists(2);
@@ -193,10 +193,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
                 var query = new Query<IRelation>(SqlSyntax, MappingResolver).Where(x => x.ParentId == NodeDto.NodeIdSeed + 1);
@@ -212,11 +212,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
-                
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
+
                 // Act
                 var query = new Query<IRelation>(SqlSyntax, MappingResolver).Where(x => x.RelationTypeId == RelationTypeDto.NodeIdSeed);
                 var relations = repository.GetByQuery(query);
@@ -234,10 +234,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            RelationTypeRepository repositoryType;
-            using (var repository = CreateRepository(unitOfWork, out repositoryType))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                RelationTypeRepository repositoryType;
+                var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 var content = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 2);
                 ServiceContext.ContentService.Delete(content, 0);
@@ -264,35 +264,37 @@ namespace Umbraco.Tests.Persistence.Repositories
             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 = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
-            var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), relationTypeRepository, MappingResolver);
+            using (var unitOfWork = provider.GetUnitOfWork())
+            {
+                var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+                var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), relationTypeRepository, MappingResolver);
 
-            relationTypeRepository.AddOrUpdate(relateContent);
-            relationTypeRepository.AddOrUpdate(relateContentType);
-            unitOfWork.Commit();
+                relationTypeRepository.AddOrUpdate(relateContent);
+                relationTypeRepository.AddOrUpdate(relateContentType);
+                unitOfWork.Commit();
 
-            //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
-            ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
-            ServiceContext.ContentTypeService.Save(contentType);
+                //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
+                ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
+                ServiceContext.ContentTypeService.Save(contentType);
 
-            //Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
-            Content textpage = MockedContent.CreateSimpleContent(contentType);
-            ServiceContext.ContentService.Save(textpage, 0);
+                //Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
+                Content textpage = MockedContent.CreateSimpleContent(contentType);
+                ServiceContext.ContentService.Save(textpage, 0);
 
-            //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
-            Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
-            ServiceContext.ContentService.Save(subpage, 0);
+                //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
+                Content subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
+                ServiceContext.ContentService.Save(subpage, 0);
 
-            //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
-            Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id);
-            ServiceContext.ContentService.Save(subpage2, 0);
+                //Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
+                Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id);
+                ServiceContext.ContentService.Save(subpage2, 0);
 
-            var relation = new Relation(textpage.Id, subpage.Id, relateContent) { Comment = string.Empty };
-            var relation2 = new Relation(textpage.Id, subpage2.Id, relateContent) { Comment = string.Empty };
-            relationRepository.AddOrUpdate(relation);
-            relationRepository.AddOrUpdate(relation2);
-            unitOfWork.Commit();
+                var relation = new Relation(textpage.Id, subpage.Id, relateContent) { Comment = string.Empty };
+                var relation2 = new Relation(textpage.Id, subpage2.Id, relateContent) { Comment = string.Empty };
+                relationRepository.AddOrUpdate(relation);
+                relationRepository.AddOrUpdate(relation2);
+                unitOfWork.Commit();
+            }
         }
     }
 }

src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs

@@ -38,14 +38,14 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relateMemberToContent = new RelationType(new Guid(Constants.ObjectTypes.Member),
-                                                             new Guid(Constants.ObjectTypes.Document),
-                                                             "relateMemberToContent") { IsBidirectional = true, Name = "Relate Member to Content" };
+                                                            new Guid(Constants.ObjectTypes.Document),
+                                                            "relateMemberToContent") { IsBidirectional = true, Name = "Relate Member to Content" };
 
                 repository.AddOrUpdate(relateMemberToContent);
                 unitOfWork.Commit();
@@ -61,9 +61,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relationType = repository.Get(3);
@@ -87,9 +87,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relationType = repository.Get(3);
@@ -108,9 +108,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relationType = repository.Get(RelationTypeDto.NodeIdSeed);
@@ -128,9 +128,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relationTypes = repository.GetAll();
@@ -148,9 +148,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var relationTypes = repository.GetAll(2, 3);
@@ -168,9 +168,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var exists = repository.Exists(3);
@@ -187,9 +187,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var query = new Query<IRelationType>(SqlSyntax, MappingResolver).Where(x => x.Alias.StartsWith("relate"));
@@ -205,9 +205,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Act
                 var childObjType = new Guid(Constants.ObjectTypes.DocumentType);
@@ -234,12 +234,14 @@ namespace Umbraco.Tests.Persistence.Repositories
             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 = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+            using (var unitOfWork = provider.GetUnitOfWork())
+            {
+                var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
 
-            repository.AddOrUpdate(relateContent);//Id 2
-            repository.AddOrUpdate(relateContentType);//Id 3
-            unitOfWork.Commit();
+                repository.AddOrUpdate(relateContent);//Id 2
+                repository.AddOrUpdate(relateContentType);//Id 3
+                unitOfWork.Commit();
+            }
         }
     }
 }

src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs

@@ -40,11 +40,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var server = new ServerRegistration("http://shazwazza.com", "COMPUTER1", DateTime.Now);
                 repository.AddOrUpdate(server);
 
@@ -58,11 +57,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var server = repository.Get(1);
                 server.ServerIdentity = "COMPUTER2";
                 repository.AddOrUpdate(server);
@@ -76,11 +74,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Assert
                 Assert.That(repository, Is.Not.Null);
             }
@@ -91,9 +88,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var server = repository.Get(1);
 
@@ -111,9 +109,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var servers = repository.GetAll();
 
@@ -130,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         //{
         //    // Arrange
         //    var provider = new NPocoUnitOfWorkProvider(Logger);
-        //    var unitOfWork = provider.GetUnitOfWork();
+        //    using (var unitOfWork = provider.GetUnitOfWork())
         //    using (var repository = CreateRepository(unitOfWork))
         //    {
         //        // Act
@@ -147,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         //{
         //    // Arrange
         //    var provider = new NPocoUnitOfWorkProvider(Logger);
-        //    var unitOfWork = provider.GetUnitOfWork();
+        //    using (var unitOfWork = provider.GetUnitOfWork())
         //    using (var repository = CreateRepository(unitOfWork))
         //    {
         //        // Act
@@ -164,9 +163,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var server = new ServerRegistration("http://shazwazza.com", "COMPUTER4", DateTime.Now);
                 repository.AddOrUpdate(server);
@@ -183,9 +183,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var server = repository.Get(2);
                 server.ServerAddress = "https://umbraco.com";
@@ -208,9 +209,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var server = repository.Get(3);
                 Assert.IsNotNull(server);
@@ -229,9 +231,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var exists = repository.Exists(3);
                 var doesntExist = repository.Exists(10);
@@ -252,8 +255,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = CreateRepository(unitOfWork))
             {
+                var repository = CreateRepository(unitOfWork);
+
                 repository.AddOrUpdate(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
                 repository.AddOrUpdate(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
                 repository.AddOrUpdate(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now));

src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs

@@ -16,10 +16,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Delete()
         {
-             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            var provider = new NPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var created = DateTime.Now;
                 var task = new Task(new TaskType("asdfasdf"))
                 {
@@ -44,9 +45,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Add()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var created = DateTime.Now;
                 repo.AddOrUpdate(new Task(new TaskType("asdfasdf"))
                 {
@@ -76,9 +78,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Update()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var task = new Task(new TaskType("asdfasdf"))
                 {
                     AssigneeUserId = 0,
@@ -112,9 +115,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Get_By_Id()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var task = new Task(new TaskType("asdfasdf"))
                 {
                     AssigneeUserId = 0,
@@ -140,9 +144,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             CreateTestData(false, 20);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var found = repo.GetAll().ToArray();
                 Assert.AreEqual(20, found.Count());
             }
@@ -155,9 +160,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             CreateTestData(true, 5);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var found = repo.GetTasks(includeClosed: true).ToArray();
                 Assert.AreEqual(15, found.Count());
             }
@@ -170,9 +176,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             CreateTestData(false, 5, -21);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var found = repo.GetTasks(itemId:-20).ToArray();
                 Assert.AreEqual(10, found.Count());
             }
@@ -185,9 +192,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             CreateTestData(true, 5);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var found = repo.GetTasks(includeClosed: false);
                 Assert.AreEqual(10, found.Count());
             }
@@ -196,9 +204,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         private void CreateTestData(bool closed, int count, int entityId = -1)
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 for (int i = 0; i < count; i++)
                 {
                     repo.AddOrUpdate(new Task(new TaskType("asdfasdf"))

src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs

@@ -16,11 +16,12 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Delete()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            var taskType = new TaskType("asdfasdf");
-            using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
-            using (var taskTypeRepo = new TaskTypeRepository(unitOfWork, CacheHelper, Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var taskType = new TaskType("asdfasdf");
+                var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+                var taskTypeRepo = new TaskTypeRepository(unitOfWork, CacheHelper, Logger, MappingResolver);
+
                 var created = DateTime.Now;
                 var task = new Task(taskType)
                 {

src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs

@@ -48,11 +48,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            // Act
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 // Assert
                 Assert.That(repository, Is.Not.Null);
@@ -65,9 +63,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -88,9 +87,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork, Mock.Of<ITemplatesSection>(x => x.DefaultRenderingEngine == RenderingEngine.WebForms)))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork, Mock.Of<ITemplatesSection>(x => x.DefaultRenderingEngine == RenderingEngine.WebForms));
+
                 // Act
                 var template = new Template("test", "test");
                 repository.AddOrUpdate(template);
@@ -114,9 +114,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork, Mock.Of<ITemplatesSection>(x => x.DefaultRenderingEngine == RenderingEngine.WebForms)))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork, Mock.Of<ITemplatesSection>(x => x.DefaultRenderingEngine == RenderingEngine.WebForms));
+
                 //NOTE: This has to be persisted first
                 var template = new Template("test", "test");
                 repository.AddOrUpdate(template);
@@ -143,9 +144,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test");
                 repository.AddOrUpdate(template);
@@ -163,9 +165,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -189,9 +192,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 //NOTE: This has to be persisted first
                 var template = new Template("test", "test");
                 repository.AddOrUpdate(template);
@@ -217,9 +221,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -246,9 +251,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -281,9 +287,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -311,9 +318,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 // Act
                 var template = new Template("test", "test")
                 {
@@ -332,8 +340,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(_viewsFileSystem.FileExists("test.cshtml"), Is.True);
                 Assert.That(updated.Content, Is.EqualTo(ViewHelper.GetDefaultFileContent() + "<html></html>"));
             }
-
-
         }
 
         [Test]
@@ -341,9 +347,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var template = new Template("test", "test")
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
@@ -361,8 +368,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.IsNull(repository.Get("test"));
                 Assert.That(_masterPageFileSystem.FileExists("test.master"), Is.False);
             }
-
-
         }
 
         [Test]
@@ -370,9 +375,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var template = new Template("test", "test")
                 {
                     Content = ViewHelper.GetDefaultFileContent()
@@ -390,8 +396,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.IsNull(repository.Get("test"));
                 Assert.That(_viewsFileSystem.FileExists("test.cshtml"), Is.False);
             }
-
-
         }
 
         [Test]
@@ -399,44 +403,40 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var templateRepository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var templateRepository = CreateRepository(unitOfWork);
+
                 var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver);
                 var contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, templateRepository, MappingResolver);
                 var contentRepo = new ContentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
 
-                using (contentRepo)
+                var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
+                var textpage = MockedContent.CreateSimpleContent(contentType);
+                contentTypeRepository.AddOrUpdate(contentType);
+                contentRepo.AddOrUpdate(textpage);
+                unitOfWork.Commit();
+
+
+                var template = new Template("test", "test")
                 {
-                    var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
-                    var textpage = MockedContent.CreateSimpleContent(contentType);
-                    contentTypeRepository.AddOrUpdate(contentType);
-                    contentRepo.AddOrUpdate(textpage);
-                    unitOfWork.Commit();
+                    Content = @"<%@ Master Language=""C#"" %>"
+                };
+                templateRepository.AddOrUpdate(template);
+                unitOfWork.Commit();
 
+                textpage.Template = template;
+                contentRepo.AddOrUpdate(textpage);
+                unitOfWork.Commit();
 
-                    var template = new Template("test", "test")
-                    {
-                        Content = @"<%@ Master Language=""C#"" %>"
-                    };
-                    templateRepository.AddOrUpdate(template);
-                    unitOfWork.Commit();
+                // Act
+                var templates = templateRepository.Get("test");
+                templateRepository.Delete(templates);
+                unitOfWork.Commit();
 
-                    textpage.Template = template;
-                    contentRepo.AddOrUpdate(textpage);
-                    unitOfWork.Commit();
-
-                    // Act
-                    var templates = templateRepository.Get("test");
-                    templateRepository.Delete(templates);
-                    unitOfWork.Commit();
-
-                    // Assert
-                    Assert.IsNull(templateRepository.Get("test"));
-                }
+                // Assert
+                Assert.IsNull(templateRepository.Get("test"));
             }
-
         }
 
         [Test]
@@ -444,9 +444,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var parent = new Template("parent", "parent")
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
@@ -476,8 +477,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Assert
                 Assert.IsNull(repository.Get("test"));
             }
-
-
         }
 
         [Test]
@@ -485,9 +484,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 CreateHierarchy(repository, unitOfWork);
 
                 // Act
@@ -511,9 +511,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var created = CreateHierarchy(repository, unitOfWork).ToArray();
 
                 // Act
@@ -538,9 +539,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var created = CreateHierarchy(repository, unitOfWork).ToArray();
 
                 // Act
@@ -553,7 +555,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual(2, childrenById.DistinctBy(x => x.Id).Count());
                 Assert.AreEqual(2, childrenByAlias.Count());
                 Assert.AreEqual(2, childrenByAlias.DistinctBy(x => x.Id).Count());
-
             }
         }
 
@@ -562,9 +563,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 CreateHierarchy(repository, unitOfWork).ToArray();
 
                 // Act
@@ -574,7 +576,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Assert
                 Assert.AreEqual(1, children.Count());
                 Assert.AreEqual(1, children.DistinctBy(x => x.Id).Count());
-
             }
         }
 
@@ -583,9 +584,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var created = CreateHierarchy(repository, unitOfWork).ToArray();
 
                 // Act
@@ -607,9 +609,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var parent = new Template("parent", "parent");
                 var child1 = new Template("child1", "child1");
                 var toddler1 = new Template("toddler1", "toddler1");
@@ -662,8 +665,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child1.Id, toddler2.Id, baby1.Id), baby1.Path);
                 Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child2.Id, toddler4.Id, baby2.Id), baby2.Path);
             }
-
-
         }
 
         [Test]
@@ -671,9 +672,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var parent = new Template("parent", "parent");
                 var child1 = new Template("child1", "child1");
                 var child2 = new Template("child2", "child2");
@@ -703,7 +705,6 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //Assert
                 Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child2.Id, toddler2.Id), toddler2.Path);
-
             }
         }
 

src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs

@@ -45,10 +45,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
 
                 var user = MockedUser.CreateUser(CreateAndCommitUserType());
 
@@ -66,10 +66,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
 
                 var user1 = MockedUser.CreateUser(CreateAndCommitUserType(), "1");
                 var use2 = MockedUser.CreateUser(CreateAndCommitUserType(), "2");
@@ -91,10 +91,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var user = MockedUser.CreateUser(CreateAndCommitUserType());
                 repository.AddOrUpdate(user);
                 unitOfWork.Commit();
@@ -113,10 +114,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var user = MockedUser.CreateUser(CreateAndCommitUserType());
                 repository.AddOrUpdate(user);
                 unitOfWork.Commit();
@@ -163,10 +165,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
 
                 var user = MockedUser.CreateUser(CreateAndCommitUserType());
 
@@ -175,17 +177,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
                 var id = user.Id;
 
-                using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver))
-                using (var repository2 = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, utRepo, MappingResolver))
-                {
-                    repository2.Delete(user);
-                    unitOfWork.Commit();
+                var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver);
+                var repository2 = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, utRepo, MappingResolver);
 
-                    var resolved = repository2.Get((int) id);
+                repository2.Delete(user);
+                unitOfWork.Commit();
 
-                    // Assert
-                    Assert.That(resolved, Is.Null);
-                }
+                var resolved = repository2.Get((int) id);
+
+                // Assert
+                Assert.That(resolved, Is.Null);
             }
         }
 
@@ -194,7 +195,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         //{
         //    // Arrange
         //    var provider = new NPocoUnitOfWorkProvider(Logger);
-        //    var unitOfWork = provider.GetUnitOfWork();
+        //    using (var unitOfWork = provider.GetUnitOfWork())
         //    UserTypeRepository userTypeRepository;
         //using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
         //{
@@ -224,10 +225,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var user = MockedUser.CreateUser(CreateAndCommitUserType());
                 repository.AddOrUpdate(user);
                 unitOfWork.Commit();
@@ -245,10 +247,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -265,10 +268,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -286,10 +290,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -307,10 +312,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -326,10 +332,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -346,10 +353,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -381,10 +389,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -425,10 +434,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
@@ -453,10 +463,11 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            UserTypeRepository userTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out userTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                UserTypeRepository userTypeRepository;
+                var repository = CreateRepository(unitOfWork, out userTypeRepository);
+
                 var user1 = MockedUser.CreateUser(CreateAndCommitUserType(), "1", "test", "media");
                 var user2 = MockedUser.CreateUser(CreateAndCommitUserType(), "2", "media", "settings");
                 var user3 = MockedUser.CreateUser(CreateAndCommitUserType(), "3", "test", "settings");
@@ -482,10 +493,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver))
-            using (var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, utRepo, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var utRepo = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver);
+                var repository = new UserRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, utRepo, MappingResolver);
 
                 // Act
                 var user1 = MockedUser.CreateUser(CreateAndCommitUserType(), "1", "test", "media");
@@ -533,9 +544,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         private IUserType CreateAndCommitUserType()
         {
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver);
                 var userType = MockedUserType.CreateUserType();
                 repository.AddOrUpdate(userType);
                 unitOfWork.Commit();

src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs

@@ -40,9 +40,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 var userType = MockedUserType.CreateUserType();
 
@@ -60,9 +60,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 var userType1 = MockedUserType.CreateUserType("1");
                 var userType2 = MockedUserType.CreateUserType("2");
@@ -84,9 +84,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userType = MockedUserType.CreateUserType();
                 repository.AddOrUpdate(userType);
                 unitOfWork.Commit();
@@ -105,9 +106,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userType = MockedUserType.CreateUserType();
                 repository.AddOrUpdate(userType);
                 unitOfWork.Commit();
@@ -132,9 +134,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
 
                 var userType = MockedUserType.CreateUserType();
 
@@ -143,17 +145,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 unitOfWork.Commit();
                 var id = userType.Id;
 
-                using (var repository2 = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver))
-                {
-                    repository2.Delete(userType);
-                    unitOfWork.Commit();
+                var repository2 = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver);
+                repository2.Delete(userType);
+                unitOfWork.Commit();
 
-                    var resolved = repository2.Get(id);
+                var resolved = repository2.Get(id);
 
-                    // Assert
-                    Assert.That(resolved, Is.Null);    
-                }
-                
+                // Assert
+                Assert.That(resolved, Is.Null);    
             }
         }
 
@@ -162,9 +161,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userType = MockedUserType.CreateUserType();
                 repository.AddOrUpdate(userType);
                 unitOfWork.Commit();
@@ -187,9 +187,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 CreateAndCommitMultipleUserTypes(repository, unitOfWork);
 
                 // Act
@@ -206,9 +207,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userTypes = CreateAndCommitMultipleUserTypes(repository, unitOfWork);
 
                 // Act
@@ -226,9 +228,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 CreateAndCommitMultipleUserTypes(repository, unitOfWork);
 
                 // Act
@@ -246,9 +249,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userTypes = CreateAndCommitMultipleUserTypes(repository, unitOfWork);
 
                 // Act
@@ -264,9 +268,10 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var repository = CreateRepository(unitOfWork);
+
                 var userTypes = CreateAndCommitMultipleUserTypes(repository, unitOfWork);
 
                 // Act

src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs

@@ -146,13 +146,13 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentService.Save(pages, 0);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
-            using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver))
-            using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
+                var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver);
+                var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver);
+                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver);
+
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
                 var contents = repository.GetAll();
@@ -178,12 +178,13 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentService.Save(pages, 0);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
-            using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver))
-            using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
+                var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver);
+                var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver);
+                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver);
+
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
                 var contents = repository.GetAll();
@@ -207,13 +208,12 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentService.Save(pages, 0);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-
-            using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
-            using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver))
-            using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
+                var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver);
+                var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver);
+                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver);
 
                 // Act
                 var contents = repository.GetAll();
@@ -241,12 +241,12 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentService.Save(pages, 0);
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
-            using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver))
-            using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver))
-            using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
+                var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver);
+                var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository, MappingResolver);
+                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver);
 
                 // Act
                 var contents = repository.GetAll();

src/Umbraco.Tests/Services/ContentServiceTests.cs

@@ -1336,7 +1336,6 @@ namespace Umbraco.Tests.Services
             var databaseFactory = new DefaultDatabaseFactory(Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName, TestObjects.GetDefaultSqlSyntaxProviders(Logger), Logger);
             var repositoryFactory = MockRepositoryFactory();
             var provider = new NPocoUnitOfWorkProvider(databaseFactory, repositoryFactory);
-            var unitOfWork = provider.GetUnitOfWork();
             var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
             var root = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1);
 
@@ -1344,9 +1343,11 @@ namespace Umbraco.Tests.Services
             var c2 = new Lazy<IContent>(() => MockedContent.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id));
             var list = new List<Lazy<IContent>> {c, c2};
 
-            ContentTypeRepository contentTypeRepository;
-            using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
+            using (var unitOfWork = provider.GetUnitOfWork())
             {
+                ContentTypeRepository contentTypeRepository;
+                var repository = CreateRepository(unitOfWork, out contentTypeRepository);
+
                 foreach (var content in list)
                 {
                     repository.AddOrUpdate(content.Value);

src/Umbraco.Tests/Services/MacroServiceTests.cs

@@ -27,8 +27,9 @@ namespace Umbraco.Tests.Services
 
             var provider = new NPocoUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.GetUnitOfWork())
-            using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver))
             {
+                var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), MappingResolver);
+
                 repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
                 repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
                 repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));