AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead

This commit is contained in:
Bjarke Berg
2019-12-19 10:43:00 +01:00
parent 7f9fbe9877
commit d5527f0485
86 changed files with 532 additions and 494 deletions

View File

@@ -21,22 +21,21 @@ namespace Umbraco.Tests.Cache.DistributedCache
{
private Umbraco.Web.Cache.DistributedCache _distributedCache;
private IServerRegistrar ServerRegistrar { get; set; }
private TestServerMessenger ServerMessenger { get; set; }
[SetUp]
public void Setup()
{
var register = TestHelper.GetRegister();
ServerRegistrar = new TestServerRegistrar();
ServerMessenger = new TestServerMessenger();
var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
var cacheRefresherCollection = new CacheRefresherCollection(new []
{
new TestCacheRefresher()
});
composition.RegisterUnique<IServerRegistrar>(_ => new TestServerRegistrar());
composition.RegisterUnique<IServerMessenger>(_ => new TestServerMessenger());
composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
.Add<TestCacheRefresher>();
Current.Factory = composition.CreateFactory();
_distributedCache = new Umbraco.Web.Cache.DistributedCache();
_distributedCache = new Umbraco.Web.Cache.DistributedCache(ServerMessenger, cacheRefresherCollection);
}
[TearDown]
@@ -52,7 +51,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
{
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
}
Assert.AreEqual(10, ((TestServerMessenger)Current.ServerMessenger).IntIdsRefreshed.Count);
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
}
[Test]
@@ -65,7 +64,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
x => x.Id,
new TestObjectWithId{Id = i});
}
Assert.AreEqual(10, ((TestServerMessenger)Current.ServerMessenger).IntIdsRefreshed.Count);
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
}
[Test]
@@ -75,7 +74,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
{
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
}
Assert.AreEqual(11, ((TestServerMessenger)Current.ServerMessenger).GuidIdsRefreshed.Count);
Assert.AreEqual(11, ServerMessenger.GuidIdsRefreshed.Count);
}
[Test]
@@ -85,7 +84,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
{
_distributedCache.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
}
Assert.AreEqual(12, ((TestServerMessenger)Current.ServerMessenger).IntIdsRemoved.Count);
Assert.AreEqual(12, ServerMessenger.IntIdsRemoved.Count);
}
[Test]
@@ -95,7 +94,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
{
_distributedCache.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
}
Assert.AreEqual(13, ((TestServerMessenger)Current.ServerMessenger).CountOfFullRefreshes);
Assert.AreEqual(13, ServerMessenger.CountOfFullRefreshes);
}
#region internal test classes