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

Changes methods to properties since we don't return new instances each time.

Browse Source
This commit is contained in:
Shannon
2020-03-23 16:41:39 +11:00
parent 299e9eb209
commit 427c44468f
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Umbraco.Tests.Common/TestHelperBase.cs
View File

@@ -48,11 +48,14 @@ namespace Umbraco.Tests.Common
return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
}
public Configs GetConfigs()
public Configs Configs
{
if (_configs == null)
_configs = GetConfigsFactory().Create();
return _configs;
get
{
if (_configs == null)
_configs = ConfigsFactory.Create();
return _configs;
}
}
public IRuntimeState GetRuntimeState()
@@ -62,7 +65,7 @@ namespace Umbraco.Tests.Common
Mock.Of<IGlobalSettings>(),
new Lazy<IMainDom>(),
new Lazy<IServerRegistrar>(),
GetUmbracoVersion(),
UmbracoVersion,
GetHostingEnvironment(),
GetBackOfficeInfo()
);
@@ -70,11 +73,14 @@ namespace Umbraco.Tests.Common
public abstract IBackOfficeInfo GetBackOfficeInfo();
public IConfigsFactory GetConfigsFactory()
public IConfigsFactory ConfigsFactory
{
if (_configsFactory == null)
_configsFactory = new ConfigsFactory();
return _configsFactory;
get
{
if (_configsFactory == null)
_configsFactory = new ConfigsFactory();
return _configsFactory;
}
}
/// <summary>
@@ -137,16 +143,19 @@ namespace Umbraco.Tests.Common
return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
}
public IUmbracoVersion GetUmbracoVersion()
public IUmbracoVersion UmbracoVersion
{
if (_umbracoVersion == null)
_umbracoVersion = new UmbracoVersion(GetConfigs().Global());
return _umbracoVersion;
get
{
if (_umbracoVersion == null)
_umbracoVersion = new UmbracoVersion(Configs.Global());
return _umbracoVersion;
}
}
public IRegister GetRegister()
{
return RegisterFactory.Create(GetConfigs().Global());
return RegisterFactory.Create(Configs.Global());
}
public abstract IHostingEnvironment GetHostingEnvironment();

4
src/Umbraco.Tests.Integration/ContainerTests.cs
View File

@@ -42,10 +42,10 @@ namespace Umbraco.Tests.Integration
// Register in the container
var composition = new Composition(umbracoContainer, typeLoader,
testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
testHelper.Logger, runtimeState, testHelper.Configs, testHelper.IOHelper, testHelper.AppCaches);
composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
testHelper.IOHelper, testHelper.UmbracoVersion, dbProviderFactoryCreator);
// Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);

2
src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
View File

@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Integration.Implementations
public override IBackOfficeInfo GetBackOfficeInfo()
{
if (_backOfficeInfo == null)
_backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion()));
_backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(UmbracoVersion));
return _backOfficeInfo;
}

2
src/Umbraco.Tests.Integration/RuntimeTests.cs
View File

@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Integration
// Create the core runtime
var testHelper = new TestHelper();
var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
var coreRuntime = new CoreRuntime(testHelper.Configs, testHelper.UmbracoVersion,
testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
testHelper.MainDom, testHelper.GetTypeFinder());

8
src/Umbraco.Tests/TestHelpers/TestHelper.cs
View File

@@ -56,7 +56,7 @@ namespace Umbraco.Tests.TestHelpers
public override IBackOfficeInfo GetBackOfficeInfo()
=> new AspNetBackOfficeInfo(
SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
SettingsForTests.GenerateMockGlobalSettings(UmbracoVersion),
TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
public override IHostingEnvironment GetHostingEnvironment()
@@ -70,13 +70,13 @@ namespace Umbraco.Tests.TestHelpers
public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
public static Configs GetConfigs() => _testHelperInternal.Configs;
public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.ConfigsFactory;
/// <summary>
/// Gets the current assembly directory.
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.TestHelpers
}
public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.UmbracoVersion;
public static IRegister GetRegister() => _testHelperInternal.GetRegister();