From 3c446cbf8227ecc3b95555e58e001cf91d78c7d7 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 2 May 2016 15:38:45 +0200 Subject: [PATCH] Adds IQueryFactory property to IDatabaseFactory, DatabaseContext. Changes exposed Query to correct IQuery Creates interface for QueryFactory: IQueryFactory Updates all repositories with these changes --- src/Umbraco.Core/DatabaseContext.cs | 8 ++- .../Persistence/DefaultDatabaseFactory.cs | 27 ++++++-- .../Persistence/IDatabaseFactory.cs | 5 +- .../Persistence/Querying/IQueryFactory.cs | 12 ++++ .../Persistence/Querying/QueryFactory.cs | 4 +- .../Repositories/ContentRepository.cs | 11 +-- .../Repositories/EntityRepository.cs | 2 +- .../Interfaces/IContentRepository.cs | 5 +- .../Interfaces/IEntityRepository.cs | 2 +- .../Interfaces/IMediaRepository.cs | 3 +- .../Interfaces/IRepositoryQueryable.cs | 4 +- .../Repositories/MediaRepository.cs | 12 ++-- .../Repositories/NPocoRepositoryBase.cs | 4 +- .../Repositories/RepositoryBase.cs | 4 +- .../UnitOfWork/NPocoUnitOfWorkProvider.cs | 6 +- src/Umbraco.Core/Services/ContentService.cs | 37 +++++----- src/Umbraco.Core/Services/IContentService.cs | 6 +- src/Umbraco.Core/Services/IMediaService.cs | 7 +- src/Umbraco.Core/Services/MediaService.cs | 36 +++++----- src/Umbraco.Core/Umbraco.Core.csproj | 1 + .../Persistence/DatabaseContextTests.cs | 5 +- .../FaultHandling/ConnectionRetryTest.cs | 5 +- .../Repositories/AuditRepositoryTest.cs | 2 +- .../Repositories/ContentRepositoryTest.cs | 69 ++++++++++--------- .../Repositories/ContentTypeRepositoryTest.cs | 56 +++++++-------- .../DataTypeDefinitionRepositoryTest.cs | 38 +++++----- .../Repositories/DictionaryRepositoryTest.cs | 26 +++---- .../Repositories/DomainRepositoryTest.cs | 26 +++---- .../Repositories/LanguageRepositoryTest.cs | 24 +++---- .../Repositories/MacroRepositoryTest.cs | 36 +++++----- .../Repositories/MediaRepositoryTest.cs | 52 +++++++------- .../Repositories/MediaTypeRepositoryTest.cs | 32 ++++----- .../Repositories/MemberRepositoryTest.cs | 24 +++---- .../Repositories/MemberTypeRepositoryTest.cs | 22 +++--- .../NotificationsRepositoryTest.cs | 10 +-- .../PublicAccessRepositoryTest.cs | 16 ++--- .../Repositories/RelationRepositoryTest.cs | 22 +++--- .../RelationTypeRepositoryTest.cs | 20 +++--- .../ServerRegistrationRepositoryTest.cs | 24 +++---- .../Repositories/TagRepositoryTest.cs | 42 +++++------ .../Repositories/TaskRepositoryTest.cs | 18 ++--- .../Repositories/TaskTypeRepositoryTest.cs | 2 +- .../Repositories/TemplateRepositoryTest.cs | 44 ++++++------ .../Repositories/UserRepositoryTest.cs | 36 +++++----- .../Repositories/UserTypeRepositoryTest.cs | 22 +++--- .../Services/ContentServicePerformanceTest.cs | 8 +-- .../Services/ContentServiceTests.cs | 13 ++-- .../Services/MacroServiceTests.cs | 2 +- .../Services/MediaServiceTests.cs | 2 +- .../Services/MemberServiceTests.cs | 2 +- .../Services/ThreadSafetyServiceTest.cs | 22 +++--- .../TestHelpers/BaseDatabaseFactoryTest.cs | 7 +- .../TestHelpers/BaseUmbracoApplicationTest.cs | 5 +- .../UmbracoExamine/IndexInitializer.cs | 10 +-- .../UmbracoExamine/SearchTests.cs | 3 +- src/Umbraco.Web/Editors/ContentController.cs | 16 ++--- src/Umbraco.Web/Editors/MediaController.cs | 12 ++-- src/UmbracoExamine/UmbracoContentIndexer.cs | 17 ++--- 58 files changed, 525 insertions(+), 463 deletions(-) create mode 100644 src/Umbraco.Core/Persistence/Querying/IQueryFactory.cs diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs index 639d706a25..4cec287354 100644 --- a/src/Umbraco.Core/DatabaseContext.cs +++ b/src/Umbraco.Core/DatabaseContext.cs @@ -14,6 +14,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Migrations; using Umbraco.Core.Persistence.Migrations.Initial; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Services; @@ -47,10 +48,15 @@ namespace Umbraco.Core _logger = logger; } + /// + /// Gets the QueryFactory + /// + public IQueryFactory QueryFactory => _factory.QueryFactory; + /// /// Gets the database sql syntax. /// - public ISqlSyntaxProvider SqlSyntax => _factory.SqlSyntax; + public ISqlSyntaxProvider SqlSyntax => _factory.QueryFactory.SqlSyntax; /// /// Gets the object for doing CRUD operations diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs index fef60db1d7..15be34cd99 100644 --- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs +++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.FaultHandling; using Umbraco.Core.Persistence.Mappers; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence @@ -26,6 +27,7 @@ namespace Umbraco.Core.Persistence /// internal class DefaultDatabaseFactory : DisposableObject, IDatabaseFactory { + private readonly IMappingResolver _mappingResolver; private readonly IScopeContextFactory _scopeContextFactory; private readonly ISqlSyntaxProvider[] _sqlSyntaxProviders; private readonly ILogger _logger; @@ -40,6 +42,7 @@ namespace Umbraco.Core.Persistence private ISqlSyntaxProvider _sqlSyntax; private RetryPolicy _connectionRetryPolicy; private RetryPolicy _commandRetryPolicy; + private IQueryFactory _queryFactory; private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim(); public bool Configured { get; private set; } @@ -52,15 +55,25 @@ namespace Umbraco.Core.Persistence } } + public IQueryFactory QueryFactory + { + get + { + EnsureConfigured(); + return _queryFactory ?? (_queryFactory = new QueryFactory(SqlSyntax, _mappingResolver)); + } + } + /// /// Initializes a new instance of the with the default connection, and a logger. /// /// The collection of available sql syntax providers. /// A logger. /// + /// /// Used by LightInject. - public DefaultDatabaseFactory(IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory) - : this(GlobalSettings.UmbracoConnectionName, sqlSyntaxProviders, logger, scopeContextFactory) + public DefaultDatabaseFactory(IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory, IMappingResolver mappingResolver) + : this(GlobalSettings.UmbracoConnectionName, sqlSyntaxProviders, logger, scopeContextFactory, mappingResolver) { if (Configured == false) DatabaseContext.GiveLegacyAChance(this, logger); @@ -73,14 +86,17 @@ namespace Umbraco.Core.Persistence /// The collection of available sql syntax providers. /// A logger /// + /// /// Used by the other ctor and in tests. - public DefaultDatabaseFactory(string connectionStringName, IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory) + public DefaultDatabaseFactory(string connectionStringName, IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory, IMappingResolver mappingResolver) { if (sqlSyntaxProviders == null) throw new ArgumentNullException(nameof(sqlSyntaxProviders)); if (logger == null) throw new ArgumentNullException(nameof(logger)); if (scopeContextFactory == null) throw new ArgumentNullException(nameof(scopeContextFactory)); if (string.IsNullOrWhiteSpace(connectionStringName)) throw new ArgumentException("Value cannot be null nor empty.", nameof(connectionStringName)); + if (mappingResolver == null) throw new ArgumentNullException(nameof(mappingResolver)); + _mappingResolver = mappingResolver; _sqlSyntaxProviders = sqlSyntaxProviders.ToArray(); _logger = logger; _scopeContextFactory = scopeContextFactory; @@ -102,13 +118,16 @@ namespace Umbraco.Core.Persistence /// The collection of available sql syntax providers. /// A logger. /// + /// /// Used in tests. - public DefaultDatabaseFactory(string connectionString, string providerName, IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory) + public DefaultDatabaseFactory(string connectionString, string providerName, IEnumerable sqlSyntaxProviders, ILogger logger, IScopeContextFactory scopeContextFactory, IMappingResolver mappingResolver) { if (sqlSyntaxProviders == null) throw new ArgumentNullException(nameof(sqlSyntaxProviders)); if (logger == null) throw new ArgumentNullException(nameof(logger)); if (scopeContextFactory == null) throw new ArgumentNullException(nameof(scopeContextFactory)); + if (mappingResolver == null) throw new ArgumentNullException(nameof(mappingResolver)); + _mappingResolver = mappingResolver; _sqlSyntaxProviders = sqlSyntaxProviders.ToArray(); _logger = logger; _scopeContextFactory = scopeContextFactory; diff --git a/src/Umbraco.Core/Persistence/IDatabaseFactory.cs b/src/Umbraco.Core/Persistence/IDatabaseFactory.cs index 9d3977bcb4..7b7ae00b49 100644 --- a/src/Umbraco.Core/Persistence/IDatabaseFactory.cs +++ b/src/Umbraco.Core/Persistence/IDatabaseFactory.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence @@ -19,7 +20,7 @@ namespace Umbraco.Core.Persistence bool Configured { get; } bool CanConnect { get; } - - ISqlSyntaxProvider SqlSyntax { get; } + + IQueryFactory QueryFactory { get; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Querying/IQueryFactory.cs b/src/Umbraco.Core/Persistence/Querying/IQueryFactory.cs new file mode 100644 index 0000000000..782d5a68c5 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Querying/IQueryFactory.cs @@ -0,0 +1,12 @@ +using Umbraco.Core.Persistence.Mappers; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Querying +{ + public interface IQueryFactory + { + IMappingResolver MappingResolver { get; } + ISqlSyntaxProvider SqlSyntax { get; } + IQuery Create(); + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Querying/QueryFactory.cs b/src/Umbraco.Core/Persistence/Querying/QueryFactory.cs index 1289a55913..d9e0ab4121 100644 --- a/src/Umbraco.Core/Persistence/Querying/QueryFactory.cs +++ b/src/Umbraco.Core/Persistence/Querying/QueryFactory.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Querying { - public class QueryFactory + public class QueryFactory : IQueryFactory { public ISqlSyntaxProvider SqlSyntax { get; } public IMappingResolver MappingResolver { get; } @@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Querying MappingResolver = mappingResolver; } - public Query Create() + public IQuery Create() { return new Query(SqlSyntax, MappingResolver); } diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index 3f77d6defe..e5743e3973 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -779,15 +779,18 @@ namespace Umbraco.Core.Persistence.Repositories /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects public IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter = null, object[] filterArgs = null) + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null) { + var filterSql = Sql().Append("AND (cmsDocument.newest = 1)"); - if (filter.IsNullOrWhiteSpace() == false) + if (filter != null) { - filterSql.Append($"AND ({filter})", filterArgs); + foreach (var filterClaus in filter.GetWhereClauses()) + { + filterSql.Append($"AND ({filterClaus.Item1})", filterClaus.Item2); + } } return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs index c706d780df..0bc2b2e26c 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs @@ -41,7 +41,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Query Methods - public Query Query => _queryFactory.Create(); + public IQuery Query => _queryFactory.Create(); public Sql Sql() { return UnitOfWork.Database.Sql();} diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs index 2a3dc1819b..fdcf02e613 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs @@ -85,11 +85,10 @@ namespace Umbraco.Core.Persistence.Repositories /// Field to order by /// Direction to order by /// Flag to indicate when ordering by system field - /// A column value list for applying a filter - /// + /// /// An Enumerable list of objects IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter = null, object[] filterArgs = null); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null); /// /// Returns the persisted content's preview XML structure diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs index 57e15a2998..ba42548906 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Repositories { public interface IEntityRepository : IRepository { - Query Query { get; } + IQuery Query { get; } IUmbracoEntity GetByKey(Guid key); IUmbracoEntity GetByKey(Guid key, Guid objectTypeId); diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs index bf7ae1472d..2e165a6ed6 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs @@ -36,9 +36,8 @@ namespace Umbraco.Core.Persistence.Repositories /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter = null, object[] filterArgs = null); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryQueryable.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryQueryable.cs index 5aac97c046..4228c0873a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryQueryable.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryQueryable.cs @@ -16,12 +16,12 @@ namespace Umbraco.Core.Persistence.Repositories /// /// Returns a query instance /// - Query Query { get; } + IQuery Query { get; } /// /// Returns a query factory instance /// - QueryFactory QueryFactory { get; } + IQueryFactory QueryFactory { get; } /// /// Gets all entities of the specified type and query diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 4a868d78cf..9fc4af97ac 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -490,17 +490,19 @@ namespace Umbraco.Core.Persistence.Repositories /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects public IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter = null, object[] filterArgs = null) + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null) { Sql filterSql = null; - if (filter.IsNullOrWhiteSpace() == false) + if (filter != null) { - filterSql = Sql().Append($"AND ({filter})", filterArgs); + foreach (var filterClaus in filter.GetWhereClauses()) + { + filterSql = Sql().Append($"AND ({filterClaus.Item1})", filterClaus.Item2); + } } - + return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, MapQueryDtos, orderBy, orderDirection, orderBySystemField, filterSql); diff --git a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs index d9392417b6..59283abe54 100644 --- a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs @@ -50,13 +50,13 @@ namespace Umbraco.Core.Persistence.Repositories /// /// Gets the repository's query factory. /// - public override QueryFactory QueryFactory { get; } + public override IQueryFactory QueryFactory { get; } /// /// Creates a new query. /// /// A new query. - public override Query Query => QueryFactory.Create(); + public override IQuery Query => QueryFactory.Create(); /// /// Creates a new Sql statement. diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs index 958eca5816..c20636ddbc 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs @@ -86,12 +86,12 @@ namespace Umbraco.Core.Persistence.Repositories /// Used to create a new query instance /// /// - public abstract Query Query { get; } + public abstract IQuery Query { get; } /// /// Returns a query factory instance /// - public abstract QueryFactory QueryFactory { get; } + public abstract IQueryFactory QueryFactory { get; } protected virtual TId GetEntityId(TEntity entity) { diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs index 723351c840..6bf6470eea 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; +using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.UnitOfWork @@ -27,13 +28,14 @@ namespace Umbraco.Core.Persistence.UnitOfWork /// Initializes a new instance of the class with a logger. /// /// A logger. + /// /// /// FOR UNIT TESTS ONLY /// Creates a new each time it is called, by initializing a new /// with the default connection name, and default sql syntax providers. /// - internal NPocoUnitOfWorkProvider(ILogger logger) - : this(new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, new DefaultScopeContextFactory())) + internal NPocoUnitOfWorkProvider(ILogger logger, IMappingResolver mappingResolver) + : this(new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, new DefaultScopeContextFactory(), mappingResolver)) { } // this should NOT be here, all tests should supply the appropriate providers, diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index e404a53616..214b0b34ad 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -501,15 +501,15 @@ namespace Umbraco.Core.Services public IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, string filter = "") { - string f = filter; - object[] fa = null; - if (filter.IsNullOrWhiteSpace() == false) + using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork())) { - //add the default text filter - f = $"cmsDocument.{RepositoryFactory.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + IQuery filterQuery = null; + if (filter.IsNullOrWhiteSpace() == false) + { + filterQuery = repository.QueryFactory.Create().Where(x => x.Name.Contains(filter)); + } + return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filterQuery); } - return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, f, fa); } /// @@ -523,10 +523,9 @@ namespace Umbraco.Core.Services /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects public IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs) + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter) { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); @@ -540,7 +539,7 @@ namespace Umbraco.Core.Services query.Where(x => x.ParentId == id); } - var contents = repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter, filterArgs); + var contents = repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter); return contents; } @@ -559,15 +558,15 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "Path", Direction orderDirection = Direction.Ascending, string filter = "") { - string f = filter; - object[] fa = null; - if (filter.IsNullOrWhiteSpace() == false) + using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork())) { - //add the default text filter - f = $"cmsDocument.{RepositoryFactory.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + IQuery filterQuery = null; + if (filter.IsNullOrWhiteSpace() == false) + { + filterQuery = repository.QueryFactory.Create().Where(x => x.Name.Contains(filter)); + } + return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filterQuery); } - return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, f, fa); } /// @@ -583,7 +582,7 @@ namespace Umbraco.Core.Services /// Search text filter /// /// An Enumerable list of objects - public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs) + public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter) { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); @@ -596,7 +595,7 @@ namespace Umbraco.Core.Services { query.Where(x => x.Path.SqlContains($",{id},", TextColumnType.NVarchar)); } - var contents = repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter, filterArgs); + var contents = repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter); return contents; } diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs index d5906d78c2..86df730b00 100644 --- a/src/Umbraco.Core/Services/IContentService.cs +++ b/src/Umbraco.Core/Services/IContentService.cs @@ -5,6 +5,7 @@ using System.Xml.Linq; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Publishing; namespace Umbraco.Core.Services @@ -241,10 +242,9 @@ namespace Umbraco.Core.Services /// Direction to order by /// Flag to indicate when ordering by system field /// Search text filter - /// /// An Enumerable list of objects IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter); /// /// Gets a collection of objects by Parent Id @@ -274,7 +274,7 @@ namespace Umbraco.Core.Services /// /// An Enumerable list of objects IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter); /// /// Gets a collection of an objects versions by its Id diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs index 18505a7bfa..351035e285 100644 --- a/src/Umbraco.Core/Services/IMediaService.cs +++ b/src/Umbraco.Core/Services/IMediaService.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.Querying; namespace Umbraco.Core.Services { @@ -143,10 +144,9 @@ namespace Umbraco.Core.Services /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter); /// /// Gets a collection of objects by Parent Id @@ -173,10 +173,9 @@ namespace Umbraco.Core.Services /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalRecords, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs); + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter); /// /// Gets descendants of a object by its Id diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs index 84e090aecf..26adc3496b 100644 --- a/src/Umbraco.Core/Services/MediaService.cs +++ b/src/Umbraco.Core/Services/MediaService.cs @@ -409,15 +409,15 @@ namespace Umbraco.Core.Services public IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, string filter = "") { - string f = filter; - object[] fa = null; - if (filter.IsNullOrWhiteSpace() == false) + using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork())) { - //add the default text filter - f = $"umbracoNode.{RepositoryFactory.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + IQuery filterQuery = null; + if (filter.IsNullOrWhiteSpace() == false) + { + filterQuery = repository.QueryFactory.Create().Where(x => x.Name.Contains(filter)); + } + return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filterQuery); } - return GetPagedChildren(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, f, fa); } /// @@ -431,10 +431,9 @@ namespace Umbraco.Core.Services /// Direction to order by /// Flag to indicate when ordering by system field /// - /// /// An Enumerable list of objects public IEnumerable GetPagedChildren(int id, long pageIndex, int pageSize, out long totalChildren, - string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs) + string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter) { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); @@ -462,15 +461,15 @@ namespace Umbraco.Core.Services /// An Enumerable list of objects public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy = "Path", Direction orderDirection = Direction.Ascending, string filter = "") { - string f = filter; - object[] fa = null; - if (filter.IsNullOrWhiteSpace() == false) + using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork())) { - //add the default text filter - f = $"umbracoNode.{RepositoryFactory.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + IQuery filterQuery = null; + if (filter.IsNullOrWhiteSpace() == false) + { + filterQuery = repository.QueryFactory.Create().Where(x => x.Name.Contains(filter)); + } + return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, filterQuery); } - return GetPagedDescendants(id, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, true, f, fa); } /// @@ -483,10 +482,9 @@ namespace Umbraco.Core.Services /// Field to order by /// Direction to order by /// Flag to indicate when ordering by system field - /// - /// + /// /// An Enumerable list of objects - public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, string filter, object[] filterArgs) + public IEnumerable GetPagedDescendants(int id, long pageIndex, int pageSize, out long totalChildren, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter) { Mandate.ParameterCondition(pageIndex >= 0, "pageIndex"); Mandate.ParameterCondition(pageSize > 0, "pageSize"); diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index d56b96f213..c8daf2d66e 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -435,6 +435,7 @@ + diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs index b1545f0c40..020f75c630 100644 --- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs +++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs @@ -8,6 +8,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; +using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Profiling; using Umbraco.Core.Services; @@ -31,7 +32,7 @@ namespace Umbraco.Tests.Persistence _sqlCeSyntaxProvider = new SqlCeSyntaxProvider(); _sqlSyntaxProviders = new[] { (ISqlSyntaxProvider) _sqlCeSyntaxProvider }; _logger = Mock.Of(); - var dbFactory = new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, _sqlSyntaxProviders, _logger, new TestScopeContextFactory()); + var dbFactory = new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, _sqlSyntaxProviders, _logger, new TestScopeContextFactory(), Mock.Of()); _dbContext = new DatabaseContext(dbFactory, _logger); } @@ -79,7 +80,7 @@ namespace Umbraco.Tests.Persistence engine.CreateDatabase(); // re-create the database factory and database context with proper connection string - var dbFactory = new DefaultDatabaseFactory(engine.LocalConnectionString, Constants.DbProviderNames.SqlCe, _sqlSyntaxProviders, _logger, new TestScopeContextFactory()); + var dbFactory = new DefaultDatabaseFactory(engine.LocalConnectionString, Constants.DbProviderNames.SqlCe, _sqlSyntaxProviders, _logger, new TestScopeContextFactory(), Mock.Of()); _dbContext = new DatabaseContext(dbFactory, _logger); // create application context diff --git a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs index 5df66b1f54..f83e547f2f 100644 --- a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs +++ b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; +using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Tests.TestHelpers; @@ -20,7 +21,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=x;password=umbraco"; const string providerName = Constants.DbProviderNames.SqlServer; var sqlSyntax = new[] { new SqlServerSyntaxProvider(new Lazy(() => null)) }; - var factory = new DefaultDatabaseFactory(connectionString, providerName, sqlSyntax, Mock.Of(), new TestScopeContextFactory()); + var factory = new DefaultDatabaseFactory(connectionString, providerName, sqlSyntax, Mock.Of(), new TestScopeContextFactory(), Mock.Of()); var database = factory.GetDatabase(); //Act @@ -35,7 +36,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco"; const string providerName = Constants.DbProviderNames.SqlServer; var sqlSyntax = new[] { new SqlServerSyntaxProvider(new Lazy(() => null)) }; - var factory = new DefaultDatabaseFactory(connectionString, providerName, sqlSyntax, Mock.Of(), new TestScopeContextFactory()); + var factory = new DefaultDatabaseFactory(connectionString, providerName, sqlSyntax, Mock.Of(), new TestScopeContextFactory(), Mock.Of()); var database = factory.GetDatabase(); //Act diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs index fa5db89fb3..0136a6e367 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Add_Audit_Entry() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs index 1e9ba3b0cf..c3f7a3cb4c 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_Xml_Structures_With_Non_Latest_Version() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -112,7 +112,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -159,7 +159,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Ensures_Permissions_Are_Set_If_Parent_Entity_Permissions_Exist() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; @@ -259,7 +259,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -283,7 +283,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_With_Default_Template() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; TemplateRepository templateRepository; @@ -315,7 +315,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Save_Content_With_AtSign_In_Name_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -349,7 +349,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -380,7 +380,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -398,7 +398,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -421,7 +421,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_With_Null_Template() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -443,7 +443,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -472,7 +472,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -498,7 +498,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -516,7 +516,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_All_With_Many_Version() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -561,7 +561,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_Sorting_On_Custom_Property() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -596,7 +596,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForFirstPage_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -628,7 +628,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForSecondPage_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -649,7 +649,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithSinglePage_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -670,7 +670,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithDescendingOrder_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -691,7 +691,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingSome_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -699,10 +699,10 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var query = repository.Query.Where(x => x.Level == 2); long totalRecords; - - var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true, - $"cmsDocument.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0", - new object[] { "%Page 2%" }); + + var filterQuery = new Query(SqlSyntax, MappingResolver).Where(x => x.Name.Contains("Page 2")); + var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true, + filterQuery); // Assert Assert.That(totalRecords, Is.EqualTo(1)); @@ -715,7 +715,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingAll_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -723,9 +723,10 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var query = repository.Query.Where(x => x.Level == 2); long totalRecords; + + var filterQuery = new Query(SqlSyntax, MappingResolver).Where(x => x.Name.Contains("text")); var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true, - $"cmsDocument.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0", - new object[] { "%Page%" }); + filterQuery); // Assert Assert.That(totalRecords, Is.EqualTo(2)); @@ -738,7 +739,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -757,7 +758,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -778,7 +779,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -797,7 +798,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_ContentRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -816,7 +817,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Keys_Set() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) @@ -837,7 +838,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Content_By_Guid_Key() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index aa6a861b61..e3bf158238 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -75,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Maps_Templates_Correctly() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver)) using (var repository = CreateRepository(unitOfWork)) @@ -110,7 +110,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid)) using (var repository = CreateRepository(unitOfWork)) @@ -156,7 +156,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid)) @@ -176,7 +176,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid)) @@ -201,7 +201,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Media_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid)) using (var repository = CreateRepository(unitOfWork)) @@ -222,7 +222,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Media_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; IMediaType contentType; @@ -258,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -289,7 +289,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_ContentTypeRepository_After_Model_Mapping() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -338,7 +338,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -414,7 +414,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_ContentTypeRepository_After_Model_Mapping() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -477,7 +477,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -501,7 +501,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_With_Heirarchy_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -531,7 +531,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Query_On_ContentTypeRepository_Sort_By_Name() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -560,7 +560,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -578,7 +578,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Guid_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -600,7 +600,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Missing_Guid_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -616,7 +616,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -638,7 +638,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Guid_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -661,7 +661,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_ContentTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -678,7 +678,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_ContentType_With_PropertyType_Removed() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -702,7 +702,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_SimpleTextpage() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -720,7 +720,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_Textpage() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -738,7 +738,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyType_With_No_Group() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -772,7 +772,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_AllowedChildContentTypes_On_ContentType() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -806,7 +806,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Removal_Of_Used_PropertyType_From_ContentType() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) @@ -833,7 +833,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Addition_Of_PropertyType_After_ContentType_Is_Used() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) @@ -861,7 +861,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Usage_Of_New_PropertyType_On_Content() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) @@ -897,7 +897,7 @@ namespace Umbraco.Tests.Persistence.Repositories () { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository repository; using (var contentRepository = CreateRepository(unitOfWork, out repository)) diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index 8e1450a4cd..681fd59b37 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -81,7 +81,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork)) using (var repository = CreateRepository(unitOfWork)) @@ -128,7 +128,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork)) @@ -148,7 +148,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork)) @@ -173,7 +173,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Data_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork)) using (var repository = CreateRepository(unitOfWork)) @@ -193,7 +193,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Data_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; IDataTypeDefinition dataType; @@ -227,7 +227,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); int id; using (var repository = CreateRepository(unitOfWork)) @@ -256,7 +256,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -275,7 +275,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -295,7 +295,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -315,7 +315,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -335,7 +335,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -353,7 +353,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -380,7 +380,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -414,7 +414,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -446,7 +446,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_DataTypeDefinitionRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -464,7 +464,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_Collection() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); int dtid; @@ -489,7 +489,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_As_String() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); int dtid; @@ -514,7 +514,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_Collection_With_Cache() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); DataTypeDefinition dtd; @@ -548,7 +548,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Pre_Value_As_String_With_Cache() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); DataTypeDefinition dtd; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs index 9febecaef4..0d5442f9a5 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs @@ -36,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Key_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) @@ -69,7 +69,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_UniqueId_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) @@ -102,7 +102,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) @@ -136,7 +136,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_DictionaryRepository_When_No_Language_Assigned() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) @@ -163,7 +163,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -184,7 +184,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -204,7 +204,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -224,7 +224,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -242,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var languageRepository = Container.GetInstance(unitOfWork)) using (var repository = CreateRepository(unitOfWork)) @@ -273,7 +273,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -300,7 +300,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_WithNewTranslation_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repository = CreateRepository(unitOfWork); @@ -328,7 +328,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -349,7 +349,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_DictionaryRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs index c0efdadd16..6a80c5c723 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs @@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories private int CreateTestData(string isoName, out ContentType ct) { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentRepository contentRepo; @@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_And_Get_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -89,7 +89,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_And_Get_By_Id_Empty_lang() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -122,7 +122,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Cant_Create_Duplicate_Domain_Name() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -155,7 +155,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -190,7 +190,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Update() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -242,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Exists() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -273,7 +273,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_By_Name() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -304,7 +304,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_All() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -335,7 +335,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_All_Ids() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -368,7 +368,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_All_Without_Wildcards() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -403,7 +403,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_All_For_Content() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; @@ -454,7 +454,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_All_For_Content_Without_Wildcards() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentType ct; diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs index 82bb7acf7d..7d0d166d68 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs @@ -37,7 +37,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); unitOfWork.Database.EnableSqlTrace = true; using (var repository = CreateRepository(unitOfWork)) @@ -56,7 +56,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Get_By_Iso_Code_On_LanguageRepository() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -82,7 +82,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Perform_Get_By_Culture_Name_On_LanguageRepository() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -109,7 +109,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Get_WhenIdDoesntExist_ReturnsNull() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -125,7 +125,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -165,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -185,7 +185,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -203,7 +203,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -223,7 +223,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -249,7 +249,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -270,7 +270,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_LanguageRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs index 0f8d77d27a..70f698087c 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs @@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Add_Duplicate_Macros() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -48,7 +48,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Update_To_Duplicate_Macro_Alias() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -66,7 +66,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -81,7 +81,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -111,7 +111,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -128,7 +128,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -162,7 +162,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -183,7 +183,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -224,7 +224,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -245,7 +245,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -263,7 +263,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Property_For_Macro() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -290,7 +290,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_New_Macro_With_Property() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -315,7 +315,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Remove_Macro_Property() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -340,7 +340,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Remove_Macro_Properties() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -371,7 +371,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Property_For_Macro() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -399,7 +399,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Macro_Property_Alias() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { @@ -428,7 +428,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var unitOfWork = provider.GetUnitOfWork()) using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 88d351de98..2b4a213a91 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -72,7 +72,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -137,7 +137,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -168,7 +168,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_MediaRepository_With_RepositoryResolver() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -199,7 +199,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -218,7 +218,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -242,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -266,7 +266,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -293,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -311,7 +311,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForFirstPage_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -332,7 +332,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_ForSecondPage_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -353,7 +353,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithSinglePage_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -374,7 +374,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithDescendingOrder_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -395,7 +395,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WitAlternateOrder_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -416,7 +416,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingSome_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -424,9 +424,10 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var query = new Query(SqlSyntax, MappingResolver).Where(x => x.Level == 2); long totalRecords; + + var filter = new Query(SqlSyntax, MappingResolver).Where(x => x.Name.Contains("File")); var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, - $"umbracoNode.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0", - new object[] { "%File%" }); + filter); // Assert Assert.That(totalRecords, Is.EqualTo(1)); @@ -439,7 +440,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetPagedResultsByQuery_WithFilterMatchingAll_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -447,9 +448,10 @@ namespace Umbraco.Tests.Persistence.Repositories // Act var query = new Query(SqlSyntax, MappingResolver).Where(x => x.Level == 2); long totalRecords; + + var filter = new Query(SqlSyntax, MappingResolver).Where(x => x.Name.Contains("Test")); var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, - $"umbracoNode.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0", - new object[] { "%Test%" }); + filter); // Assert Assert.That(totalRecords, Is.EqualTo(2)); @@ -462,7 +464,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -482,7 +484,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -502,7 +504,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) @@ -524,7 +526,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_MediaRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; using (var repository = CreateRepository(unitOfWork, out mediaTypeRepository)) diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index db569700d4..b23038866a 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Move() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork)) using (var repository = CreateRepository(unitOfWork)) @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork)) @@ -106,7 +106,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; using (var containerRepository = CreateContainerRepository(unitOfWork)) @@ -132,7 +132,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Container_Containing_Media_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var containerRepository = CreateContainerRepository(unitOfWork)) using (var repository = CreateRepository(unitOfWork)) @@ -153,7 +153,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete_Container_Containing_Media_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); EntityContainer container; IMediaType contentType; @@ -189,7 +189,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -212,7 +212,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -249,7 +249,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -274,7 +274,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -293,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_By_Guid_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -313,7 +313,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -334,7 +334,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Guid_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -359,7 +359,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_MediaTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -376,7 +376,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_MediaType_With_PropertyType_Removed() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -403,7 +403,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_Video_MediaType() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -424,7 +424,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_PropertyTypes_On_File_MediaType() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 33141ecd77..5df0bf4a52 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -47,7 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -75,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Rebuild_All_Xml_Structures_For_Content_Type() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -118,7 +118,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void MemberRepository_Can_Get_Member_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -136,7 +136,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Members_By_Ids() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -158,7 +158,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void MemberRepository_Can_Get_All_Members() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -183,7 +183,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Can_Perform_GetByQuery_With_Key() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -205,7 +205,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Persist_Member() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -228,7 +228,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void New_Member_Has_Built_In_Properties_By_Default() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -262,7 +262,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Does_Not_Replace_Password_When_Null() { IMember sut; - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -291,7 +291,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void MemberRepository_Can_Update_Email_And_Login_When_Changed() { IMember sut; - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -338,7 +338,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IMember CreateTestMember(IMemberType memberType = null, string name = null, string email = null, string password = null, string username = null, Guid? key = null) { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; @@ -361,7 +361,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IMemberType CreateTestMemberType(string alias = null) { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MemberTypeRepository memberTypeRepository; MemberGroupRepository memberGroupRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs index 5f1ceb59b6..ed253a985f 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -38,7 +38,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Persist_Member_Type() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Cannot_Persist_Member_Type_Without_Alias() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -77,7 +77,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Member_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -101,7 +101,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Member_Types_By_Guid_Ids() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -125,7 +125,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Types_By_Guid_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -152,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_Members_When_No_Properties_Assigned() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -179,7 +179,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Type_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -194,7 +194,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Member_Type_By_Guid_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -209,7 +209,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Built_In_Member_Type_Properties_Are_Automatically_Added_When_Creating() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -229,7 +229,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Built_In_Member_Type_Properties_Are_Not_Reused_For_Different_Member_Types() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -250,7 +250,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Delete_MemberType() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs index 45fe3ce793..285c558e69 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs @@ -20,7 +20,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void CreateNotification() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repo = new NotificationsRepository(unitOfWork); @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void GetUserNotifications() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repo = new NotificationsRepository(unitOfWork); @@ -66,7 +66,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void GetEntityNotifications() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repo = new NotificationsRepository(unitOfWork); @@ -93,7 +93,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Delete_By_Entity() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repo = new NotificationsRepository(unitOfWork); @@ -120,7 +120,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Delete_By_User() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repo = new NotificationsRepository(unitOfWork); diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index b3051262d8..bddf41c54f 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); unitOfWork.Database.EnableSqlTrace = true; using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) @@ -93,7 +93,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); unitOfWork.Database.EnableSqlTrace = true; using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) @@ -138,7 +138,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -175,7 +175,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -202,7 +202,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -239,7 +239,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var content = CreateTestData(3).ToArray(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new PublicAccessRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -282,7 +282,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IEnumerable CreateTestData(int count) { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository ctRepo; using (var repo = CreateRepository(unitOfWork, out ctRepo)) diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index a30d1b3688..fdd3ce56f4 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -61,7 +61,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -108,7 +108,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -130,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -151,7 +151,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -172,7 +172,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -192,7 +192,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -211,7 +211,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_RelationRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -233,7 +233,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Delete_Content_And_Verify_Relation_Is_Removed() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); RelationTypeRepository repositoryType; using (var repository = CreateRepository(unitOfWork, out repositoryType)) @@ -263,7 +263,7 @@ namespace Umbraco.Tests.Persistence.Repositories var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), relationTypeRepository, MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index 8b0fdd5a39..07b5e57134 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -37,7 +37,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -107,7 +107,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -127,7 +127,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -147,7 +147,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_With_Params_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -167,7 +167,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -186,7 +186,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -204,7 +204,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_RelationTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -233,7 +233,7 @@ namespace Umbraco.Tests.Persistence.Repositories var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs index a47bddcedb..0a01a4c9ee 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Add_Duplicate_Server_Identities() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -57,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Cannot_Update_To_Duplicate_Server_Identities() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -75,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -110,7 +110,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_GetByQuery_On_Repository() //{ // // Arrange - // var provider = new NPocoUnitOfWorkProvider(Logger); + // var provider = CreateUowProvider(); // var unitOfWork = provider.GetUnitOfWork(); // using (var repository = CreateRepository(unitOfWork)) // { @@ -146,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_Count_On_Repository() //{ // // Arrange - // var provider = new NPocoUnitOfWorkProvider(Logger); + // var provider = CreateUowProvider(); // var unitOfWork = provider.GetUnitOfWork(); // using (var repository = CreateRepository(unitOfWork)) // { @@ -163,7 +163,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -182,7 +182,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -207,7 +207,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -228,7 +228,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -250,7 +250,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var unitOfWork = provider.GetUnitOfWork()) using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs index 77f1d7399d..ec34901e89 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs @@ -43,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -66,7 +66,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -99,7 +99,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Create_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Append_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -172,7 +172,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Replace_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -216,7 +216,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Merge_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -258,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Clear_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -296,7 +296,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Remove_Specific_Tags_From_Property() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -342,7 +342,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -389,7 +389,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_By_Key() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -436,7 +436,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -473,7 +473,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_All_With_Ids() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -515,7 +515,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Content_For_Group() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -561,7 +561,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -608,7 +608,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_By_Key() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -655,7 +655,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Property_For_Group() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -704,7 +704,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Entity_Type() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; ContentTypeRepository contentTypeRepository; @@ -766,7 +766,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tags_For_Entity_Type_For_Group() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; ContentTypeRepository contentTypeRepository; @@ -823,7 +823,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Cascade_Deletes_Tag_Relations() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); ContentTypeRepository contentTypeRepository; using (var contentRepository = CreateContentRepository(unitOfWork, out contentTypeRepository)) @@ -864,7 +864,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tagged_Entities_For_Tag_Group() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; ContentTypeRepository contentTypeRepository; @@ -951,7 +951,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Get_Tagged_Entities_For_Tag() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); MediaTypeRepository mediaTypeRepository; ContentTypeRepository contentTypeRepository; diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs index 2a6f58fb6b..5e8b8a36ef 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs @@ -16,7 +16,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -43,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Add() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -75,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Update() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -111,7 +111,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Get_By_Id() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -139,7 +139,7 @@ namespace Umbraco.Tests.Persistence.Repositories { CreateTestData(false, 20); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -154,7 +154,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10); CreateTestData(true, 5); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -169,7 +169,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10, -20); CreateTestData(false, 5, -21); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -184,7 +184,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(false, 10); CreateTestData(true, 5); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { @@ -195,7 +195,7 @@ namespace Umbraco.Tests.Persistence.Repositories private void CreateTestData(bool closed, int count, int entityId = -1) { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs index 15f2fec903..1f453e4148 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Repositories [Test] public void Can_Delete() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); var taskType = new TaskType("asdfasdf"); using (var repo = new TaskRepository(unitOfWork, CacheHelper, Logger, MappingResolver)) diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs index ab2556ed07..59c054e640 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs @@ -47,7 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Instantiate_Repository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); // Act @@ -64,7 +64,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_Detect_Content() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_With_Default_Content() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork, Mock.Of(x => x.DefaultRenderingEngine == RenderingEngine.WebForms))) { @@ -113,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_MasterPage_With_Default_Content_With_Parent() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork, Mock.Of(x => x.DefaultRenderingEngine == RenderingEngine.WebForms))) { @@ -142,7 +142,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -162,7 +162,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View_With_Default_Content() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -188,7 +188,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_View_With_Default_Content_With_Parent() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -216,7 +216,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_Unique_Alias() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -245,7 +245,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_Unique_Alias() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -280,7 +280,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_MasterPage() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -310,7 +310,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_View() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -340,7 +340,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_MasterPage() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -369,7 +369,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_View() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -398,7 +398,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_When_Assigned_To_Doc() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var templateRepository = CreateRepository(unitOfWork)) @@ -443,7 +443,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_Nested_Templates() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -484,7 +484,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Template_Tree() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -510,7 +510,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_All() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -537,7 +537,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Children() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -561,7 +561,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Children_At_Root() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -582,7 +582,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Get_Descendants() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -606,7 +606,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Path_Is_Set_Correctly_On_Creation() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -670,7 +670,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Path_Is_Set_Correctly_On_Update() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index db1e308adb..95801df939 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -65,7 +65,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -112,7 +112,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -162,7 +162,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -193,7 +193,7 @@ namespace Umbraco.Tests.Persistence.Repositories //public void Can_Perform_Delete_On_UserRepository_With_Permissions_Assigned() //{ // // Arrange - // var provider = new NPocoUnitOfWorkProvider(Logger); + // var provider = CreateUowProvider(); // var unitOfWork = provider.GetUnitOfWork(); // UserTypeRepository userTypeRepository; //using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -223,7 +223,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -244,7 +244,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -264,7 +264,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -285,7 +285,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -306,7 +306,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -325,7 +325,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_UserRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -345,7 +345,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Remove_Section_For_User() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -380,7 +380,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Add_Section_For_User() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -424,7 +424,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Update_Section_For_User() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -452,7 +452,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Get_Users_Assigned_To_Section() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); UserTypeRepository userTypeRepository; using (var repository = CreateRepository(unitOfWork, out userTypeRepository)) @@ -481,7 +481,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Default_User_Permissions_Based_On_User_Type() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); 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)) @@ -532,7 +532,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IUserType CreateAndCommitUserType() { - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = new UserTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, MappingResolver)) { diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs index b975775a9e..3f91ad48f7 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Add_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -59,7 +59,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Multiple_Adds_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -83,7 +83,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Verify_Fresh_Entity_Is_Not_Dirty() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -104,7 +104,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Update_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -131,7 +131,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Delete_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -161,7 +161,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Get_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -186,7 +186,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetByQuery_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -205,7 +205,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_By_Param_Ids_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_GetAll_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -245,7 +245,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Exists_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { @@ -263,7 +263,7 @@ namespace Umbraco.Tests.Persistence.Repositories public void Can_Perform_Count_On_UserTypeRepository() { // Arrange - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var repository = CreateRepository(unitOfWork)) { diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index 990bbfe121..109c49b228 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver)) @@ -177,7 +177,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver)) using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver)) @@ -206,7 +206,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 100); ServiceContext.ContentService.Save(pages, 0); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver)) @@ -240,7 +240,7 @@ namespace Umbraco.Tests.Services var pages = MockedContent.CreateTextpageContent(contentType, -1, 1000); ServiceContext.ContentService.Save(pages, 0); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var unitOfWork = provider.GetUnitOfWork(); using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of(), Mock.Of(), Mock.Of(), MappingResolver)) using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, MappingResolver)) diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index a8750d6cef..f2ba8fe86d 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -746,7 +746,7 @@ namespace Umbraco.Tests.Services var content = contentService.GetById(NodeDto.NodeIdSeed + 1); bool published = contentService.Publish(content, 0); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var uow = provider.GetUnitOfWork(); Assert.IsTrue(uow.Database.Exists(content.Id)); @@ -808,7 +808,7 @@ namespace Umbraco.Tests.Services } var allContent = rootContent.Concat(rootContent.SelectMany(x => x.Descendants())); //for testing we need to clear out the contentXml table so we can see if it worked - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var uow = provider.GetUnitOfWork()) { uow.Database.TruncateTable(SqlSyntax, "cmsContentXml"); @@ -842,7 +842,7 @@ namespace Umbraco.Tests.Services } var allContent = rootContent.Concat(rootContent.SelectMany(x => x.Descendants())).ToList(); //for testing we need to clear out the contentXml table so we can see if it worked - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var uow = provider.GetUnitOfWork()) { @@ -1337,7 +1337,8 @@ namespace Umbraco.Tests.Services Core.Configuration.GlobalSettings.UmbracoConnectionName, TestObjects.GetDefaultSqlSyntaxProviders(Logger), Logger, - new TestScopeContextFactory()); + new TestScopeContextFactory(), + MappingResolver); var provider = new NPocoUnitOfWorkProvider(databaseFactory); var unitOfWork = provider.GetUnitOfWork(); var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage"); @@ -1454,7 +1455,7 @@ namespace Umbraco.Tests.Services contentService.Save(content); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var uow = provider.GetUnitOfWork()) { @@ -1478,7 +1479,7 @@ namespace Umbraco.Tests.Services contentService.Save(content); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var uow = provider.GetUnitOfWork()) { diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs index f73e9cdd17..b5edf08f6d 100644 --- a/src/Umbraco.Tests/Services/MacroServiceTests.cs +++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.Services { base.CreateTestData(); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var unitOfWork = provider.GetUnitOfWork()) using (var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of(), MappingResolver)) { diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs index 35c2a9d1b9..2866b009b8 100644 --- a/src/Umbraco.Tests/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Services mediaService.Save(media); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); var uow = provider.GetUnitOfWork(); Assert.IsTrue(uow.Database.Exists(media.Id)); diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs index 51b9896070..a8b50d6636 100644 --- a/src/Umbraco.Tests/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs @@ -1057,7 +1057,7 @@ namespace Umbraco.Tests.Services var customMember = MockedMember.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello"); ServiceContext.MemberService.Save(customMember); - var provider = new NPocoUnitOfWorkProvider(Logger); + var provider = CreateUowProvider(); using (var uow = provider.GetUnitOfWork()) { diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs index aea2ce3db4..3cedb8c3eb 100644 --- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs +++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs @@ -6,6 +6,7 @@ using System.Data.Common; using System.Diagnostics; using System.Linq; using System.Threading; +using Moq; using NPoco; using NUnit.Framework; using Umbraco.Core; @@ -20,6 +21,8 @@ using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Core.Events; +using Umbraco.Core.Persistence.Mappers; +using Umbraco.Core.Persistence.Querying; namespace Umbraco.Tests.Services { @@ -34,14 +37,12 @@ namespace Umbraco.Tests.Services public override void Initialize() { base.Initialize(); - - var sqlSyntax = new SqlCeSyntaxProvider(); - + //we need to use our own custom IDatabaseFactory for the DatabaseContext because we MUST ensure that //a Database instance is created per thread, whereas the default implementation which will work in an HttpContext //threading environment, or a single apartment threading environment will not work for this test because //it is multi-threaded. - _dbFactory = new PerThreadSqlCeDatabaseFactory(Logger); + _dbFactory = new PerThreadSqlCeDatabaseFactory(Logger, Mock.Of()); _uowProvider = new NPocoUnitOfWorkProvider(_dbFactory); // overwrite the local object @@ -240,8 +241,10 @@ namespace Umbraco.Tests.Services // them all in one call private readonly ILogger _logger; + private readonly IMappingResolver _mappingResolver; + private IQueryFactory _queryFactory; - private readonly DbProviderFactory _dbProviderFactory = + private readonly DbProviderFactory _dbProviderFactory = DbProviderFactories.GetFactory(Constants.DbProviderNames.SqlCe); public bool Configured => true; @@ -254,12 +257,15 @@ namespace Umbraco.Tests.Services public ISqlSyntaxProvider SqlSyntax { get; } = new SqlCeSyntaxProvider(); + public IQueryFactory QueryFactory => _queryFactory ?? (_queryFactory = new QueryFactory(SqlSyntax, _mappingResolver)); + public DatabaseType DatabaseType => DatabaseType.SQLCe; - public PerThreadSqlCeDatabaseFactory(ILogger logger) - { + public PerThreadSqlCeDatabaseFactory(ILogger logger, IMappingResolver mappingResolver) + { _logger = logger; - } + _mappingResolver = mappingResolver; + } private readonly ConcurrentDictionary _databases = new ConcurrentDictionary(); diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index ab76e90b1c..dfd69bf579 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -107,7 +107,7 @@ namespace Umbraco.Tests.TestHelpers // use a mock factory; otherwise use a real factory. var databaseFactory = DatabaseTestBehavior == DatabaseBehavior.NoDatabasePerFixture ? TestObjects.GetIDatabaseFactoryMock() - : new DefaultDatabaseFactory(GetDbConnectionString(), GetDbProviderName(), sqlSyntaxProviders, Logger, new TestScopeContextFactory()); + : new DefaultDatabaseFactory(GetDbConnectionString(), GetDbProviderName(), sqlSyntaxProviders, Logger, new TestScopeContextFactory(), MappingResolver); // so, using the above code to create a mock IDatabaseFactory if we don't have a real database // but, that will NOT prevent _appContext from NOT being configured, because it cannot connect @@ -444,5 +444,10 @@ namespace Umbraco.Tests.TestHelpers "; } + + protected NPocoUnitOfWorkProvider CreateUowProvider() + { + return new NPocoUnitOfWorkProvider(Logger, MappingResolver); + } } } \ No newline at end of file diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs index bcfce32c93..8f24ea271a 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs @@ -221,11 +221,12 @@ namespace Umbraco.Tests.TestHelpers new DatabaseContext(new DefaultDatabaseFactory( Core.Configuration.GlobalSettings.UmbracoConnectionName, TestObjects.GetDefaultSqlSyntaxProviders(Logger), - Logger, new TestScopeContextFactory()), Logger), + Logger, new TestScopeContextFactory(), + Mock.Of()), Logger), //assign the service context TestObjects.GetServiceContext( Container.GetInstance(), - new NPocoUnitOfWorkProvider(Logger), + new NPocoUnitOfWorkProvider(Logger, Mock.Of()), new FileUnitOfWorkProvider(), new PublishingStrategy(evtMsgs, Logger), CacheHelper, diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs index 7d78e33e04..7444c45eae 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs @@ -11,6 +11,8 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.Mappers; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Services; using Umbraco.Core.Strings; @@ -73,7 +75,7 @@ namespace Umbraco.Tests.UmbracoExamine && x.GetPagedDescendants( - It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()) + It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>()) == allRecs); } @@ -117,7 +119,7 @@ namespace Umbraco.Tests.UmbracoExamine && x.GetPagedDescendants( - It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()) + It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>()) == allRecs); } @@ -159,10 +161,10 @@ namespace Umbraco.Tests.UmbracoExamine contentService, mediaService, userService, - new SqlCeSyntaxProvider(), new[] { new DefaultUrlSegmentProvider() }, new UmbracoContentValueSetValidator(options, Mock.Of()), - options); + options, + Mock.Of()); i.IndexingError += IndexingError; diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs index 55e9bdec50..32138f7216 100644 --- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs +++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs @@ -12,6 +12,7 @@ using Examine.Session; using Moq; using Umbraco.Core.Models; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Services; namespace Umbraco.Tests.UmbracoExamine @@ -49,7 +50,7 @@ namespace Umbraco.Tests.UmbracoExamine .ToArray(); var contentService = Mock.Of( x => x.GetPagedDescendants( - It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()) + It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>()) == allRecs); diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 1e1590bf7a..53c165c139 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -30,6 +30,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Dynamics; using umbraco.cms.businesslogic.web; using umbraco.presentation.preview; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.PropertyEditors; using Umbraco.Web.UI; using Constants = Umbraco.Core.Constants; @@ -190,21 +191,20 @@ namespace Umbraco.Web.Editors IContent[] children; if (pageNumber > 0 && pageSize > 0) { - string f = filter; - object[] fa = null; + IQuery queryFilter = null; if (filter.IsNullOrWhiteSpace() == false) { - //add the default text filter - f = $"cmsDocument.{DatabaseContext.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + //add the default text filter + queryFilter = DatabaseContext.QueryFactory.Create() + .Where(x => x.Name.Contains(filter)); } - + children = Services.ContentService .GetPagedChildren( id, (pageNumber - 1), pageSize, out totalChildren, - orderBy, orderDirection, orderBySystemField, - f, fa).ToArray(); + orderBy, orderDirection, orderBySystemField, + queryFilter).ToArray(); } else { diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index a7536cbd6b..4ef8460832 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -33,6 +33,7 @@ using umbraco; using Constants = Umbraco.Core.Constants; using Umbraco.Core.Configuration; using Umbraco.Core.Persistence.FaultHandling; +using Umbraco.Core.Persistence.Querying; using Umbraco.Web.UI; using Notification = Umbraco.Web.Models.ContentEditing.Notification; @@ -186,13 +187,12 @@ namespace Umbraco.Web.Editors IMedia[] children; if (pageNumber > 0 && pageSize > 0) { - string f = filter; - object[] fa = null; + IQuery queryFilter = null; if (filter.IsNullOrWhiteSpace() == false) { - //add the default text filter - f = $"umbracoNode.{DatabaseContext.SqlSyntax.GetQuotedColumnName("text")} LIKE @0"; - fa = new object[] { $"%{filter}%" }; + //add the default text filter + queryFilter = DatabaseContext.QueryFactory.Create() + .Where(x => x.Name.Contains(filter)); } children = Services.MediaService @@ -200,7 +200,7 @@ namespace Umbraco.Web.Editors id, (pageNumber - 1), pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, - f, fa).ToArray(); + queryFilter).ToArray(); } else { diff --git a/src/UmbracoExamine/UmbracoContentIndexer.cs b/src/UmbracoExamine/UmbracoContentIndexer.cs index 7c6a64e4f5..5924cc8eac 100644 --- a/src/UmbracoExamine/UmbracoContentIndexer.cs +++ b/src/UmbracoExamine/UmbracoContentIndexer.cs @@ -20,6 +20,7 @@ using Lucene.Net.Analysis; using Lucene.Net.Store; using Umbraco.Core.Logging; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using IContentService = Umbraco.Core.Services.IContentService; using IMediaService = Umbraco.Core.Services.IMediaService; @@ -35,8 +36,8 @@ namespace UmbracoExamine protected IContentService ContentService { get; private set; } protected IMediaService MediaService { get; private set; } protected IUserService UserService { get; private set; } - private readonly ISqlSyntaxProvider _sqlSyntax; private readonly IEnumerable _urlSegmentProviders; + private readonly IQueryFactory _queryFactory; private int? _parentId; #region Constructors @@ -51,7 +52,7 @@ namespace UmbracoExamine MediaService = ApplicationContext.Current.Services.MediaService; UserService = ApplicationContext.Current.Services.UserService; _urlSegmentProviders = UrlSegmentProviderResolver.Current.Providers; - _sqlSyntax = ApplicationContext.Current.DatabaseContext.SqlSyntax; + _queryFactory = ApplicationContext.Current.DatabaseContext.QueryFactory; } public UmbracoContentIndexer( @@ -62,10 +63,10 @@ namespace UmbracoExamine IContentService contentService, IMediaService mediaService, IUserService userService, - ISqlSyntaxProvider sqlSyntax, IEnumerable urlSegmentProviders, IValueSetValidator validator, UmbracoContentIndexerOptions options, + IQueryFactory queryFactory, FacetConfiguration facetConfiguration = null, IDictionary> indexValueTypes = null) : base(fieldDefinitions, luceneDirectory, defaultAnalyzer, profilingLogger, validator, facetConfiguration, indexValueTypes) @@ -73,10 +74,10 @@ namespace UmbracoExamine if (contentService == null) throw new ArgumentNullException("contentService"); if (mediaService == null) throw new ArgumentNullException("mediaService"); if (userService == null) throw new ArgumentNullException("userService"); - if (sqlSyntax == null) throw new ArgumentNullException("sqlSyntax"); if (urlSegmentProviders == null) throw new ArgumentNullException("urlSegmentProviders"); if (validator == null) throw new ArgumentNullException("validator"); if (options == null) throw new ArgumentNullException("options"); + if (queryFactory == null) throw new ArgumentNullException(nameof(queryFactory)); SupportProtectedContent = options.SupportProtectedContent; SupportUnpublishedContent = options.SupportUnpublishedContent; @@ -89,8 +90,8 @@ namespace UmbracoExamine ContentService = contentService; MediaService = mediaService; UserService = userService; - _sqlSyntax = sqlSyntax; _urlSegmentProviders = urlSegmentProviders; + _queryFactory = queryFactory; } @@ -242,9 +243,9 @@ namespace UmbracoExamine else { //add the published filter - var f = $"cmsDocument.{_sqlSyntax.GetQuotedColumnName("published")}=@0"; - var fa = new object[] { 1 }; - descendants = ContentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out total, "Path", Direction.Ascending, true, f, fa); + var qry = _queryFactory.Create().Where(x => x.Published == true); + + descendants = ContentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out total, "Path", Direction.Ascending, true, qry); } //if specific types are declared we need to post filter them