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

Resvolution - MappingResolver

Browse Source
This commit is contained in:
Stephan
2016-08-17 11:50:38 +02:00
parent 648632bd36
commit aa8b8c7736
84 changed files with 382 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ namespace Umbraco.Tests.TestHelpers
}
else
{
var f = new DefaultDatabaseFactory(GetDbConnectionString(), GetDbProviderName(), sqlSyntaxProviders, Logger, new TestUmbracoDatabaseAccessor(), MappingResolver);
var f = new DefaultDatabaseFactory(GetDbConnectionString(), GetDbProviderName(), sqlSyntaxProviders, Logger, new TestUmbracoDatabaseAccessor(), Mappers);
f.ResetForTests();
databaseFactory = f;
}

7
src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
View File

@@ -132,10 +132,7 @@ namespace Umbraco.Tests.TestHelpers
private static readonly object Locker = new object();
protected IMappingResolver MappingResolver
{
get { return Container.GetInstance<IMappingResolver>(); }
}
protected IMapperCollection Mappers => Container.GetInstance<IMapperCollection>();
private static void InitializeLegacyMappingsForCoreEditors()
{
@@ -218,7 +215,7 @@ namespace Umbraco.Tests.TestHelpers
Core.Configuration.GlobalSettings.UmbracoConnectionName,
TestObjects.GetDefaultSqlSyntaxProviders(Logger),
Logger, new TestUmbracoDatabaseAccessor(),
Mock.Of<IMappingResolver>());
Mock.Of<IMapperCollection>());
dbFactory.ResetForTests();
var applicationContext = new ApplicationContext(
// assign the db context

13
src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
View File

@@ -18,9 +18,7 @@ namespace Umbraco.Tests.TestHelpers
[TestFixture]
public abstract class BaseUsingSqlCeSyntax
{
private MappingResolver _mappingResolver;
protected IMappingResolver MappingResolver => _mappingResolver;
protected IMapperCollection Mappers { get; private set; }
protected SqlContext SqlContext { get; private set; }
@@ -40,16 +38,17 @@ namespace Umbraco.Tests.TestHelpers
container.RegisterSingleton<ILogger>(factory => Mock.Of<ILogger>());
container.RegisterSingleton<IProfiler>(factory => Mock.Of<IProfiler>());
_mappingResolver = new MappingResolver(container, Mock.Of<ILogger>(),
() => PluginManager.Current.ResolveAssignedMapperTypes());
var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
var pluginManager = PluginManager.Current = new PluginManager(new NullCacheProvider(),
logger,
false);
container.RegisterInstance(pluginManager);
var mappers = new MapperCollection { new PocoMapper() };
MapperCollectionBuilder.Register(container)
.AddProducer(() => PluginManager.Current.ResolveAssignedMapperTypes());
Mappers = container.GetInstance<IMapperCollection>();
var mappers = new NPoco.MapperCollection { new PocoMapper() };
var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, mappers).Init());
SqlContext = new SqlContext(sqlSyntax, pocoDataFactory, DatabaseType.SQLCe);

4
src/Umbraco.Tests/TestHelpers/TestObjects.cs
View File

@@ -203,8 +203,8 @@ namespace Umbraco.Tests.TestHelpers
public static IDatabaseUnitOfWorkProvider GetDatabaseUnitOfWorkProvider(ILogger logger)
{
var adapter = new TestUmbracoDatabaseAccessor();
var mappingResolver = Mock.Of<IMappingResolver>();
var databaseFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, adapter, mappingResolver);
var mappers = Mock.Of<IMapperCollection>();
var databaseFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, adapter, mappers);
var repositoryFactory = new RepositoryFactory(Mock.Of<IServiceContainer>());
return new NPocoUnitOfWorkProvider(databaseFactory, repositoryFactory);
}