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

Change ContentEventsTests to support the new notification pattern.

Browse Source
This commit is contained in:
Mole
2021-04-12 16:13:22 +02:00
parent 3ecf8eb9ea
commit 6f29eb7dc2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
View File

@@ -13,6 +13,7 @@ using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services.Notifications;
using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Sync;
using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement; using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
@@ -49,6 +50,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
throw new NotSupportedException(); throw new NotSupportedException();
} }
// We're in between tests, don't do anything.
if (_events is null)
{
return;
}
foreach (ContentCacheRefresher.JsonPayload payload in (ContentCacheRefresher.JsonPayload[])args.MessageObject) foreach (ContentCacheRefresher.JsonPayload payload in (ContentCacheRefresher.JsonPayload[])args.MessageObject)
{ {
var e = new EventInstance var e = new EventInstance
@@ -67,15 +74,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
} }
protected override void CustomTestSetup(IUmbracoBuilder builder) protected override void CustomTestSetup(IUmbracoBuilder builder)
{ {
builder.Services.AddUnique<IServerMessenger, LocalServerMessenger>();
builder.AddNotificationHandler<ContentCacheRefresherNotification, TestNotificationHandler>(); builder.AddNotificationHandler<ContentCacheRefresherNotification, TestNotificationHandler>();
builder.AddNotificationHandler<ContentTreeChangeNotification, DistributedCacheBinder>();
} }
[SetUp] [SetUp]
public void SetUp() public void SetUp()
{ {
_distributedCacheBinder = new DistributedCacheBinder(new DistributedCache(new LocalServerMessenger(), CacheRefresherCollection), UmbracoContextFactory, GetRequiredService<ILogger<DistributedCacheBinder>>());
_distributedCacheBinder.BindEvents(true);
_events = new List<EventInstance>(); _events = new List<EventInstance>();
DocumentRepository.ScopedEntityRefresh += ContentRepositoryRefreshed; DocumentRepository.ScopedEntityRefresh += ContentRepositoryRefreshed;
@@ -95,15 +101,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
[TearDown] [TearDown]
public void TearDownTest() public void TearDownTest()
{ {
_distributedCacheBinder?.UnbindEvents();
// Clear ALL events // Clear ALL events
DocumentRepository.ScopedEntityRefresh -= ContentRepositoryRefreshed; DocumentRepository.ScopedEntityRefresh -= ContentRepositoryRefreshed;
DocumentRepository.ScopeEntityRemove -= ContentRepositoryRemoved; DocumentRepository.ScopeEntityRemove -= ContentRepositoryRemoved;
DocumentRepository.ScopeVersionRemove -= ContentRepositoryRemovedVersion; DocumentRepository.ScopeVersionRemove -= ContentRepositoryRemovedVersion;
} }
private DistributedCacheBinder _distributedCacheBinder;
private static IList<EventInstance> _events; private static IList<EventInstance> _events;
private static int _msgCount; private static int _msgCount;
private IContentType _contentType; private IContentType _contentType;