* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
103 lines
4.1 KiB
C#
103 lines
4.1 KiB
C#
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.DistributedLocking;
|
|
using Umbraco.Cms.Core.Events;
|
|
using Umbraco.Cms.Core.Hosting;
|
|
using Umbraco.Cms.Core.IO;
|
|
using Umbraco.Cms.Core.Notifications;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Strings;
|
|
using Umbraco.Cms.Infrastructure.Persistence;
|
|
using Umbraco.Cms.Infrastructure.Scoping;
|
|
using Umbraco.Cms.Tests.Common;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping;
|
|
|
|
[TestFixture]
|
|
public class ScopedNotificationPublisherTests
|
|
{
|
|
[Test]
|
|
public void ScopeUsesInjectedNotificationPublisher()
|
|
{
|
|
var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
|
|
var scopeProvider = GetScopeProvider(out var eventAggregatorMock);
|
|
|
|
using (ICoreScope scope = scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object))
|
|
{
|
|
scope.Notifications.Publish(Mock.Of<INotification>());
|
|
scope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
|
|
|
|
notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Once);
|
|
notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Once);
|
|
|
|
// Ensure that the custom scope provider is till used in inner scope.
|
|
using (ICoreScope innerScope = scopeProvider.CreateScope())
|
|
{
|
|
innerScope.Notifications.Publish(Mock.Of<INotification>());
|
|
innerScope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
|
|
|
|
notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Exactly(2));
|
|
notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Exactly(2));
|
|
}
|
|
|
|
// Ensure scope exit is not called until outermost scope is being disposed
|
|
notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Never());
|
|
}
|
|
|
|
notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Once());
|
|
|
|
// Ensure that the event aggregator isn't used directly.
|
|
eventAggregatorMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Never);
|
|
eventAggregatorMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Never);
|
|
}
|
|
|
|
[Test]
|
|
public void SpecifyingNotificationPublishInInnerScopeCausesError()
|
|
{
|
|
var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
|
|
var scopeProvider = GetScopeProvider(out var eventAggregatorMock);
|
|
|
|
using (var scope = scopeProvider.CreateScope())
|
|
{
|
|
Assert.Throws<ArgumentException>(() =>
|
|
scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object));
|
|
}
|
|
}
|
|
|
|
private ScopeProvider GetScopeProvider(out Mock<IEventAggregator> eventAggregatorMock)
|
|
{
|
|
var loggerFactory = NullLoggerFactory.Instance;
|
|
|
|
var fileSystems = new FileSystems(
|
|
loggerFactory,
|
|
Mock.Of<IIOHelper>(),
|
|
Options.Create(new GlobalSettings()),
|
|
Mock.Of<IHostingEnvironment>());
|
|
|
|
var mediaFileManager = new MediaFileManager(
|
|
Mock.Of<IFileSystem>(),
|
|
Mock.Of<IMediaPathScheme>(),
|
|
loggerFactory.CreateLogger<MediaFileManager>(),
|
|
Mock.Of<IShortStringHelper>(),
|
|
Mock.Of<IServiceProvider>());
|
|
|
|
eventAggregatorMock = new Mock<IEventAggregator>();
|
|
|
|
return new ScopeProvider(
|
|
new AmbientScopeStack(),
|
|
new AmbientScopeContextStack(),Mock.Of<IDistributedLockingMechanismFactory>(),
|
|
Mock.Of<IUmbracoDatabaseFactory>(),
|
|
fileSystems,
|
|
new TestOptionsMonitor<CoreDebugSettings>(new CoreDebugSettings()),
|
|
mediaFileManager,
|
|
loggerFactory,
|
|
|
|
eventAggregatorMock.Object);
|
|
}
|
|
}
|