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

Core.ObjectsResolution - refactor, cleanup, sanitize, ensure we properly freeze

Browse Source
This commit is contained in:
Stephan
2013-01-16 13:31:04 -01:00
parent bfd8e96f71
commit 01b4e8d59c
29 changed files with 151 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/CacheRefreshersResolver.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Core
{
get
{
EnsureIdsAreTracked();
EnsureIsInitialized();
return Values;
}
}

1
src/Umbraco.Core/CoreBootManager.cs
View File

@@ -12,6 +12,7 @@ using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSix;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Macros;
using Umbraco.Core.Services;
using MigrationsVersionFourNineZero = Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionFourNineZero;

2
src/Umbraco.Core/DataTypesResolver.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Core
{
get
{
EnsureIdsAreTracked();
EnsureIsInitialized();
return Values;
}
}

8
src/Umbraco.Core/ObjectResolution/MacroFieldEditorsResolver.cs → src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
View File

@@ -1,15 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using Umbraco.Core.Macros;
using System.Linq;
using Umbraco.Core.ObjectResolution;
using umbraco.interfaces;
namespace Umbraco.Core.ObjectResolution
namespace Umbraco.Core.Macros
{
// FIXME - specific resolvers should not be in Umbraco.Core.ObjectResolution ??
/// <summary>
/// A resolver to return all IMacroGuiRendering objects
/// </summary>

20
src/Umbraco.Core/ObjectResolution/LazyManyObjectsResolverbase.cs
View File

@@ -149,9 +149,8 @@ namespace Umbraco.Core.ObjectResolution
{
EnsureAddSupport();
EnsureResolutionNotFrozen();
using (GetWriteLock())
using (Resolution.Configuration)
using (GetWriteLock())
{
foreach (var t in types)
{
@@ -168,9 +167,8 @@ namespace Umbraco.Core.ObjectResolution
{
EnsureAddSupport();
EnsureResolutionNotFrozen();
using (GetWriteLock())
using (Resolution.Configuration)
using (GetWriteLock())
{
_listOfTypeListDelegates.Add(typeListDelegate);
}
@@ -184,9 +182,8 @@ namespace Umbraco.Core.ObjectResolution
{
EnsureAddSupport();
EnsureResolutionNotFrozen();
using (GetWriteLock())
using (Resolution.Configuration)
using (GetWriteLock())
{
_lazyTypeList.Add(value);
}
@@ -208,9 +205,8 @@ namespace Umbraco.Core.ObjectResolution
{
EnsureClearSupport();
EnsureResolutionNotFrozen();
using (GetWriteLock())
using (Resolution.Configuration)
using (GetWriteLock())
{
_lazyTypeList.Clear();
}

55
src/Umbraco.Core/ObjectResolution/LegacyTransientObjectsResolver.cs
View File

@@ -7,10 +7,10 @@ using System.Threading;
namespace Umbraco.Core.ObjectResolution
{
/// <summary>
/// A base resolver used for old legacy factories such as the DataTypeFactory or CacheResolverFactory.
/// The base class for old legacy factories such as the DataTypeFactory or CacheResolverFactory.
/// </summary>
/// <typeparam name="TResolver"></typeparam>
/// <typeparam name="TResolved"> </typeparam>
/// <typeparam name="TResolver">The type of the concrete resolver class.</typeparam>
/// <typeparam name="TResolved">The type of the resolved objects.</typeparam>
/// <remarks>
/// This class contains basic functionality to mimic the functionality in these old factories since they all return
/// transient objects (though this should be changed) and the method GetById needs to lookup a type to an ID and since
@@ -21,7 +21,9 @@ namespace Umbraco.Core.ObjectResolution
where TResolved : class
where TResolver : class
{
private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
private ConcurrentDictionary<Guid, Type> _id2type;
#region Constructors
/// <summary>
@@ -40,46 +42,45 @@ namespace Umbraco.Core.ObjectResolution
#endregion
/// <summary>
/// Maintains a list of Ids and their types when first call to CacheResolvers or GetById occurs, this is used
/// in order to return a single object by id without instantiating the entire type stack.
/// Returns the unique identifier of the type of a specified object.
/// </summary>
private ConcurrentDictionary<Guid, Type> _trackIdToType;
private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
/// <param name="value">The object.</param>
/// <returns>The unique identifier of the type of <paramref name="value"/>.</returns>
protected abstract Guid GetUniqueIdentifier(TResolved value);
/// <summary>
/// method to return the unique id for type T
/// Returns a new instance for the type identified by its unique type identifier.
/// </summary>
/// <param name="obj"></param>
/// <returns></returns>
protected abstract Guid GetUniqueIdentifier(TResolved obj);
/// <summary>
/// Returns a new TResolved instance by id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
/// <param name="id">The type identifier.</param>
/// <returns>The value of the type uniquely identified by <paramref name="id"/>.</returns>
public TResolved GetById(Guid id)
{
EnsureIdsAreTracked();
return !_trackIdToType.ContainsKey(id)
EnsureIsInitialized();
return !_id2type.ContainsKey(id)
? null
: PluginManager.Current.CreateInstance<TResolved>(_trackIdToType[id]);
: PluginManager.Current.CreateInstance<TResolved>(_id2type[id]);
}
/// <summary>
/// Populates the ids -> Type dictionary to allow us to instantiate a type by Id since these legacy types doesn't contain any metadata
/// Populates the identifiers-to-types dictionnary.
/// </summary>
protected void EnsureIdsAreTracked()
/// <remarks>
/// <para>This allow us to instantiate a type by ID since these legacy types doesn't contain any metadata.</para>
/// <para>We instanciate all types once to get their unique identifier, then build the dictionary so that
/// when GetById is called, we can instanciate a single object.</para>
/// </remarks>
protected void EnsureIsInitialized()
{
using (var l = new UpgradeableReadLock(_lock))
{
if (_trackIdToType == null)
if (_id2type == null)
{
l.UpgradeToWriteLock();
_trackIdToType = new ConcurrentDictionary<Guid, Type>();
foreach (var v in Values)
_id2type = new ConcurrentDictionary<Guid, Type>();
foreach (var value in Values)
{
_trackIdToType.TryAdd(GetUniqueIdentifier(v), v.GetType());
_id2type.TryAdd(GetUniqueIdentifier(value), value.GetType());
}
}
}

47
src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
View File

@@ -17,6 +17,7 @@ namespace Umbraco.Core.ObjectResolution
{
private IEnumerable<TResolved> _applicationInstances = null;
private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
private readonly string _httpContextKey;
private readonly List<Type> _instanceTypes = new List<Type>();
private int _defaultPluginWeight = 10;
@@ -41,6 +42,8 @@ namespace Umbraco.Core.ObjectResolution
}
LifetimeScope = scope;
if (scope == ObjectLifetimeScope.HttpRequest)
_httpContextKey = this.GetType().FullName;
_instanceTypes = new List<Type>();
}
@@ -56,6 +59,7 @@ namespace Umbraco.Core.ObjectResolution
if (httpContext == null)
throw new ArgumentNullException("httpContext");
LifetimeScope = ObjectLifetimeScope.HttpRequest;
_httpContextKey = this.GetType().FullName;
CurrentHttpContext = httpContext;
_instanceTypes = new List<Type>();
}
@@ -155,10 +159,10 @@ namespace Umbraco.Core.ObjectResolution
protected IEnumerable<TResolved> Values
{
get
{
// cannot return values unless resolution is frozen, or we can
if (!CanResolveBeforeFrozen && !Resolution.IsFrozen)
throw new InvalidOperationException("Values cannot be returned until resolution is frozen");
{
// ensure we can
if (!CanResolveBeforeFrozen)
Resolution.EnsureIsFrozen();
// note: we apply .ToArray() to the output of CreateInstance() because that is an IEnumerable that
// comes from the PluginManager we want to be _sure_ that it's not a Linq of some sort, but the
@@ -168,16 +172,15 @@ namespace Umbraco.Core.ObjectResolution
{
case ObjectLifetimeScope.HttpRequest:
// create new instances per HttpContext
var key = this.GetType().FullName; // use full type name as key
using (var l = new UpgradeableReadLock(_lock))
{
// create if not already there
if (CurrentHttpContext.Items[key] == null)
if (CurrentHttpContext.Items[_httpContextKey] == null)
{
l.UpgradeToWriteLock();
CurrentHttpContext.Items[key] = CreateInstances().ToArray();
CurrentHttpContext.Items[_httpContextKey] = CreateInstances().ToArray();
}
return (List<TResolved>)CurrentHttpContext.Items[key];
return (List<TResolved>)CurrentHttpContext.Items[_httpContextKey];
}
case ObjectLifetimeScope.Application:
@@ -210,11 +213,13 @@ namespace Umbraco.Core.ObjectResolution
return PluginManager.Current.CreateInstances<TResolved>(InstanceTypes);
}
#region Types collection manipulation
/// <summary>
/// Ensures that a type is a valid type for the resolver.
/// </summary>
/// <param name="value">The type to test.</param>
/// <exception cref="InvalidOperationException"> the type is not a valid type for the resolver.</exception>
/// <exception cref="InvalidOperationException">the type is not a valid type for the resolver.</exception>
protected void EnsureCorrectType(Type value)
{
if (!TypeHelper.IsTypeAssignableFrom<TResolved>(value))
@@ -222,8 +227,6 @@ namespace Umbraco.Core.ObjectResolution
"Type {0} is not an acceptable type for resolver {1}.", value.FullName, this.GetType().FullName));
}
#region Types collection manipulation
/// <summary>
/// Removes a type.
/// </summary>
@@ -233,8 +236,8 @@ namespace Umbraco.Core.ObjectResolution
public virtual void RemoveType(Type value)
{
EnsureRemoveSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (var l = new UpgradeableReadLock(_lock))
{
EnsureCorrectType(value);
@@ -265,8 +268,8 @@ namespace Umbraco.Core.ObjectResolution
protected void AddTypes(IEnumerable<Type> types)
{
EnsureAddSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (new WriteLock(_lock))
{
foreach(var t in types)
@@ -292,8 +295,8 @@ namespace Umbraco.Core.ObjectResolution
public virtual void AddType(Type value)
{
EnsureAddSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (var l = new UpgradeableReadLock(_lock))
{
EnsureCorrectType(value);
@@ -327,8 +330,8 @@ namespace Umbraco.Core.ObjectResolution
public virtual void Clear()
{
EnsureClearSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (new WriteLock(_lock))
{
_instanceTypes.Clear();
@@ -346,8 +349,8 @@ namespace Umbraco.Core.ObjectResolution
public virtual void InsertType(int index, Type value)
{
EnsureInsertSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (var l = new UpgradeableReadLock(_lock))
{
EnsureCorrectType(value);
@@ -373,6 +376,7 @@ namespace Umbraco.Core.ObjectResolution
InsertType(index, typeof(T));
}
/// <summary>
/// Inserts a type before a specified, already existing type.
/// </summary>
/// <param name="existingType">The existing type before which to insert.</param>
@@ -383,8 +387,8 @@ namespace Umbraco.Core.ObjectResolution
public virtual void InsertTypeBefore(Type existingType, Type value)
{
EnsureInsertSupport();
EnsureResolutionNotFrozen();
using (Resolution.Configuration)
using (var l = new UpgradeableReadLock(_lock))
{
EnsureCorrectType(existingType);
@@ -452,15 +456,6 @@ namespace Umbraco.Core.ObjectResolution
{
return new WriteLock(_lock);
}
/// <summary>
/// Throws an exception if resolution is frozen
/// </summary>
protected void EnsureResolutionNotFrozen()
{
if (Resolution.IsFrozen)
throw new InvalidOperationException("The type list cannot be modified after resolution has been frozen");
}
/// <summary>
/// Throws an exception if this does not support Remove

45
src/Umbraco.Core/ObjectResolution/Resolution.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Threading;
namespace Umbraco.Core.ObjectResolution
{
@@ -6,12 +7,12 @@ namespace Umbraco.Core.ObjectResolution
/// Represents the status of objects resolution.
/// </summary>
/// <remarks>
/// <para>Objects resolution can be frozen ie nothing can change anymore.</para>
/// <para>Nothing in resolution is thread-safe, because everything should take place when the application is starting.</para>
/// <para>Before resolution is frozen it is possible to access its configuration, but not to get values.</para>
/// <para>Once resolution is frozen, it is not possible to access its configuration anymore, but it is possible to get values.</para>
/// </remarks>
internal class Resolution
internal static class Resolution
{
// NOTE : must clarify freezing... SingleObjectResolverBase does not honor it...
private static readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
/// <summary>
/// Occurs when resolution is frozen.
@@ -22,17 +23,30 @@ namespace Umbraco.Core.ObjectResolution
/// <summary>
/// Gets or sets a value indicating whether resolution of objects is frozen.
/// </summary>
/// <remarks>The internal setter is to be used in unit tests.</remarks>
public static bool IsFrozen { get; internal set; }
public static bool IsFrozen { get; private set; }
public static void EnsureIsFrozen()
{
if (!IsFrozen)
throw new Exception("Resolution is not frozen, it is not yet possible to get values from it.");
}
/// <summary>
/// Ensures that resolution is not frozen, else throws.
/// Returns a disposable object that represents safe access to unfrozen resolution configuration.
/// </summary>
/// <exception cref="InvalidOperationException">resolution is frozen.</exception>
public static void EnsureNotFrozen()
/// <remarks>Should be used in a <c>using(Resolution.Configuration) { ... }</c> mode.</remarks>
public static IDisposable Configuration
{
if (Resolution.IsFrozen)
throw new InvalidOperationException("Resolution is frozen. It is not possible to modify resolvers once resolution is frozen.");
get
{
IDisposable l = new WriteLock(_lock);
if (Resolution.IsFrozen)
{
l.Dispose();
throw new InvalidOperationException("Resolution is frozen, it is not possible to configure it anymore.");
}
return l;
}
}
/// <summary>
@@ -48,5 +62,14 @@ namespace Umbraco.Core.ObjectResolution
if (Frozen != null)
Frozen(null, null);
}
/// <summary>
/// Unfreezes resolution.
/// </summary>
/// <remarks>To be used in unit tests.</remarks>
internal static void Unfreeze()
{
IsFrozen = false;
}
}
}

5
src/Umbraco.Core/ObjectResolution/ResolverBase.cs
View File

@@ -63,7 +63,10 @@ namespace Umbraco.Core.ObjectResolution
/// <remarks>To be used in unit tests.</remarks>
internal static void Reset()
{
_resolver = null;
using (new WriteLock(ResolversLock))
{
_resolver = null;
}
}
}
}

41
src/Umbraco.Core/ObjectResolution/SingleObjectResolverBase.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Threading;
namespace Umbraco.Core.ObjectResolution
{
@@ -14,10 +15,9 @@ namespace Umbraco.Core.ObjectResolution
where TResolved : class
where TResolver : class
{
TResolved _resolved;
readonly bool _canBeNull;
// NOTE - we're not freezing resolution here so it is potentially possible to change the instance at any time?
private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
private readonly bool _canBeNull;
private TResolved _value;
#region Constructors
@@ -39,7 +39,7 @@ namespace Umbraco.Core.ObjectResolution
protected SingleObjectResolverBase(TResolved value)
: this(false)
{
_resolved = value;
_value = value;
}
/// <summary>
@@ -63,7 +63,7 @@ namespace Umbraco.Core.ObjectResolution
/// otherwise an exception will be thrown when reading it.</remarks>
protected SingleObjectResolverBase(TResolved value, bool canBeNull)
{
_resolved = value;
_value = value;
_canBeNull = canBeNull;
}
@@ -82,7 +82,7 @@ namespace Umbraco.Core.ObjectResolution
/// </summary>
public bool HasValue
{
get { return _resolved != null; }
get { return _value != null; }
}
/// <summary>
@@ -90,21 +90,34 @@ namespace Umbraco.Core.ObjectResolution
/// </summary>
/// <remarks></remarks>
/// <exception cref="ArgumentNullException">value is set to null, but cannot be null (<c>CanBeNull</c> is <c>false</c>).</exception>
/// <exception cref="InvalidOperationException">value is read and is null, but cannot be null (<c>CanBeNull</c> is <c>false</c>).</exception>
/// <exception cref="InvalidOperationException">value is read and is null, but cannot be null (<c>CanBeNull</c> is <c>false</c>),
/// or value is set (read) and resolution is (not) frozen.</exception>
protected TResolved Value
{
get
{
if (!_canBeNull && _resolved == null)
throw new InvalidOperationException("");
return _resolved;
Resolution.EnsureIsFrozen();
using (new ReadLock(_lock))
{
if (!_canBeNull && _value == null)
throw new InvalidOperationException(string.Format(
"Resolver {0} requires a value, and none was supplied.", this.GetType().FullName));
return _value;
}
}
set
{
if (!_canBeNull && value == null)
throw new ArgumentNullException("value");
_resolved = value;
using (Resolution.Configuration)
using (var l = new UpgradeableReadLock(_lock))
{
if (!_canBeNull && value == null)
throw new ArgumentNullException("value");
l.UpgradeToWriteLock();
_value = value;
}
}
}
}

4
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -440,7 +440,7 @@
<Compile Include="Persistence\Repositories\UserTypeRepository.cs" />
<Compile Include="Persistence\Repositories\VersionableRepositoryBase.cs" />
<Compile Include="Persistence\RepositoryFactory.cs" />
<Compile Include="ObjectResolution\LazyManyObjectsResolverbase.cs" />
<Compile Include="ObjectResolution\LazyManyObjectsResolverBase.cs" />
<Compile Include="Persistence\RepositoryResolver.cs" />
<Compile Include="Persistence\SqlSyntax\ColumnInfo.cs" />
<Compile Include="Persistence\SqlSyntax\DbTypes.cs" />
@@ -605,7 +605,7 @@
<Compile Include="Logging\AsynchronousRollingFileAppender.cs" />
<Compile Include="Logging\LoggingTaskExtension.cs" />
<Compile Include="Logging\LogHelper.cs" />
<Compile Include="ObjectResolution\MacroFieldEditorsResolver.cs" />
<Compile Include="Macros\MacroFieldEditorsResolver.cs" />
<Compile Include="Macros\PersistableMacroProperty.cs" />
<Compile Include="ObjectExtensions.cs" />
<Compile Include="PropertyEditors\PropertyEditorValueConvertersResolver.cs" />

2
src/Umbraco.Tests/CacheRefresherFactoryTests.cs
View File

@@ -35,7 +35,7 @@ namespace Umbraco.Tests
public void TearDown()
{
CacheRefreshersResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
[Test]

2
src/Umbraco.Tests/CodeFirst/CodeFirstTests.cs
View File

@@ -233,7 +233,7 @@ namespace Umbraco.Tests.CodeFirst
//reset the app context
DataTypesResolver.Reset();
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
PluginManager.Current = null;
string path = TestHelper.CurrentAssemblyDirectory;

2
src/Umbraco.Tests/DataTypeFactoryTests.cs
View File

@@ -37,7 +37,7 @@ namespace Umbraco.Tests
public void TearDown()
{
DataTypesResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
[Test]

2
src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
View File

@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Migrations
public void TearDown()
{
MigrationResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
}
}

2
src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
View File

@@ -70,7 +70,7 @@ namespace Umbraco.Tests.Migrations
public void TearDown()
{
MigrationResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
}
}

2
src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs
View File

@@ -95,7 +95,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
PluginManager.Current = null;
SyntaxConfig.SqlSyntaxProvider = null;
MigrationResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
TestHelper.CleanContentDirectories();

2
src/Umbraco.Tests/Persistence/MySqlTableByTableTest.cs
View File

@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Persistence
//reset the app context
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
}

2
src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
View File

@@ -68,7 +68,7 @@ namespace Umbraco.Tests.Persistence
//reset the app context
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
}

2
src/Umbraco.Tests/Persistence/SqlTableByTableTest.cs
View File

@@ -55,7 +55,7 @@ namespace Umbraco.Tests.Persistence
//reset the app context
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
}

2
src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs
View File

@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Publishing
//reset the app context
DataTypesResolver.Reset();
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();

2
src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Resolvers
public void TearDown()
{
ActionsResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
[Test]

2
src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Resolvers
[TearDown]
public void TearDown()
{
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
[Test]

3
src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs
View File

@@ -3,6 +3,7 @@ using System.Linq;
using System.Web.UI;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Macros;
using Umbraco.Core.ObjectResolution;
using Umbraco.Tests.TestHelpers;
using umbraco.interfaces;
@@ -36,7 +37,7 @@ namespace Umbraco.Tests.Resolvers
public void TearDown()
{
MacroFieldEditorsResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
PluginManager.Current.AssembliesToScan = null;
}

4
src/Umbraco.Tests/Resolvers/ManyObjectResolverTests.cs
View File

@@ -19,8 +19,8 @@ namespace Umbraco.Tests.Resolvers
[TearDown]
public void TearDown()
{
Resolution.IsFrozen = false;
{
Resolution.Unfreeze();
}
[Test]

2
src/Umbraco.Tests/Resolvers/PackageActionsResolverTests.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Resolvers
public void TearDown()
{
PackageActionsResolver.Reset();
Resolution.IsFrozen = false;
Resolution.Unfreeze();
}
/// <summary>

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

@@ -90,7 +90,7 @@ namespace Umbraco.Tests.TestHelpers
SqlCeContextGuardian.CloseBackgroundConnection();
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
TestHelper.CleanContentDirectories();

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

@@ -83,7 +83,7 @@ namespace Umbraco.Tests.TestHelpers
//reset the app context
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
}

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

@@ -102,7 +102,7 @@ namespace Umbraco.Tests.TestHelpers
ApplicationContext.Current = null;
Resolution.IsFrozen = false;
Resolution.Unfreeze();
RepositoryResolver.Reset();
TestHelper.CleanContentDirectories();
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.TestHelpers
//DatabaseContext.Database.Dispose();
//ApplicationContext.ApplicationCache.ClearAllCache();
//ApplicationContext.Current = null;
//Resolution.IsFrozen = false;
//Resolution.Unfreeze();
//RepositoryResolver.Reset();
//if (RequiresDbSetup)
//{