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

Refactor, fix collection builders, fix tests

Browse Source
This commit is contained in:
Stephan
2018-07-21 10:47:29 +02:00
parent 981152b693
commit a00f2f0bb9
25 changed files with 159 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -113,7 +113,7 @@ namespace Umbraco.Tests.Testing
// but hey, never know, better avoid garbage-in
Reset();
Container = Current.Container = new Core.Composing.LightInject.LightInjectContainer(new LightInject.ServiceContainer());
Container = Current.Container = Core.Composing.LightInject.LightInjectContainer.Create();
Container.ConfigureForUmbraco();
TestObjects = new TestObjects(Container);
@@ -286,6 +286,10 @@ namespace Umbraco.Tests.Testing
Container.RegisterSingleton<IExamineManager>(factory => ExamineManager.Instance);
// register filesystems
Container.RegisterSingleton(factory => TestObjects.GetFileSystemsMock());
Container.RegisterSingleton(factory => factory.GetInstance<IFileSystems>().MediaFileSystem);
// no factory (noop)
Container.RegisterSingleton<IPublishedModelFactory, NoopPublishedModelFactory>();
@@ -304,8 +308,7 @@ namespace Umbraco.Tests.Testing
Container.RegisterSingleton(f => f.TryGetInstance<IUmbracoDatabaseFactory>().SqlContext);
Container.RegisterCollectionBuilder<UrlSegmentProviderCollectionBuilder>(); // empty
Container.RegisterSingleton(factory => new FileSystems(factory.TryGetInstance<ILogger>()));
Container.RegisterSingleton<IFileSystems>(factory => factory.GetInstance<FileSystems>());
Container.RegisterSingleton(factory
=> TestObjects.GetScopeProvider(factory.TryGetInstance<ILogger>(), factory.TryGetInstance<FileSystems>(), factory.TryGetInstance<IUmbracoDatabaseFactory>()));
Container.RegisterSingleton(factory => (IScopeAccessor) factory.GetInstance<IScopeProvider>());