Fixes some resetting being done in test init... should only be done in teardown.
This commit is contained in:
@@ -17,8 +17,6 @@ namespace Umbraco.Tests.Models
|
||||
[SetUp]
|
||||
public override void Initialize()
|
||||
{
|
||||
Resolution.Reset();
|
||||
|
||||
//this ensures its reset
|
||||
PluginManager.Current = new PluginManager();
|
||||
|
||||
@@ -29,7 +27,6 @@ namespace Umbraco.Tests.Models
|
||||
typeof(tinyMCE3dataType).Assembly
|
||||
};
|
||||
|
||||
DataTypesResolver.Reset();
|
||||
DataTypesResolver.Current = new DataTypesResolver(
|
||||
() => PluginManager.Current.ResolveDataTypes());
|
||||
|
||||
|
||||
@@ -75,8 +75,6 @@ namespace Umbraco.Tests.PublishedContent
|
||||
|
||||
UmbracoContext.Current = umbContext;
|
||||
PublishedMediaStoreResolver.Current = new PublishedMediaStoreResolver(new DefaultPublishedMediaStore());
|
||||
|
||||
UmbracoSettings.ForceSafeAliases = true;
|
||||
}
|
||||
|
||||
public override void TearDown()
|
||||
|
||||
@@ -32,8 +32,7 @@ namespace Umbraco.Tests.TestHelpers
|
||||
public virtual void Initialize()
|
||||
{
|
||||
TestHelper.SetupLog4NetForTests();
|
||||
Resolution.Reset();
|
||||
RepositoryResolver.Reset();
|
||||
|
||||
TestHelper.InitializeContentDirectories();
|
||||
|
||||
string path = TestHelper.CurrentAssemblyDirectory;
|
||||
@@ -84,11 +83,7 @@ namespace Umbraco.Tests.TestHelpers
|
||||
//called so that inheritors can do stuff before freezing.
|
||||
OnFreezing();
|
||||
|
||||
Resolution.Freeze();
|
||||
|
||||
//if (RequiresDbSetup)
|
||||
// TestHelper.InitializeDatabase();
|
||||
|
||||
Resolution.Freeze();
|
||||
}
|
||||
|
||||
protected virtual void OnFreezing()
|
||||
@@ -111,7 +106,6 @@ namespace Umbraco.Tests.TestHelpers
|
||||
SqlCeContextGuardian.CloseBackgroundConnection();
|
||||
}
|
||||
|
||||
|
||||
ApplicationContext.Current = null;
|
||||
RepositoryResolver.Reset();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user