From 1bd22d72c2be887ec9cb8bcc2b1e3f67878ce264 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Mon, 21 Sep 2020 21:06:24 +0200 Subject: [PATCH] Removed configuration model builders. --- .../ConnectionStringsBuilder.cs | 27 --- .../ContentErrorPageBuilder.cs | 65 ------ .../ContentImagingSettingsBuilder.cs | 41 ---- .../ContentSettingsBuilder.cs | 56 ----- .../CoreDebugSettingsBuilder.cs | 34 --- .../GlobalSettingsBuilder.cs | 203 ------------------ .../HostingSettingsBuilder.cs | 50 ----- .../ImagingAutoFillUploadFieldBuilder.cs | 73 ------- .../ModelsBuilderSettingsBuilder.cs | 26 --- .../NuCacheSettingsBuilder.cs | 25 --- .../RequestHandlerSettingsBuilder.cs | 45 ---- .../SmtpSettingsBuilder.cs | 98 --------- ...serPasswordConfigurationSettingsBuilder.cs | 12 -- .../WebRoutingSettingsBuilder.cs | 89 -------- .../Builders/LanguageBuilder.cs | 2 +- .../Builders/UserBuilder.cs | 4 +- src/Umbraco.Tests.Common/TestHelperBase.cs | 2 +- .../Implementations/TestHelper.cs | 7 +- .../Repositories/DictionaryRepositoryTest.cs | 6 +- .../Repositories/LanguageRepositoryTest.cs | 3 +- .../Repositories/TemplateRepositoryTest.cs | 4 +- src/Umbraco.Tests.Integration/RuntimeTests.cs | 31 ++- .../Testing/UmbracoIntegrationTest.cs | 1 - .../BackOfficeCookieManagerTests.cs | 16 +- .../Views/template1.cshtml | 5 + .../Views/template2.cshtml | 5 + .../Views/test.cshtml | 5 + .../AutoFixture/AutoMoqDataAttribute.cs | 2 +- .../BackOfficeClaimsPrincipalFactoryTests.cs | 3 +- .../ContentSettingsValidatorTests.cs | 28 +-- .../GlobalSettingsValidatorTests.cs | 15 +- .../HostingSettingsValidatorTests.cs | 6 +- .../ModelsBuilderSettingsValidatorTests.cs | 6 +- .../RequestHandlerSettingsValidatorTests.cs | 6 +- .../Extensions/UriExtensionsTests.cs | 4 +- .../Umbraco.Core/Routing/UriUtilityTests.cs | 6 +- .../BuilderTests.cs | 8 +- .../ConnectionStringsBuilderTests.cs | 26 --- .../ContentSettingsBuilderTests.cs | 65 ------ .../CoreDebugSettingsBuilderTests.cs | 29 --- .../GlobalSettingsBuilderTests.cs | 104 --------- .../HostingSettingsBuilderTests.cs | 30 --- .../ModelsBuilderSettingsBuilderTests.cs | 27 --- .../NuCacheSettingsBuilderTests.cs | 26 --- .../RequestHandlerSettingsBuilderTests.cs | 36 ---- .../WebRoutingSettingsBuilderTests.cs | 47 ---- .../Routing/BackOfficeAreaRoutesTests.cs | 9 +- .../Controllers/SurfaceControllerTests.cs | 13 +- .../PublishedContentCacheTests.cs | 2 +- .../Components/ComponentTests.cs | 9 +- .../Configurations/GlobalSettingsTests.cs | 2 +- src/Umbraco.Tests/IO/FileSystemsTests.cs | 7 +- src/Umbraco.Tests/IO/ShadowFileSystemTests.cs | 7 +- src/Umbraco.Tests/Models/MediaXmlTest.cs | 6 +- .../CreatedPackagesRepositoryTests.cs | 4 +- .../Packaging/PackageDataInstallationTests.cs | 8 +- .../Packaging/PackageInstallationTest.cs | 10 +- .../Persistence/DatabaseContextTests.cs | 8 +- .../Repositories/ContentTypeRepositoryTest.cs | 2 +- .../Repositories/DocumentRepositoryTest.cs | 3 +- .../Repositories/DomainRepositoryTest.cs | 7 +- .../Repositories/MediaRepositoryTest.cs | 16 +- .../Repositories/MediaTypeRepositoryTest.cs | 4 +- .../Repositories/MemberRepositoryTest.cs | 7 +- .../Repositories/MemberTypeRepositoryTest.cs | 4 +- .../PublicAccessRepositoryTest.cs | 6 +- .../Repositories/ScriptRepositoryTest.cs | 2 +- .../Repositories/StylesheetRepositoryTest.cs | 2 +- .../Repositories/TagRepositoryTest.cs | 8 +- .../Repositories/UserRepositoryTest.cs | 6 +- .../Persistence/SqlCeTableByTableTest.cs | 2 +- .../PropertyEditorValueEditorTests.cs | 4 +- .../PublishedContent/NuCacheChildrenTests.cs | 6 +- .../PublishedContent/NuCacheTests.cs | 6 +- .../PublishedContentLanguageVariantTests.cs | 4 +- .../Routing/BaseUrlProviderTest.cs | 8 +- .../Routing/ContentFinderByIdTests.cs | 4 +- .../ContentFinderByUrlAndTemplateTests.cs | 19 +- .../Routing/ContentFinderByUrlTests.cs | 16 +- .../ContentFinderByUrlWithDomainsTests.cs | 5 +- .../Routing/DomainsAndCulturesTests.cs | 18 +- .../Routing/GetContentUrlsTests.cs | 7 +- .../Routing/MediaUrlProviderTests.cs | 7 +- .../Routing/RenderRouteHandlerTests.cs | 2 +- .../Routing/RoutableDocumentFilterTests.cs | 6 +- .../Routing/UmbracoModuleTests.cs | 5 +- ...oviderWithHideTopLevelNodeFromPathTests.cs | 6 +- ...derWithoutHideTopLevelNodeFromPathTests.cs | 17 +- src/Umbraco.Tests/Routing/UrlRoutesTests.cs | 13 +- .../Routing/UrlsProviderWithDomainsTests.cs | 38 ++-- .../Routing/UrlsWithNestedDomains.cs | 12 +- src/Umbraco.Tests/Runtimes/StandaloneTests.cs | 21 +- .../Scoping/ScopeEventDispatcherTests.cs | 12 +- .../Scoping/ScopedNuCacheTests.cs | 4 +- .../Scoping/ScopedRepositoryTests.cs | 2 +- src/Umbraco.Tests/Scoping/ScopedXmlTests.cs | 7 +- .../OwinDataProtectorTokenProviderTests.cs | 2 +- .../Services/ContentServiceEventTests.cs | 2 +- .../Services/ContentServicePerformanceTest.cs | 8 +- .../ContentServicePublishBranchTests.cs | 3 +- .../Services/ContentServiceTagsTests.cs | 2 +- .../Services/ContentServiceTests.cs | 2 +- .../ContentTypeServiceVariantsTests.cs | 10 +- .../Services/EntityServiceTests.cs | 3 +- .../Services/EntityXmlSerializerTests.cs | 2 +- .../Services/LocalizationServiceTests.cs | 2 +- .../Services/SectionServiceTests.cs | 3 +- .../Services/UserServiceTests.cs | 3 +- .../Strings/CmsHelperCasingTests.cs | 3 +- .../Strings/DefaultShortStringHelperTests.cs | 40 ++-- .../Templates/HtmlImageSourceParserTests.cs | 24 +-- .../Templates/HtmlLocalLinkParserTests.cs | 13 +- src/Umbraco.Tests/TestHelpers/BaseWebTest.cs | 2 +- .../TestHelpers/Entities/MockedUser.cs | 10 +- src/Umbraco.Tests/TestHelpers/TestHelper.cs | 2 +- src/Umbraco.Tests/TestHelpers/TestObjects.cs | 6 +- .../TestHelpers/TestWithDatabaseBase.cs | 2 +- .../Testing/TestingTests/MockTests.cs | 2 +- src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 23 +- .../UmbracoExamine/ExamineBaseTest.cs | 7 +- .../Web/Mvc/SurfaceControllerTests.cs | 10 +- .../Web/Mvc/UmbracoViewPageTests.cs | 11 +- 122 files changed, 360 insertions(+), 1649 deletions(-) delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentErrorPageBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentImagingSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ImagingAutoFillUploadFieldBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/SmtpSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/UserPasswordConfigurationSettingsBuilder.cs delete mode 100644 src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilder.cs create mode 100644 src/Umbraco.Tests.Integration/Views/template1.cshtml create mode 100644 src/Umbraco.Tests.Integration/Views/template2.cshtml create mode 100644 src/Umbraco.Tests.Integration/Views/test.cshtml delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilderTests.cs delete mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilderTests.cs diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilder.cs deleted file mode 100644 index 4aba98fccd..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilder.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Umbraco.Core; -using Umbraco.Core.Configuration; -using ConnectionStrings = Umbraco.Core.Configuration.Models.ConnectionStrings; - -namespace Umbraco.Tests.Common.Builders -{ - public class ConnectionStringsBuilder : BuilderBase - { - private string _umbracoConnectionString; - - public ConnectionStringsBuilder WithUmbracoConnectionString(string umbracoConnectionString) - { - _umbracoConnectionString = umbracoConnectionString; - return this; - } - - public override ConnectionStrings Build() - { - var umbracoConnectionString = _umbracoConnectionString ?? string.Empty; - - return new ConnectionStrings - { - UmbracoConnectionString = new ConfigConnectionString(Constants.System.UmbracoConnectionName, umbracoConnectionString), - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentErrorPageBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentErrorPageBuilder.cs deleted file mode 100644 index 47c4bdfc8c..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentErrorPageBuilder.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class ContentErrorPageBuilder : ContentErrorPageBuilder - { - public ContentErrorPageBuilder() : base(null) - { - } - } - - public class ContentErrorPageBuilder - : ChildBuilderBase - { - private int? _contentId; - private Guid? _contentKey; - private string _contentXPath; - private string _culture; - - public ContentErrorPageBuilder(TParent parentBuilder) : base(parentBuilder) - { - } - - public ContentErrorPageBuilder WithContentId(int contentId) - { - _contentId = contentId; - return this; - } - - public ContentErrorPageBuilder WithContentKey(Guid contentKey) - { - _contentKey = contentKey; - return this; - } - - public ContentErrorPageBuilder WithContentXPath(string contentXPath) - { - _contentXPath = contentXPath; - return this; - } - - public ContentErrorPageBuilder WithCulture(string culture) - { - _culture = culture; - return this; - } - - public override ContentErrorPage Build() - { - var contentId = _contentId ?? 0; - var contentKey = _contentKey ?? Guid.Empty; - var contentXPath = _contentXPath ?? string.Empty; - var culture = _culture ?? "en-US"; - - return new ContentErrorPage - { - ContentId = contentId, - ContentKey = contentKey, - ContentXPath = contentXPath, - Culture = culture, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentImagingSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentImagingSettingsBuilder.cs deleted file mode 100644 index 685e60c929..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentImagingSettingsBuilder.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class ContentImagingSettingsBuilder : ContentImagingSettingsBuilder - { - public ContentImagingSettingsBuilder() : base(null) - { - } - } - - public class ContentImagingSettingsBuilder - : ChildBuilderBase - { - - private readonly List>> _imagingAutoFillUploadFieldBuilder = new List>>(); - - public ContentImagingSettingsBuilder(TParent parentBuilder) : base(parentBuilder) - { - } - - public ImagingAutoFillUploadFieldBuilder> AddAutoFillImageProperty() - { - var builder = new ImagingAutoFillUploadFieldBuilder>(this); - _imagingAutoFillUploadFieldBuilder.Add(builder); - return builder; - } - - public override ContentImagingSettings Build() - { - var imagingAutoFillUploadFields = _imagingAutoFillUploadFieldBuilder.Select(x => x.Build()).ToArray(); - - return new ContentImagingSettings - { - AutoFillImageProperties = imagingAutoFillUploadFields, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilder.cs deleted file mode 100644 index 9e504683d1..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilder.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Configuration.Models; -using Umbraco.Core.Macros; - -namespace Umbraco.Tests.Common.Builders -{ - public class ContentSettingsBuilder : ContentSettingsBuilder - { - public ContentSettingsBuilder() : base(null) - { - } - } - - public class ContentSettingsBuilder : ChildBuilderBase - { - private string _macroErrors; - private readonly ContentImagingSettingsBuilder> _contentImagingSettingsBuilder; - private readonly List>> _contentErrorPageBuilders = new List>>(); - - public ContentSettingsBuilder(TParent parentBuilder) : base(parentBuilder) - { - _contentImagingSettingsBuilder = new ContentImagingSettingsBuilder>(this); - _contentErrorPageBuilders = new List>>(); - } - - public ContentImagingSettingsBuilder> AddImaging() => _contentImagingSettingsBuilder; - - public ContentErrorPageBuilder> AddErrorPage() - { - var builder = new ContentErrorPageBuilder>(this); - _contentErrorPageBuilders.Add(builder); - return builder; - } - - public ContentSettingsBuilder WithMacroErrors(string macroErrors) - { - _macroErrors = macroErrors; - return this; - } - - public override ContentSettings Build() - { - var macroErrors = _macroErrors ?? MacroErrorBehaviour.Inline.ToString(); - var contentImagingSettings = _contentImagingSettingsBuilder.Build(); - var contentErrorPages = _contentErrorPageBuilders.Select(x => x.Build()).ToArray(); - - return new ContentSettings - { - MacroErrors = _macroErrors, - Imaging = contentImagingSettings, - Error404Collection = contentErrorPages, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilder.cs deleted file mode 100644 index e14fb0ade5..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilder.cs +++ /dev/null @@ -1,34 +0,0 @@ -using CoreDebugSettings = Umbraco.Core.Configuration.Models.CoreDebugSettings; - -namespace Umbraco.Tests.Common.Builders -{ - public class CoreDebugSettingsBuilder : BuilderBase - { - private bool? _dumpOnTimeoutThreadAbort; - private bool? _logUncompletedScopes; - - public CoreDebugSettingsBuilder WithDumpOnTimeoutThreadAbort(bool dumpOnTimeoutThreadAbort) - { - _dumpOnTimeoutThreadAbort = dumpOnTimeoutThreadAbort; - return this; - } - - public CoreDebugSettingsBuilder WithLogUncompletedScopes(bool logUncompletedScopes) - { - _logUncompletedScopes = logUncompletedScopes; - return this; - } - - public override CoreDebugSettings Build() - { - var dumpOnTimeoutThreadAbort = _dumpOnTimeoutThreadAbort ?? false; - var logUncompletedScopes = _logUncompletedScopes ?? false; - - return new CoreDebugSettings - { - DumpOnTimeoutThreadAbort = dumpOnTimeoutThreadAbort, - LogUncompletedScopes = logUncompletedScopes, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilder.cs deleted file mode 100644 index 30d1d3182f..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilder.cs +++ /dev/null @@ -1,203 +0,0 @@ -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class GlobalSettingsBuilder : GlobalSettingsBuilder - { - public GlobalSettingsBuilder() : base(null) - { - } - } - - public class GlobalSettingsBuilder : ChildBuilderBase - { - private string _configurationStatus; - private string _databaseFactoryServerVersion; - private string _defaultUiLanguage; - private bool? _disableElectionForSingleServer; - private bool? _hideTopLevelNodeFromPath; - private bool? _installEmptyDatabase; - private bool? _installMissingDatabase; - private string _umbracoPath; - private string _registerType; - private string _reservedPaths; - private string _reservedUrls; - private int? _timeOutInMinutes; - private string _umbracoCssPath; - private string _umbracoMediaPath; - private string _umbracoScriptsPath; - private string _mainDomLock; - private string _noNodesViewPath; - private bool? _useHttps; - private int? _versionCheckPeriod; - private readonly SmtpSettingsBuilder> _smtpSettingsBuilder; - - public GlobalSettingsBuilder(TParent parentBuilder) : base(parentBuilder) - { - _smtpSettingsBuilder = new SmtpSettingsBuilder>(this); - } - - public SmtpSettingsBuilder> AddSmtpSettings() => _smtpSettingsBuilder; - - public GlobalSettingsBuilder WithConfigurationStatus(string configurationStatus) - { - _configurationStatus = configurationStatus; - return this; - } - - public GlobalSettingsBuilder WithDatabaseFactoryServerVersion(string databaseFactoryServerVersion) - { - _databaseFactoryServerVersion = databaseFactoryServerVersion; - return this; - } - - public GlobalSettingsBuilder WithDefaultUiLanguage(string defaultUiLanguage) - { - _defaultUiLanguage = defaultUiLanguage; - return this; - } - - public GlobalSettingsBuilder WithDisableElectionForSingleServer(bool disableElectionForSingleServer) - { - _disableElectionForSingleServer = disableElectionForSingleServer; - return this; - } - - public GlobalSettingsBuilder WithHideTopLevelNodeFromPath(bool hideTopLevelNodeFromPath) - { - _hideTopLevelNodeFromPath = hideTopLevelNodeFromPath; - return this; - } - - public GlobalSettingsBuilder WithInstallEmptyDatabase(bool installEmptyDatabase) - { - _installEmptyDatabase = installEmptyDatabase; - return this; - } - - public GlobalSettingsBuilder WithInstallMissingDatabase(bool installMissingDatabase) - { - _installMissingDatabase = installMissingDatabase; - return this; - } - - public GlobalSettingsBuilder WithUmbracoPath(string umbracoPath) - { - _umbracoPath = umbracoPath; - return this; - } - - public GlobalSettingsBuilder WithRegisterType(string registerType) - { - _registerType = registerType; - return this; - } - - public GlobalSettingsBuilder WithReservedPaths(string reservedPaths) - { - _reservedPaths = reservedPaths; - return this; - } - - public GlobalSettingsBuilder WithReservedUrls(string reservedUrls) - { - _reservedUrls = reservedUrls; - return this; - } - - public GlobalSettingsBuilder WithUseHttps(bool useHttps) - { - _useHttps = useHttps; - return this; - } - - public GlobalSettingsBuilder WithUmbracoCssPath(string umbracoCssPath) - { - _umbracoCssPath = umbracoCssPath; - return this; - } - - public GlobalSettingsBuilder WithUmbracoMediaPath(string umbracoMediaPath) - { - _umbracoMediaPath = umbracoMediaPath; - return this; - } - - public GlobalSettingsBuilder WithUmbracoScriptsPath(string umbracoScriptsPath) - { - _umbracoScriptsPath = umbracoScriptsPath; - return this; - } - - public GlobalSettingsBuilder WithMainDomLock(string mainDomLock) - { - _mainDomLock = mainDomLock; - return this; - } - - public GlobalSettingsBuilder WithNoNodesViewPath(string noNodesViewPath) - { - _noNodesViewPath = noNodesViewPath; - return this; - } - public GlobalSettingsBuilder WithVersionCheckPeriod(int versionCheckPeriod) - { - _versionCheckPeriod = versionCheckPeriod; - return this; - } - - public GlobalSettingsBuilder WithTimeOutInMinutes(int timeOutInMinutes) - { - _timeOutInMinutes = timeOutInMinutes; - return this; - } - - public override GlobalSettings Build() - { - var configurationStatus = _configurationStatus ?? "9.0.0"; - var databaseFactoryServerVersion = _databaseFactoryServerVersion ?? null; - var defaultUiLanguage = _defaultUiLanguage ?? "en"; - var disableElectionForSingleServer = _disableElectionForSingleServer ?? false; - var hideTopLevelNodeFromPath = _hideTopLevelNodeFromPath ?? false; - var installEmptyDatabase = _installEmptyDatabase ?? false; - var installMissingDatabase = _installMissingDatabase ?? false; - var registerType = _registerType ?? null; - var reservedPaths = _reservedPaths ?? GlobalSettings.StaticReservedPaths; - var reservedUrls = _reservedUrls ?? GlobalSettings.StaticReservedUrls; - var umbracoPath = _umbracoPath ?? "~/umbraco"; - var useHttps = _useHttps ?? false; - var umbracoCssPath = _umbracoCssPath ?? "~/css"; - var umbracoMediaPath = _umbracoMediaPath ?? "~/media"; - var umbracoScriptsPath = _umbracoScriptsPath ?? "~/scripts"; - var versionCheckPeriod = _versionCheckPeriod ?? 0; - var timeOutInMinutes = _timeOutInMinutes ?? 20; - var smtpSettings = _smtpSettingsBuilder.Build(); - var mainDomLock = _mainDomLock ?? string.Empty; - var noNodesViewPath = _noNodesViewPath ?? "~/config/splashes/NoNodes.cshtml"; - - return new GlobalSettings - { - ConfigurationStatus = configurationStatus, - DatabaseFactoryServerVersion = databaseFactoryServerVersion, - DefaultUILanguage = defaultUiLanguage, - DisableElectionForSingleServer = disableElectionForSingleServer, - HideTopLevelNodeFromPath = hideTopLevelNodeFromPath, - InstallEmptyDatabase = installEmptyDatabase, - InstallMissingDatabase = installMissingDatabase, - RegisterType = registerType, - ReservedPaths = reservedPaths, - ReservedUrls = reservedUrls, - UmbracoPath = umbracoPath, - UseHttps = useHttps, - UmbracoCssPath = umbracoCssPath, - UmbracoMediaPath = umbracoMediaPath, - UmbracoScriptsPath = umbracoScriptsPath, - VersionCheckPeriod = versionCheckPeriod, - TimeOutInMinutes = timeOutInMinutes, - Smtp = smtpSettings, - MainDomLock = mainDomLock, - NoNodesViewPath = noNodesViewPath, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilder.cs deleted file mode 100644 index ac9db21337..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilder.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class HostingSettingsBuilder : BuilderBase - { - private string _applicationVirtualPath; - private bool? _debug; - private string _localTempStorageLocation; - - public HostingSettingsBuilder WithApplicationVirtualPath(string applicationVirtualPath) - { - _applicationVirtualPath = applicationVirtualPath; - return this; - } - - public HostingSettingsBuilder WithDebug(bool debug) - { - _debug = debug; - return this; - } - - public HostingSettingsBuilder WithLocalTempStorageLocation(LocalTempStorage localTempStorageLocation) - { - _localTempStorageLocation = localTempStorageLocation.ToString(); - return this; - } - - public HostingSettingsBuilder WithLocalTempStorageLocation(string localTempStorageLocation) - { - _localTempStorageLocation = localTempStorageLocation; - return this; - } - - public override HostingSettings Build() - { - var debug = _debug ?? false; - var localTempStorageLocation = _localTempStorageLocation ?? LocalTempStorage.Default.ToString(); - var applicationVirtualPath = _applicationVirtualPath ?? null; - - return new HostingSettings - { - ApplicationVirtualPath = applicationVirtualPath, - Debug = debug, - LocalTempStorageLocation = localTempStorageLocation, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ImagingAutoFillUploadFieldBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ImagingAutoFillUploadFieldBuilder.cs deleted file mode 100644 index f6f8383d6a..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ImagingAutoFillUploadFieldBuilder.cs +++ /dev/null @@ -1,73 +0,0 @@ -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class ImagingAutoFillUploadFieldBuilder : ImagingAutoFillUploadFieldBuilder - { - public ImagingAutoFillUploadFieldBuilder() : base(null) - { - } - } - - public class ImagingAutoFillUploadFieldBuilder - : ChildBuilderBase - { - private string _alias; - private string _widthFieldAlias; - private string _heightFieldAlias; - private string _lengthFieldAlias; - private string _extensionFieldAlias; - - public ImagingAutoFillUploadFieldBuilder(TParent parentBuilder) : base(parentBuilder) - { - } - - public ImagingAutoFillUploadFieldBuilder WithAlias(string alias) - { - _alias = alias; - return this; - } - - public ImagingAutoFillUploadFieldBuilder WithWidthFieldAlias(string widthFieldAlias) - { - _widthFieldAlias = widthFieldAlias; - return this; - } - - public ImagingAutoFillUploadFieldBuilder WithHeightFieldAlias(string heightFieldAlias) - { - _heightFieldAlias = heightFieldAlias; - return this; - } - - public ImagingAutoFillUploadFieldBuilder WithLengthFieldAlias(string lengthFieldAlias) - { - _lengthFieldAlias = lengthFieldAlias; - return this; - } - - public ImagingAutoFillUploadFieldBuilder WithExtensionFieldAlias(string extensionFieldAlias) - { - _extensionFieldAlias = extensionFieldAlias; - return this; - } - - public override ImagingAutoFillUploadField Build() - { - var alias = _alias ?? "testAlias"; - var widthFieldAlias = _widthFieldAlias ?? "testWidthFieldAlias"; - var heightFieldAlias = _heightFieldAlias ?? "testHeightFieldAlias"; - var lengthFieldAlias = _lengthFieldAlias ?? "testLengthFieldAlias"; - var extensionFieldAlias = _extensionFieldAlias ?? "testExtensionFieldAlias"; - - return new ImagingAutoFillUploadField - { - Alias = alias, - WidthFieldAlias = widthFieldAlias, - HeightFieldAlias = heightFieldAlias, - LengthFieldAlias = lengthFieldAlias, - ExtensionFieldAlias = extensionFieldAlias, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilder.cs deleted file mode 100644 index 02ab0a0af4..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilder.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class ModelsBuilderSettingsBuilder : BuilderBase - { - private string _modelsMode; - - public ModelsBuilderSettingsBuilder WithModelsMode(string modelsMode) - { - _modelsMode = modelsMode; - return this; - } - - public override ModelsBuilderSettings Build() - { - var modelsMode = _modelsMode ?? ModelsMode.Nothing.ToString(); - - return new ModelsBuilderSettings - { - ModelsMode = modelsMode, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilder.cs deleted file mode 100644 index 53e40c47fa..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilder.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class NuCacheSettingsBuilder : BuilderBase - { - private int? _bTreeBlockSize; - - public NuCacheSettingsBuilder WithBTreeBlockSize(int bTreeBlockSize) - { - _bTreeBlockSize = bTreeBlockSize; - return this; - } - - public override NuCacheSettings Build() - { - var bTreeBlockSize = _bTreeBlockSize ?? 4096; - - return new NuCacheSettings - { - BTreeBlockSize = bTreeBlockSize - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilder.cs deleted file mode 100644 index 3c6f652014..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilder.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Collections.Generic; -using Umbraco.Core.Configuration.Models; -using Umbraco.Core.Configuration.UmbracoSettings; - -namespace Umbraco.Tests.Common.Builders -{ - public class RequestHandlerSettingsBuilder : BuilderBase - { - private bool? _addTrailingSlash; - private string _convertUrlsToAscii; - private IEnumerable _charCollection; - - public RequestHandlerSettingsBuilder WithAddTrailingSlash(bool addTrailingSlash) - { - _addTrailingSlash = addTrailingSlash; - return this; - } - - public RequestHandlerSettingsBuilder WithConvertUrlsToAscii(string convertUrlsToAscii) - { - _convertUrlsToAscii = convertUrlsToAscii; - return this; - } - - public RequestHandlerSettingsBuilder WithCharCollection(IEnumerable charCollection) - { - _charCollection = charCollection; - return this; - } - - public override RequestHandlerSettings Build() - { - var addTrailingSlash = _addTrailingSlash ?? false; - var convertUrlsToAscii = _convertUrlsToAscii ?? "false"; - var charCollection = _charCollection ?? RequestHandlerSettings.DefaultCharCollection; - - return new RequestHandlerSettings - { - AddTrailingSlash = addTrailingSlash, - ConvertUrlsToAscii = convertUrlsToAscii, - CharCollection = charCollection, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/SmtpSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/SmtpSettingsBuilder.cs deleted file mode 100644 index 34ffcd316e..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/SmtpSettingsBuilder.cs +++ /dev/null @@ -1,98 +0,0 @@ -using System.Net.Mail; -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class SmtpSettingsBuilder : SmtpSettingsBuilder - { - public SmtpSettingsBuilder() : base(null) - { - } - } - - public class SmtpSettingsBuilder - : ChildBuilderBase - { - private string _from; - private string _host; - private int? _port; - private string _pickupDirectoryLocation; - private string _deliveryMethod; - private string _username; - private string _password; - - public SmtpSettingsBuilder(TParent parentBuilder) : base(parentBuilder) - { - } - - public SmtpSettingsBuilder WithFrom(string from) - { - _from = from; - return this; - } - - public SmtpSettingsBuilder WithHost(string host) - { - _host = host; - return this; - } - - public SmtpSettingsBuilder WithUsername(string username) - { - _username = username; - return this; - } - - public SmtpSettingsBuilder WithPort(int port) - { - _port = port; - return this; - } - - public SmtpSettingsBuilder WithPassword(string password) - { - _password = password; - return this; - } - - public SmtpSettingsBuilder WithPickupDirectoryLocation(string pickupDirectoryLocation) - { - _pickupDirectoryLocation = pickupDirectoryLocation; - return this; - } - - public SmtpSettingsBuilder WithDeliveryMethod(string deliveryMethod) - { - _deliveryMethod = deliveryMethod; - return this; - } - - public SmtpSettingsBuilder WithDeliveryMethod(SmtpDeliveryMethod deliveryMethod) - { - _deliveryMethod = deliveryMethod.ToString(); - return this; - } - - public override SmtpSettings Build() - { - var from = _from ?? null; - var host = _host ?? null; - var port = _port ?? 25; - var pickupDirectoryLocation = _pickupDirectoryLocation ?? null; - var deliveryMethod = _deliveryMethod ?? SmtpDeliveryMethod.Network.ToString(); - var username = _username ?? null; - var password = _password ?? null; - - return new SmtpSettings() - { - From = from, - Host = host, - Port = port, - PickupDirectoryLocation = pickupDirectoryLocation, - DeliveryMethod = deliveryMethod, - Username = username, - Password = password, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/UserPasswordConfigurationSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/UserPasswordConfigurationSettingsBuilder.cs deleted file mode 100644 index 3a0dfc3e9a..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/UserPasswordConfigurationSettingsBuilder.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Umbraco.Core.Configuration.Models; - -namespace Umbraco.Tests.Common.Builders -{ - public class UserPasswordConfigurationSettingsBuilder : BuilderBase - { - public override UserPasswordConfigurationSettings Build() - { - return new UserPasswordConfigurationSettings(); - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilder.cs deleted file mode 100644 index e32fff31fa..0000000000 --- a/src/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilder.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Umbraco.Core.Configuration.Models; -using Umbraco.Core.Models.PublishedContent; - -namespace Umbraco.Tests.Common.Builders -{ - public class WebRoutingSettingsBuilder : BuilderBase - { - private bool? _trySkipIisCustomErrors; - private bool? _internalRedirectPreservesTemplate; - private bool? _disableAlternativeTemplates; - private bool? _validateAlternativeTemplates; - private bool? _disableFindContentByIdPath; - private bool? _disableRedirectUrlTracking; - private string _urlProviderMode; - private string _umbracoApplicationUrl; - - public WebRoutingSettingsBuilder WithTrySkipIisCustomErrors(bool trySkipIisCustomErrors) - { - _trySkipIisCustomErrors = trySkipIisCustomErrors; - return this; - } - - public WebRoutingSettingsBuilder WithInternalRedirectPreservesTemplate(bool internalRedirectPreservesTemplate) - { - _internalRedirectPreservesTemplate = internalRedirectPreservesTemplate; - return this; - } - - public WebRoutingSettingsBuilder WithDisableAlternativeTemplates(bool disableAlternativeTemplates) - { - _disableAlternativeTemplates = disableAlternativeTemplates; - return this; - } - - public WebRoutingSettingsBuilder WithValidateAlternativeTemplates(bool validateAlternativeTemplates) - { - _validateAlternativeTemplates = validateAlternativeTemplates; - return this; - } - - public WebRoutingSettingsBuilder WithDisableFindContentByIdPath(bool disableFindContentByIdPath) - { - _disableFindContentByIdPath = disableFindContentByIdPath; - return this; - } - - public WebRoutingSettingsBuilder WithDisableRedirectUrlTracking(bool disableRedirectUrlTracking) - { - _disableRedirectUrlTracking = disableRedirectUrlTracking; - return this; - } - - public WebRoutingSettingsBuilder WithUrlProviderMode(string urlProviderMode) - { - _urlProviderMode = urlProviderMode; - return this; - } - - public WebRoutingSettingsBuilder WithUmbracoApplicationUrl(string umbracoApplicationUrl) - { - _umbracoApplicationUrl = umbracoApplicationUrl; - return this; - } - - public override WebRoutingSettings Build() - { - var trySkipIisCustomErrors = _trySkipIisCustomErrors ?? false; - var internalRedirectPreservesTemplate = _internalRedirectPreservesTemplate ?? false; - var disableAlternativeTemplates = _disableAlternativeTemplates ?? false; - var validateAlternativeTemplates = _validateAlternativeTemplates ?? false; - var disableFindContentByIdPath = _disableFindContentByIdPath ?? false; - var disableRedirectUrlTracking = _disableRedirectUrlTracking ?? false; - var urlProviderMode = _urlProviderMode ?? UrlMode.Auto.ToString(); - var umbracoApplicationUrl = _umbracoApplicationUrl ?? string.Empty; - - return new WebRoutingSettings - { - TrySkipIisCustomErrors = trySkipIisCustomErrors, - InternalRedirectPreservesTemplate = internalRedirectPreservesTemplate, - DisableAlternativeTemplates = disableAlternativeTemplates, - ValidateAlternativeTemplates = validateAlternativeTemplates, - DisableFindContentByIdPath = disableFindContentByIdPath, - DisableRedirectUrlTracking = disableRedirectUrlTracking, - UrlProviderMode = urlProviderMode, - UmbracoApplicationUrl = umbracoApplicationUrl, - }; - } - } -} diff --git a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs index 7174baaba1..cb76a00f92 100644 --- a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs @@ -57,7 +57,7 @@ namespace Umbraco.Tests.Common.Builders public override ILanguage Build() { var cultureInfo = _cultureInfo ?? CultureInfo.GetCultureInfo("en-US"); - var globalSettings = new GlobalSettingsBuilder().WithDefaultUiLanguage(cultureInfo.Name).Build(); + var globalSettings = new GlobalSettings { DefaultUILanguage = cultureInfo.Name }; var key = _key ?? Guid.NewGuid(); var createDate = _createDate ?? DateTime.Now; var updateDate = _updateDate ?? DateTime.Now; diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs index 2b76206e3f..9658b0453f 100644 --- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.Membership; using Umbraco.Tests.Common.Builders.Interfaces; @@ -12,6 +13,7 @@ namespace Umbraco.Tests.Common.Builders { } } + public class UserBuilder : ChildBuilderBase, IWithIdBuilder, @@ -131,7 +133,7 @@ namespace Umbraco.Tests.Common.Builders { var id = _id ?? 0; var defaultLang = _defaultLang ?? "en"; - var globalSettings = new GlobalSettingsBuilder().WithDefaultUiLanguage(defaultLang).Build(); + var globalSettings = new GlobalSettings { DefaultUILanguage = defaultLang }; var key = _key ?? Guid.NewGuid(); var createDate = _createDate ?? DateTime.Now; var updateDate = _updateDate ?? DateTime.Now; diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs index 7b5fed3000..cd9426ac2f 100644 --- a/src/Umbraco.Tests.Common/TestHelperBase.cs +++ b/src/Umbraco.Tests.Common/TestHelperBase.cs @@ -120,7 +120,7 @@ namespace Umbraco.Tests.Common public IRegister GetRegister() { - return RegisterFactory.Create(new GlobalSettingsBuilder().Build()); + return RegisterFactory.Create(new GlobalSettings()); } public abstract IHostingEnvironment GetHostingEnvironment(); diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs index 0e46941904..9f1f9a4840 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs @@ -5,6 +5,7 @@ using System.Net; using System.Reflection; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Moq; @@ -18,10 +19,8 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Runtime; using Umbraco.Net; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Web.Common.AspNetCore; using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment; -using Microsoft.Extensions.FileProviders; namespace Umbraco.Tests.Integration.Implementations { @@ -112,7 +111,7 @@ namespace Umbraco.Tests.Integration.Implementations { if (_backOfficeInfo == null) { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var mockedOptionsMonitorOfGlobalSettings = Mock.Of>(x => x.CurrentValue == globalSettings); _backOfficeInfo = new AspNetCoreBackOfficeInfo(mockedOptionsMonitorOfGlobalSettings); } @@ -127,7 +126,7 @@ namespace Umbraco.Tests.Integration.Implementations private IOptionsMonitor GetIOptionsMonitorOfHostingSettings() { - var hostingSettings = new HostingSettingsBuilder().Build(); + var hostingSettings = new HostingSettings(); return Mock.Of>(x => x.CurrentValue == hostingSettings); } diff --git a/src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs index be9a0ce5ed..4d5bdac6b4 100644 --- a/src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Services; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; @@ -288,7 +288,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories { var repository = CreateRepository(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var languageNo = new Language(globalSettings, "nb-NO") { CultureName = "nb-NO" }; localizationService.Save(languageNo); @@ -369,7 +369,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories var localizationService = GetRequiredService(); var language = localizationService.GetLanguageByIsoCode("en-US"); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var languageDK = new Language(globalSettings, "da-DK") { CultureName = "da-DK" }; localizationService.Save(languageDK);//Id 2 diff --git a/src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs index 550f32adb1..0f57598e0f 100644 --- a/src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs @@ -9,7 +9,6 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Services; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; @@ -25,7 +24,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories public void SetUp() { CreateTestData(); - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } private LanguageRepository CreateRepository(IScopeProvider provider) diff --git a/src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs index 4cb0217fe4..cb1fe9a57b 100644 --- a/src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs @@ -7,6 +7,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; @@ -14,7 +15,6 @@ using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.TestHelpers.Entities; @@ -260,7 +260,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories using (provider.CreateScope()) { var templateRepository = CreateRepository(provider); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var tagRepository = new TagRepository(scopeAccessor, AppCaches.Disabled, Logger); var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches, ShortStringHelper); var languageRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, Logger, Microsoft.Extensions.Options.Options.Create(globalSettings)); diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs index a5b421fcd3..32045b633a 100644 --- a/src/Umbraco.Tests.Integration/RuntimeTests.cs +++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs @@ -1,24 +1,21 @@ -using Microsoft.Extensions.DependencyInjection; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Smidge; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Runtime; +using Umbraco.Extensions; using Umbraco.Tests.Common; using Umbraco.Tests.Integration.Extensions; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; -using Umbraco.Web.Common.AspNetCore; -using Umbraco.Extensions; -using Umbraco.Tests.Common.Builders; -using Microsoft.Extensions.Options; namespace Umbraco.Tests.Integration { @@ -56,8 +53,8 @@ namespace Umbraco.Tests.Integration var testHelper = new TestHelper(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); // Create the core runtime var coreRuntime = new CoreRuntime(globalSettings, connectionStrings, testHelper.GetUmbracoVersion(), @@ -77,12 +74,12 @@ namespace Umbraco.Tests.Integration // TODO: found these registration were necessary here (as we haven't called the HostBuilder?), as dependencies for ComponentCollection // are not resolved. Need to check this if these explicit registrations are the best way to handle this. - var contentSettings = new ContentSettingsBuilder().Build(); - var coreDebugSettings = new CoreDebugSettingsBuilder().Build(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); - var userPasswordConfigurationSettings = new UserPasswordConfigurationSettingsBuilder().Build(); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); + var coreDebugSettings = new CoreDebugSettings(); + var nuCacheSettings = new NuCacheSettings(); + var requestHandlerSettings = new RequestHandlerSettings(); + var userPasswordConfigurationSettings = new UserPasswordConfigurationSettings(); + var webRoutingSettings = new WebRoutingSettings(); umbracoContainer.Register(x => Options.Create(globalSettings)); umbracoContainer.Register(x => Options.Create(contentSettings)); diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs index b21de325cc..0eb29db247 100644 --- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs +++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs @@ -434,7 +434,6 @@ namespace Umbraco.Tests.Integration.Testing #region Builders - protected GlobalSettingsBuilder GlobalSettingsBuilder = new GlobalSettingsBuilder(); protected UserBuilder UserBuilder = new UserBuilder(); protected UserGroupBuilder UserGroupBuilder = new UserGroupBuilder(); diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice.Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice.Security/BackOfficeCookieManagerTests.cs index 6fd5672085..83760bd177 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice.Security/BackOfficeCookieManagerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice.Security/BackOfficeCookieManagerTests.cs @@ -1,15 +1,13 @@ - - +using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Moq; using NUnit.Framework; -using System; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; using Umbraco.Extensions; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Implementations; using Umbraco.Web; using Umbraco.Web.BackOffice.Controllers; @@ -26,7 +24,7 @@ namespace Umbraco.Tests.Security var testHelper = new TestHelper(); var httpContextAccessor = testHelper.GetHttpContextAccessor(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var runtime = Mock.Of(x => x.Level == RuntimeLevel.Install); var mgr = new BackOfficeCookieManager( @@ -51,7 +49,7 @@ namespace Umbraco.Tests.Security //hostingEnvironment.ToAbsolute(globalSettings.UmbracoPath); var httpContextAccessor = testHelper.GetHttpContextAccessor(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var runtime = Mock.Of(x => x.Level == RuntimeLevel.Run); var mgr = new BackOfficeCookieManager( @@ -73,7 +71,7 @@ namespace Umbraco.Tests.Security var testHelper = new TestHelper(); var httpContextAccessor = testHelper.GetHttpContextAccessor(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var runtime = Mock.Of(x => x.Level == RuntimeLevel.Run); @@ -98,7 +96,7 @@ namespace Umbraco.Tests.Security var testHelper = new TestHelper(); var httpContextAccessor = testHelper.GetHttpContextAccessor(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var runtime = Mock.Of(x => x.Level == RuntimeLevel.Run); @@ -120,7 +118,7 @@ namespace Umbraco.Tests.Security var testHelper = new TestHelper(); var httpContextAccessor = testHelper.GetHttpContextAccessor(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var runtime = Mock.Of(x => x.Level == RuntimeLevel.Run); diff --git a/src/Umbraco.Tests.Integration/Views/template1.cshtml b/src/Umbraco.Tests.Integration/Views/template1.cshtml new file mode 100644 index 0000000000..64a9c8d55f --- /dev/null +++ b/src/Umbraco.Tests.Integration/Views/template1.cshtml @@ -0,0 +1,5 @@ +@using Umbraco.Web.PublishedModels; +@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@{ + Layout = null; +} \ No newline at end of file diff --git a/src/Umbraco.Tests.Integration/Views/template2.cshtml b/src/Umbraco.Tests.Integration/Views/template2.cshtml new file mode 100644 index 0000000000..64a9c8d55f --- /dev/null +++ b/src/Umbraco.Tests.Integration/Views/template2.cshtml @@ -0,0 +1,5 @@ +@using Umbraco.Web.PublishedModels; +@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@{ + Layout = null; +} \ No newline at end of file diff --git a/src/Umbraco.Tests.Integration/Views/test.cshtml b/src/Umbraco.Tests.Integration/Views/test.cshtml new file mode 100644 index 0000000000..64a9c8d55f --- /dev/null +++ b/src/Umbraco.Tests.Integration/Views/test.cshtml @@ -0,0 +1,5 @@ +@using Umbraco.Web.PublishedModels; +@inherits Umbraco.Web.Common.AspNetCore.UmbracoViewPage +@{ + Layout = null; +} \ No newline at end of file diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs index c2ef2b4f04..c1b0c453c5 100644 --- a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs +++ b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.UnitTests.AutoFixture { fixture.Customize( u => u.FromFactory( - (a,b,c) => BackOfficeIdentityUser.CreateNew(new GlobalSettingsBuilder().Build(),a,b,c))); + (a,b,c) => BackOfficeIdentityUser.CreateNew(new GlobalSettings(),a,b,c))); fixture .Customize(new ConstructorCustomization(typeof(UsersController), new GreedyConstructorQuery())) .Customize(new ConstructorCustomization(typeof(InstallController), new GreedyConstructorQuery())) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs index 7d977fe686..13c73dfa96 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs @@ -9,6 +9,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.BackOffice; using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.Membership; using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; @@ -138,7 +139,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice [SetUp] public void Setup() { - var globalSettings = new GlobalSettingsBuilder().WithDefaultUiLanguage("test").Build(); + var globalSettings = new GlobalSettings { DefaultUILanguage = "test" }; _testUser = new BackOfficeIdentityUser(globalSettings, _testUserId, new List()) { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs index adf2b540e5..e22752d12f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs @@ -55,19 +55,21 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation private static ContentSettings BuildContentSettings(string macroErrors = "inline", string culture = "en-US", string contentXPath = "", string autoFillImagePropertyAlias = "testAlias") { - return new ContentSettingsBuilder() - .WithMacroErrors(macroErrors) - .AddErrorPage() - .WithCulture(culture) - .WithContentId(1) - .WithContentXPath(contentXPath) - .Done() - .AddImaging() - .AddAutoFillImageProperty() - .WithAlias(autoFillImagePropertyAlias) - .Done() - .Done() - .Build(); + return new ContentSettings + { + MacroErrors = macroErrors, + Error404Collection = new ContentErrorPage[] + { + new ContentErrorPage { Culture = culture, ContentId = 1, ContentXPath = contentXPath }, + }, + Imaging = new ContentImagingSettings + { + AutoFillImageProperties = new ImagingAutoFillUploadField[] + { + new ImagingAutoFillUploadField { Alias = autoFillImagePropertyAlias, WidthFieldAlias = "w", HeightFieldAlias = "h", LengthFieldAlias = "l", ExtensionFieldAlias = "e" } + } + } + }; } } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs index b055c626c7..2bf227d686 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs @@ -1,7 +1,6 @@ using NUnit.Framework; using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.Models.Validation; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { @@ -37,12 +36,14 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation private static GlobalSettings BuildGlobalSettings(string smtpEmail = "test@test.com", string smtpDeliveryMethod = "Network") { - return new GlobalSettingsBuilder() - .AddSmtpSettings() - .WithFrom(smtpEmail) - .WithDeliveryMethod(smtpDeliveryMethod) - .Done() - .Build(); + return new GlobalSettings + { + Smtp = new SmtpSettings + { + From = smtpEmail, + DeliveryMethod = smtpDeliveryMethod, + } + }; } } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HostingSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HostingSettingsValidatorTests.cs index eec97947f9..2122a62c64 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HostingSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HostingSettingsValidatorTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.Models.Validation; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { @@ -11,7 +11,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Success_ForValid_Configuration() { var validator = new HostingSettingsValidator(); - var options = new HostingSettingsBuilder().Build(); + var options = new HostingSettings(); var result = validator.Validate("settings", options); Assert.True(result.Succeeded); } @@ -20,7 +20,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Fail_For_Configuration_With_Invalid_LocalTempStorage_Field() { var validator = new HostingSettingsValidator(); - var options = new HostingSettingsBuilder().WithLocalTempStorageLocation("invalid").Build(); + var options = new HostingSettings { LocalTempStorageLocation = "invalid" }; var result = validator.Validate("settings", options); Assert.False(result.Succeeded); } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ModelsBuilderSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ModelsBuilderSettingsValidatorTests.cs index 9388dedcb2..fe71509095 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ModelsBuilderSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ModelsBuilderSettingsValidatorTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.Models.Validation; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { @@ -11,7 +11,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Success_ForValid_Configuration() { var validator = new ModelsBuilderSettingsValidator(); - var options = new ModelsBuilderSettingsBuilder().Build(); + var options = new ModelsBuilderSettings(); var result = validator.Validate("settings", options); Assert.True(result.Succeeded); } @@ -20,7 +20,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Fail_For_Configuration_With_Invalid_ModelsMode_Field() { var validator = new ModelsBuilderSettingsValidator(); - var options = new ModelsBuilderSettingsBuilder().WithModelsMode("invalid").Build(); + var options = new ModelsBuilderSettings { ModelsMode = "invalid" }; var result = validator.Validate("settings", options); Assert.False(result.Succeeded); } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs index 4548d95ccf..f579fec695 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.Models.Validation; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { @@ -11,7 +11,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Success_ForValid_Configuration() { var validator = new RequestHandlerSettingsValidator(); - var options = new RequestHandlerSettingsBuilder().Build(); + var options = new RequestHandlerSettings(); var result = validator.Validate("settings", options); Assert.True(result.Succeeded); } @@ -20,7 +20,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation public void Returns_Fail_For_Configuration_With_Invalid_ConvertUrlsToAscii_Field() { var validator = new RequestHandlerSettingsValidator(); - var options = new RequestHandlerSettingsBuilder().WithConvertUrlsToAscii("invalid").Build(); + var options = new RequestHandlerSettings { ConvertUrlsToAscii = "invalid" }; var result = validator.Validate("settings", options); Assert.False(result.Succeeded); } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs index 77a7ba1732..e832f13671 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs @@ -18,7 +18,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Extensions public void Setup() { _hostEnvironment = Mock.Of(); - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } private IWebHostEnvironment _hostEnvironment; @@ -69,7 +69,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Extensions private AspNetCoreHostingEnvironment CreateHostingEnvironment(string virtualPath = "") { - var hostingSettings = new HostingSettingsBuilder().WithApplicationVirtualPath(virtualPath).Build(); + var hostingSettings = new HostingSettings { ApplicationVirtualPath = virtualPath }; var mockedOptionsMonitorOfHostingSettings = Mock.Of>(x => x.CurrentValue == hostingSettings); return new AspNetCoreHostingEnvironment(mockedOptionsMonitorOfHostingSettings, _hostEnvironment); } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs index 7a2a4c5965..e577fc28fa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs @@ -1,10 +1,8 @@ using System; using Moq; using NUnit.Framework; -using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; -using Umbraco.Tests.Common.Builders; using Umbraco.Web; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing @@ -71,7 +69,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing { // Arrange var sourceUri = new Uri(sourceUrl, UriKind.Relative); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(trailingSlash).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = trailingSlash }; var uriUtility = BuildUriUtility("/"); // Act diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs index afa4b543ca..80c8b057ab 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.ModelsBuilder.Embedded; using Umbraco.ModelsBuilder.Embedded.Building; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded { @@ -41,7 +41,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded { }; - var modelsBuilderConfig = new ModelsBuilderSettingsBuilder().Build(); + var modelsBuilderConfig = new ModelsBuilderSettings(); var builder = new TextBuilder(modelsBuilderConfig, types); var btypes = builder.TypeModels; @@ -152,7 +152,7 @@ namespace Umbraco.Web.PublishedModels " } }; - var modelsBuilderConfig = new ModelsBuilderSettingsBuilder().Build(); + var modelsBuilderConfig = new ModelsBuilderSettings(); var builder = new TextBuilder(modelsBuilderConfig, types); var btypes = builder.TypeModels; @@ -264,7 +264,7 @@ namespace Umbraco.Web.PublishedModels { }; - var modelsBuilderConfig = new ModelsBuilderSettingsBuilder().Build(); + var modelsBuilderConfig = new ModelsBuilderSettings(); var builder = new TextBuilder(modelsBuilderConfig, types); builder.ModelsNamespace = "Umbraco.ModelsBuilder.Models"; // forces conflict with Umbraco.ModelsBuilder.Umbraco var btypes = builder.TypeModels; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilderTests.cs deleted file mode 100644 index 7a95df708e..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ConnectionStringsBuilderTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class ConnectionStringsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const string umbracoConnectionString = "Server=(LocalDB)\\Umbraco;Database=FakeName;Integrated Security=true"; - - var builder = new ConnectionStringsBuilder(); - - // Act - var connectionStrings = builder - .WithUmbracoConnectionString(umbracoConnectionString) - .Build(); - - // Assert - Assert.AreEqual(umbracoConnectionString, connectionStrings.UmbracoConnectionString.ConnectionString); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilderTests.cs deleted file mode 100644 index a9c6dac1e7..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ContentSettingsBuilderTests.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Linq; -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class ContentSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const string autoFillImagePropertyAlias = "x"; - const string autoFillImagePropertyWidthFieldAlias = "w"; - const string autoFillImagePropertyHeightFieldAlias = "h"; - const string autoFillImagePropertyLengthFieldAlias = "l"; - const string autoFillImagePropertyExtensionFieldAlias = "e"; - const int errorPageContentId = 100; - var errorPageContentKey = Guid.NewGuid(); - const string errorPageContentXPath = "/aaa/bbb"; - const string errorPageCulture = "en-GB"; - - var builder = new ContentSettingsBuilder(); - - // Act - var contentSettings = builder - .AddImaging() - .AddAutoFillImageProperty() - .WithAlias(autoFillImagePropertyAlias) - .WithWidthFieldAlias(autoFillImagePropertyWidthFieldAlias) - .WithHeightFieldAlias(autoFillImagePropertyHeightFieldAlias) - .WithLengthFieldAlias(autoFillImagePropertyLengthFieldAlias) - .WithExtensionFieldAlias(autoFillImagePropertyExtensionFieldAlias) - .Done() - .Done() - .AddErrorPage() - .WithContentId(errorPageContentId) - .WithContentKey(errorPageContentKey) - .WithContentXPath(errorPageContentXPath) - .WithCulture(errorPageCulture) - .Done() - .Build(); - - // Assert - Assert.AreEqual(1, contentSettings.Imaging.AutoFillImageProperties.Count()); - - var autoFillImageProperty = contentSettings.Imaging.AutoFillImageProperties.First(); - Assert.AreEqual(autoFillImagePropertyAlias, autoFillImageProperty.Alias); - Assert.AreEqual(autoFillImagePropertyWidthFieldAlias, autoFillImageProperty.WidthFieldAlias); - Assert.AreEqual(autoFillImagePropertyHeightFieldAlias, autoFillImageProperty.HeightFieldAlias); - Assert.AreEqual(autoFillImagePropertyLengthFieldAlias, autoFillImageProperty.LengthFieldAlias); - Assert.AreEqual(autoFillImagePropertyExtensionFieldAlias, autoFillImageProperty.ExtensionFieldAlias); - - Assert.AreEqual(1, contentSettings.Error404Collection.Count()); - - var errorPage = contentSettings.Error404Collection.First(); - Assert.AreEqual(errorPageContentId, errorPage.ContentId); - Assert.AreEqual(errorPageContentKey, errorPage.ContentKey); - Assert.AreEqual(errorPageContentXPath, errorPage.ContentXPath); - Assert.AreEqual(errorPageCulture, errorPage.Culture); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilderTests.cs deleted file mode 100644 index d576f44072..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/CoreDebugSettingsBuilderTests.cs +++ /dev/null @@ -1,29 +0,0 @@ -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class CoreDebugSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const bool dumpOnTimeoutThreadAbort = true; - const bool logUncompletedScopes = true; - - var builder = new CoreDebugSettingsBuilder(); - - // Act - var coreDebugSettings = builder - .WithDumpOnTimeoutThreadAbort(dumpOnTimeoutThreadAbort) - .WithLogUncompletedScopes(logUncompletedScopes) - .Build(); - - // Assert - Assert.AreEqual(dumpOnTimeoutThreadAbort, coreDebugSettings.DumpOnTimeoutThreadAbort); - Assert.AreEqual(logUncompletedScopes, coreDebugSettings.LogUncompletedScopes); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilderTests.cs deleted file mode 100644 index 350572153f..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/GlobalSettingsBuilderTests.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System.Net.Mail; -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class GlobalSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const string configurationStatus = "9.0.1"; - const string databaseFactoryServerVersion = "testServerVersion"; - const string defaultUiLanguage = "en-GB"; - const bool disableElectionForSingleServer = true; - const bool hideTopLevelNodeFromPath = true; - const bool installEmptyDatabase = true; - const bool installMissingDatabase = true; - const string umbracoPath = "~/testumbraco"; - const string registerType = "testRegisterType"; - const string reservedPaths = "/custom"; - const string reservedUrls = "~/custom,"; - const int timeOutInMinutes = 20; - const string umbracoCssPath = "~/testcss"; - const string umbracoMediaPath = "~/testmedia"; - const string umbracoScriptsPath = "~/testscripts"; - const string mainDomLock = "testMainDomLock"; - const string noNodesViewPath = "~/config/splashes/MyNoNodes.cshtml"; - const bool useHttps = true; - const int versionCheckPeriod = 1; - const string smtpFrom = "test@test.com"; - const string smtpHost = "test.com"; - const int smtpPort = 225; - const SmtpDeliveryMethod smtpDeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory; - const string smtpPickupDirectoryLocation = "c:\\test"; - const string smtpUsername = "testuser"; - const string smtpPassword = "testpass"; - - var builder = new GlobalSettingsBuilder(); - - // Act - var globalSettings = builder - .WithConfigurationStatus(configurationStatus) - .WithDatabaseFactoryServerVersion(databaseFactoryServerVersion) - .WithDefaultUiLanguage(defaultUiLanguage) - .WithDisableElectionForSingleServer(disableElectionForSingleServer) - .WithHideTopLevelNodeFromPath(hideTopLevelNodeFromPath) - .WithInstallEmptyDatabase(installEmptyDatabase) - .WithInstallMissingDatabase(installMissingDatabase) - .WithUmbracoPath(umbracoPath) - .WithRegisterType(registerType) - .WithReservedPaths(reservedPaths) - .WithReservedUrls(reservedUrls) - .WithTimeOutInMinutes(timeOutInMinutes) - .WithUmbracoCssPath(umbracoCssPath) - .WithUmbracoMediaPath(umbracoMediaPath) - .WithUmbracoScriptsPath(umbracoScriptsPath) - .WithMainDomLock(mainDomLock) - .WithNoNodesViewPath(noNodesViewPath) - .WithUseHttps(useHttps) - .WithVersionCheckPeriod(versionCheckPeriod) - .AddSmtpSettings() - .WithFrom(smtpFrom) - .WithHost(smtpHost) - .WithPort(smtpPort) - .WithDeliveryMethod(smtpDeliveryMethod.ToString()) - .WithPickupDirectoryLocation(smtpPickupDirectoryLocation) - .WithUsername(smtpUsername) - .WithPassword(smtpPassword) - .Done() - .Build(); - - // Assert - Assert.AreEqual(configurationStatus, globalSettings.ConfigurationStatus); - Assert.AreEqual(databaseFactoryServerVersion, globalSettings.DatabaseFactoryServerVersion); - Assert.AreEqual(defaultUiLanguage, globalSettings.DefaultUILanguage); - Assert.AreEqual(disableElectionForSingleServer, globalSettings.DisableElectionForSingleServer); - Assert.AreEqual(hideTopLevelNodeFromPath, globalSettings.HideTopLevelNodeFromPath); - Assert.AreEqual(installEmptyDatabase, globalSettings.InstallEmptyDatabase); - Assert.AreEqual(installMissingDatabase, globalSettings.InstallMissingDatabase); - Assert.AreEqual(umbracoPath, globalSettings.UmbracoPath); - Assert.AreEqual(registerType, globalSettings.RegisterType); - Assert.AreEqual(reservedPaths, globalSettings.ReservedPaths); - Assert.AreEqual(reservedUrls, globalSettings.ReservedUrls); - Assert.AreEqual(timeOutInMinutes, globalSettings.TimeOutInMinutes); - Assert.AreEqual(umbracoCssPath, globalSettings.UmbracoCssPath); - Assert.AreEqual(umbracoMediaPath, globalSettings.UmbracoMediaPath); - Assert.AreEqual(umbracoScriptsPath, globalSettings.UmbracoScriptsPath); - Assert.AreEqual(mainDomLock, globalSettings.MainDomLock); - Assert.AreEqual(noNodesViewPath, globalSettings.NoNodesViewPath); - Assert.AreEqual(useHttps, globalSettings.UseHttps); - Assert.AreEqual(versionCheckPeriod, globalSettings.VersionCheckPeriod); - Assert.AreEqual(smtpFrom, globalSettings.Smtp.From); - Assert.AreEqual(smtpHost, globalSettings.Smtp.Host); - Assert.AreEqual(smtpPort, globalSettings.Smtp.Port); - Assert.AreEqual(smtpDeliveryMethod, globalSettings.Smtp.DeliveryMethodValue); - Assert.AreEqual(smtpPickupDirectoryLocation, globalSettings.Smtp.PickupDirectoryLocation); - Assert.AreEqual(smtpUsername, globalSettings.Smtp.Username); - Assert.AreEqual(smtpPassword, globalSettings.Smtp.Password); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilderTests.cs deleted file mode 100644 index aebe225ac8..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/HostingSettingsBuilderTests.cs +++ /dev/null @@ -1,30 +0,0 @@ -using NUnit.Framework; -using Umbraco.Core.Configuration; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class HostingSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const bool debugMode = true; - const LocalTempStorage localTempStorageLocation = LocalTempStorage.AspNetTemp; - - var builder = new HostingSettingsBuilder(); - - // Act - var hostingSettings = builder - .WithDebug(debugMode) - .WithLocalTempStorageLocation(localTempStorageLocation) - .Build(); - - // Assert - Assert.AreEqual(debugMode, hostingSettings.Debug); - Assert.AreEqual(localTempStorageLocation, hostingSettings.LocalTempStorageLocationValue); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilderTests.cs deleted file mode 100644 index d3a388bbb6..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/ModelsBuilderSettingsBuilderTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -using NUnit.Framework; -using Umbraco.Core.Configuration; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class ModelsBuilderSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const string modelsMode = "PureLive"; - - var builder = new ModelsBuilderSettingsBuilder(); - - // Act - var modelsBuilderSettings = builder - .WithModelsMode(modelsMode) - .Build(); - - // Assert - Assert.AreEqual(ModelsMode.PureLive, modelsBuilderSettings.ModelsModeValue); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilderTests.cs deleted file mode 100644 index 258a845f70..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/NuCacheSettingsBuilderTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class NuCacheSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const int bTreeBlockSize = 2048; - - var builder = new NuCacheSettingsBuilder(); - - // Act - var nuCacheSettings = builder - .WithBTreeBlockSize(bTreeBlockSize) - .Build(); - - // Assert - Assert.AreEqual(bTreeBlockSize, nuCacheSettings.BTreeBlockSize); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilderTests.cs deleted file mode 100644 index 199b3dadde..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/RequestHandlerSettingsBuilderTests.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Tests.Common.Builders; -using static Umbraco.Core.Configuration.Models.RequestHandlerSettings; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class RequestHandlerSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const bool addTrailingSlash = true; - const string convertUrlsToAscii = "try"; - var charCollection = new List { new CharItem { Char = "a", Replacement = "b" } }; - - var builder = new RequestHandlerSettingsBuilder(); - - // Act - var requestHandlerSettings = builder - .WithAddTrailingSlash(addTrailingSlash) - .WithConvertUrlsToAscii(convertUrlsToAscii) - .WithCharCollection(charCollection) - .Build(); - - // Assert - Assert.AreEqual(addTrailingSlash, requestHandlerSettings.AddTrailingSlash); - Assert.AreEqual(convertUrlsToAscii, requestHandlerSettings.ConvertUrlsToAscii); - Assert.AreEqual("a-b", string.Join(",", requestHandlerSettings.CharCollection.Select(x => $"{x.Char}-{x.Replacement}"))); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilderTests.cs deleted file mode 100644 index e3f4bcf04e..0000000000 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ConfigurationModelBuilders/WebRoutingSettingsBuilderTests.cs +++ /dev/null @@ -1,47 +0,0 @@ -using NUnit.Framework; -using Umbraco.Tests.Common.Builders; - -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders -{ - [TestFixture] - public class WebRoutingSettingsBuilderTests - { - [Test] - public void Is_Built_Correctly() - { - // Arrange - const bool disableAlternativeTemplates = true; - const bool disableFindContentByIdPath = true; - const bool disableRedirectUrlTracking = true; - const bool internalRedirectPreservesTemplate = true; - const bool trySkipIisCustomErrors = true; - const string umbracoApplicationUrl = "/test/"; - const string urlProviderMode = "test"; - const bool validateAlternativeTemplates = true; - - var builder = new WebRoutingSettingsBuilder(); - - // Act - var webRoutingSettings = builder - .WithDisableAlternativeTemplates(disableAlternativeTemplates) - .WithDisableFindContentByIdPath(disableFindContentByIdPath) - .WithDisableRedirectUrlTracking(disableRedirectUrlTracking) - .WithInternalRedirectPreservesTemplate(internalRedirectPreservesTemplate) - .WithTrySkipIisCustomErrors(trySkipIisCustomErrors) - .WithUmbracoApplicationUrl(umbracoApplicationUrl) - .WithUrlProviderMode(urlProviderMode) - .WithValidateAlternativeTemplates(validateAlternativeTemplates) - .Build(); - - // Assert - Assert.AreEqual(disableAlternativeTemplates, webRoutingSettings.DisableAlternativeTemplates); - Assert.AreEqual(disableFindContentByIdPath, webRoutingSettings.DisableFindContentByIdPath); - Assert.AreEqual(disableRedirectUrlTracking, webRoutingSettings.DisableRedirectUrlTracking); - Assert.AreEqual(internalRedirectPreservesTemplate, webRoutingSettings.InternalRedirectPreservesTemplate); - Assert.AreEqual(trySkipIisCustomErrors, webRoutingSettings.TrySkipIisCustomErrors); - Assert.AreEqual(umbracoApplicationUrl, webRoutingSettings.UmbracoApplicationUrl); - Assert.AreEqual(urlProviderMode, webRoutingSettings.UrlProviderMode); - Assert.AreEqual(validateAlternativeTemplates, webRoutingSettings.ValidateAlternativeTemplates); - } - } -} diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs index 2a096bbd47..54147e67b9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs @@ -1,14 +1,13 @@ -using Microsoft.AspNetCore.Mvc; +using System.Linq; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; -using System.Linq; using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; using Umbraco.Extensions; -using Umbraco.Tests.Common.Builders; using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.BackOffice.Routing; using Umbraco.Web.Common.Attributes; @@ -96,7 +95,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing private BackOfficeAreaRoutes GetBackOfficeAreaRoutes(RuntimeLevel level) { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var routes = new BackOfficeAreaRoutes( Options.Create(globalSettings), Mock.Of(x => x.ToAbsolute(It.IsAny()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty), diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs index 0d288b6310..81f6c5aa80 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; @@ -7,11 +6,11 @@ using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Testing; using Umbraco.Web; using Umbraco.Web.PublishedCache; @@ -39,7 +38,7 @@ namespace Umbraco.Tests.Integration { var httpContextAccessor = Mock.Of(); var hostingEnvironment = Mock.Of(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var umbracoContextFactory = new UmbracoContextFactory( _umbracoContextAccessor, @@ -70,7 +69,7 @@ namespace Umbraco.Tests.Integration [Test] public void Umbraco_Context_Not_Null() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var httpContextAccessor = Mock.Of(); var hostingEnvironment = Mock.Of(); @@ -109,7 +108,7 @@ namespace Umbraco.Tests.Integration var publishedSnapshotService = new Mock(); var httpContextAccessor = Mock.Of(); var hostingEnvironment = Mock.Of(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var umbracoContextFactory = new UmbracoContextFactory( _umbracoContextAccessor, @@ -144,7 +143,7 @@ namespace Umbraco.Tests.Integration [Test] public void Mock_Current_Page() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var httpContextAccessor = Mock.Of(); var hostingEnvironment = Mock.Of(); diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs index 13f58f8021..a8adb0093a 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs @@ -60,7 +60,7 @@ namespace Umbraco.Tests.Cache.PublishedCache _httpContextFactory = new FakeHttpContextFactory("~/Home"); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var umbracoContextAccessor = Factory.GetInstance(); _xml = new XmlDocument(); diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs index e74516dab7..5bcde45681 100644 --- a/src/Umbraco.Tests/Components/ComponentTests.cs +++ b/src/Umbraco.Tests/Components/ComponentTests.cs @@ -9,6 +9,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; @@ -34,13 +35,13 @@ namespace Umbraco.Tests.Components var logger = Mock.Of(); var typeFinder = TestHelper.GetTypeFinder(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); var f = new UmbracoDatabaseFactory(logger, Options.Create(globalSettings), Options.Create(connectionStrings), new Lazy(() => new MapperCollection(Enumerable.Empty())), TestHelper.DbProviderFactoryCreator); var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, Options.Create(globalSettings), TestHelper.GetHostingEnvironment()); - var coreDebug = new CoreDebugSettingsBuilder().Build(); + var coreDebug = new CoreDebugSettings(); var mediaFileSystem = Mock.Of(); - var p = new ScopeProvider(f, fs, Microsoft.Extensions.Options.Options.Create(coreDebug), mediaFileSystem, logger, typeFinder, NoAppCache.Instance); + var p = new ScopeProvider(f, fs, Options.Create(coreDebug), mediaFileSystem, logger, typeFinder, NoAppCache.Instance); mock.Setup(x => x.GetInstance(typeof (ILogger))).Returns(logger); mock.Setup(x => x.GetInstance(typeof (IProfilingLogger))).Returns(new ProfilingLogger(Mock.Of(), Mock.Of())); diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs index 59d5aa516d..60940019e5 100644 --- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs +++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs @@ -23,7 +23,7 @@ namespace Umbraco.Tests.Configurations ApplicationVirtualPath = rootPath })); - var globalSettings = new GlobalSettingsBuilder().WithUmbracoPath(path).Build(); + var globalSettings = new GlobalSettings { UmbracoPath = path }; Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(hostingEnvironment)); } diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs index 9d2df22739..ab8636cc18 100644 --- a/src/Umbraco.Tests/IO/FileSystemsTests.cs +++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs @@ -6,17 +6,16 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Composing.CompositionExtensions; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.IO.MediaPathSchemes; using Umbraco.Core.Logging; using Umbraco.Core.Services; using Umbraco.Tests.Components; using Umbraco.Tests.TestHelpers; -using Umbraco.Core.Composing.CompositionExtensions; using Current = Umbraco.Web.Composing.Current; using FileSystems = Umbraco.Core.IO.FileSystems; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.IO { @@ -41,7 +40,7 @@ namespace Umbraco.Tests.IO composition.RegisterUnique(TestHelper.IOHelper); composition.RegisterUnique(TestHelper.GetHostingEnvironment()); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); composition.Register(x => Microsoft.Extensions.Options.Options.Create(globalSettings)); composition.ComposeFileSystems(); diff --git a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs index 50ba5a3223..472714ba0e 100644 --- a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs +++ b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs @@ -8,6 +8,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Scoping; @@ -438,7 +439,7 @@ namespace Umbraco.Tests.IO var phy = new PhysicalFileSystem(ioHelper, hostingEnvironment, logger, path, "ignore"); var container = Mock.Of(); - var globalSettings = Options.Create(new GlobalSettingsBuilder().Build()); + var globalSettings = Options.Create(new GlobalSettings()); var fileSystems = new FileSystems(container, logger, ioHelper, globalSettings, TestHelper.GetHostingEnvironment()) { IsScoped = () => scopedFileSystems }; var fs = fileSystems.GetFileSystem(phy); var sw = (ShadowWrapper) fs.InnerFileSystem; @@ -535,7 +536,7 @@ namespace Umbraco.Tests.IO var phy = new PhysicalFileSystem(ioHelper, hostingEnvironment, logger, path, "ignore"); var container = Mock.Of(); - var globalSettings = Options.Create(new GlobalSettingsBuilder().Build()); + var globalSettings = Options.Create(new GlobalSettings()); var fileSystems = new FileSystems(container, logger, ioHelper, globalSettings, TestHelper.GetHostingEnvironment()) { IsScoped = () => scopedFileSystems }; var fs = fileSystems.GetFileSystem( phy); var sw = (ShadowWrapper) fs.InnerFileSystem; @@ -591,7 +592,7 @@ namespace Umbraco.Tests.IO var phy = new PhysicalFileSystem(ioHelper, hostingEnvironment, logger, path, "ignore"); var container = Mock.Of(); - var globalSettings = Options.Create(new GlobalSettingsBuilder().Build()); + var globalSettings = Options.Create(new GlobalSettings()); var fileSystems = new FileSystems(container, logger, ioHelper, globalSettings, TestHelper.GetHostingEnvironment()) { IsScoped = () => scopedFileSystems }; var fs = fileSystems.GetFileSystem( phy); var sw = (ShadowWrapper)fs.InnerFileSystem; diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs index 593a581f85..a1e2fdbfba 100644 --- a/src/Umbraco.Tests/Models/MediaXmlTest.cs +++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs @@ -3,13 +3,11 @@ using System.Xml.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Services; using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; -using Umbraco.Tests.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -32,7 +30,7 @@ namespace Umbraco.Tests.Models // and then, this will reset the width, height... because the file does not exist, of course ;-( var logger = Mock.Of(); var scheme = Mock.Of(); - var contentSettings = new ContentSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); var mediaFileSystem = new MediaFileSystem(Mock.Of(), scheme, logger, ShortStringHelper); var ignored = new FileUploadPropertyEditor(Mock.Of(), mediaFileSystem, Microsoft.Extensions.Options.Options.Create(contentSettings), DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper); diff --git a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs index 90a352ad39..d5988439b4 100644 --- a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs @@ -6,10 +6,10 @@ using System.Linq; using System.Xml.Linq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.Packaging; using Umbraco.Core.Packaging; using Umbraco.Core.Services; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; @@ -41,7 +41,7 @@ namespace Umbraco.Tests.Packaging HostingEnvironment, Factory.GetInstance(), Logger, UmbracoVersion, - Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build()), + Microsoft.Extensions.Options.Options.Create(new GlobalSettings()), "createdPackages.config", //temp paths tempFolderPath: "~/" + _testBaseFolder + "/temp", diff --git a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs index ed1cd5424d..c5c71e0277 100644 --- a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs +++ b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs @@ -6,6 +6,8 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Composing.CompositionExtensions; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Packaging; @@ -13,12 +15,10 @@ using Umbraco.Core.Packaging; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Core.Strings; using Umbraco.Tests.Services; using Umbraco.Tests.Services.Importing; using Umbraco.Tests.Testing; -using Umbraco.Core.Composing.CompositionExtensions; -using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.Packaging { @@ -713,7 +713,7 @@ namespace Umbraco.Tests.Packaging private void AddLanguages() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var norwegian = new Core.Models.Language(globalSettings, "nb-NO"); var english = new Core.Models.Language(globalSettings, "en-GB"); ServiceContext.LocalizationService.Save(norwegian, 0); diff --git a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs index 3b4edd28c1..5d0f878ebd 100644 --- a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs @@ -5,18 +5,14 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; -using Umbraco.Core.IO; -using Umbraco.Core.Models; using Umbraco.Core.Models.Packaging; using Umbraco.Core.Packaging; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using File = System.IO.File; @@ -51,7 +47,7 @@ namespace Umbraco.Tests.Packaging new ConflictingPackageData( ServiceContext.MacroService, ServiceContext.FileService), - Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build())); + Microsoft.Extensions.Options.Options.Create(new GlobalSettings())); private PackageDataInstallation PackageDataInstallation => new PackageDataInstallation( Logger, ServiceContext.FileService, ServiceContext.MacroService, ServiceContext.LocalizationService, @@ -60,7 +56,7 @@ namespace Umbraco.Tests.Packaging Factory.GetInstance(), Factory.GetInstance(), Factory.GetInstance(), - Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build()), + Microsoft.Extensions.Options.Options.Create(new GlobalSettings()), Factory.GetInstance()); private IPackageInstallation PackageInstallation => new PackageInstallation( diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs index 7483b5c611..d7d58f8d4e 100644 --- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs +++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs @@ -9,16 +9,14 @@ using NPoco; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.Services; using Umbraco.Persistance.SqlCe; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Security; namespace Umbraco.Tests.Persistence { @@ -40,8 +38,8 @@ namespace Umbraco.Tests.Persistence _sqlSyntaxProviders = new[] { (ISqlSyntaxProvider) _sqlCeSyntaxProvider }; _logger = Mock.Of(); _umbracoVersion = TestHelper.GetUmbracoVersion(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); _databaseFactory = new UmbracoDatabaseFactory(_logger, Options.Create(globalSettings), Options.Create(connectionStrings), new Lazy(() => Mock.Of()), TestHelper.DbProviderFactoryCreator); } diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 0d6797bd9c..a5074bf758 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories CreateTestData(); - _globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build()); + _globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettings()); } private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository) diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs index 03cfe1af53..45539094ec 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs @@ -21,6 +21,7 @@ using Umbraco.Core.Services; using Umbraco.Tests.Testing; using Umbraco.Web.PropertyEditors; using Umbraco.Tests.Common.Builders; +using Umbraco.Core.Configuration.Models; namespace Umbraco.Tests.Persistence.Repositories { @@ -63,7 +64,7 @@ namespace Umbraco.Tests.Persistence.Repositories private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository, AppCaches appCaches = null) { - var globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build()); + var globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettings()); appCaches = appCaches ?? AppCaches; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs index c3bf9db5de..2e531626cf 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs @@ -4,6 +4,7 @@ using System.Data; using System.Linq; using Moq; using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories.Implement; @@ -22,7 +23,7 @@ namespace Umbraco.Tests.Persistence.Repositories { private DomainRepository CreateRepository(IScopeProvider provider, out ContentTypeRepository contentTypeRepository, out DocumentRepository documentRepository, out LanguageRepository languageRepository) { - var globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettingsBuilder().Build()); + var globalSettings = Microsoft.Extensions.Options.Options.Create(new GlobalSettings()); var accessor = (IScopeAccessor) provider; var templateRepository = new TemplateRepository(accessor, Core.Cache.AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); @@ -51,7 +52,7 @@ namespace Umbraco.Tests.Persistence.Repositories var repo = CreateRepository(provider, out contentTypeRepo, out documentRepo, out langRepo); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var lang = new Language(globalSettings, isoName); langRepo.Save(lang); @@ -207,7 +208,7 @@ namespace Umbraco.Tests.Persistence.Repositories //more test data var lang1 = langRepo.GetByIsoCode("en-AU"); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var lang2 = new Language(globalSettings, "es"); langRepo.Save(lang2); var content2 = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 }; diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 119a207cb9..6318627c66 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -2,21 +2,21 @@ using System.Linq; using Moq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Core.Persistence; +using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Persistence.Repositories.Implement; +using Umbraco.Core.PropertyEditors; +using Umbraco.Core.Scoping; +using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; -using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories.Implement; -using Umbraco.Core.Scoping; using Umbraco.Tests.Testing; -using Umbraco.Core.Services; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.Persistence.Repositories { @@ -35,7 +35,7 @@ namespace Umbraco.Tests.Persistence.Repositories { appCaches = appCaches ?? AppCaches; var scopeAccessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository(scopeAccessor, appCaches, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches, ShortStringHelper); var languageRepository = new LanguageRepository(scopeAccessor, appCaches, Logger, Microsoft.Extensions.Options.Options.Create(globalSettings)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index fac2a6665a..692ac522d9 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -3,12 +3,12 @@ using System.Linq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -22,7 +22,7 @@ namespace Umbraco.Tests.Persistence.Repositories private MediaTypeRepository CreateRepository(IScopeProvider provider) { var cacheHelper = AppCaches.Disabled; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository((IScopeAccessor)provider, cacheHelper, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches, ShortStringHelper); var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches, Logger, Microsoft.Extensions.Options.Options.Create(globalSettings)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 37d5260dc0..2da5b4c283 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -1,14 +1,12 @@ using System; using System.Diagnostics; using System.Linq; -using System.Xml.Linq; using Moq; using NPoco; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Logging; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; @@ -17,7 +15,6 @@ using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -31,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories private MemberRepository CreateRepository(IScopeProvider provider, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = Mock.Of(); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches, ShortStringHelper); var languageRepository = new LanguageRepository(accessor, AppCaches.Disabled, Logger, Microsoft.Extensions.Options.Options.Create(globalSettings)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs index be32305cfc..11c9363a4f 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -4,13 +4,13 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -24,7 +24,7 @@ namespace Umbraco.Tests.Persistence.Repositories private MemberTypeRepository CreateRepository(IScopeProvider provider) { var templateRepository = Mock.Of(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches, ShortStringHelper); var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of(), Microsoft.Extensions.Options.Options.Create(globalSettings)); return new MemberTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of(), commonRepository, languageRepository, ShortStringHelper); diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs index b31d490578..9677ac8982 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Moq; using NUnit.Framework; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -307,7 +305,7 @@ namespace Umbraco.Tests.Persistence.Repositories private DocumentRepository CreateRepository(IScopeProvider provider, out ContentTypeRepository contentTypeRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var tagRepository = new TagRepository(accessor, AppCaches, Logger); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches, ShortStringHelper); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs index 6a45dafa54..9ff27b8e50 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs @@ -42,7 +42,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IScriptRepository CreateRepository() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); return new ScriptRepository(_fileSystems, IOHelper, Microsoft.Extensions.Options.Options.Create(globalSettings)); } diff --git a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs index 028f99f89e..2be1843489 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories private IStylesheetRepository CreateRepository() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); return new StylesheetRepository(_fileSystems, IOHelper, Microsoft.Extensions.Options.Options.Create(globalSettings)); } diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs index 913fc876fe..9bbfc8a076 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs @@ -3,14 +3,12 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core.Cache; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.IO; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -956,7 +954,7 @@ namespace Umbraco.Tests.Persistence.Repositories private DocumentRepository CreateDocumentRepository(IScopeProvider provider, out ContentTypeRepository contentTypeRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled, ShortStringHelper); @@ -974,7 +972,7 @@ namespace Umbraco.Tests.Persistence.Repositories private MediaRepository CreateMediaRepository(IScopeProvider provider, out MediaTypeRepository mediaTypeRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var tagRepository = new TagRepository(accessor, AppCaches.Disabled, Logger); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches.Disabled, ShortStringHelper); diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs index 448fce9579..fb017385ce 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs @@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories private MediaRepository CreateMediaRepository(IScopeProvider provider, out IMediaTypeRepository mediaTypeRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var templateRepository = new TemplateRepository(accessor, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches, ShortStringHelper); var languageRepository = new LanguageRepository(accessor, AppCaches, Logger, Microsoft.Extensions.Options.Options.Create(globalSettings)); @@ -54,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories private DocumentRepository CreateContentRepository(IScopeProvider provider, out IContentTypeRepository contentTypeRepository, out ITemplateRepository templateRepository) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); templateRepository = new TemplateRepository(accessor, AppCaches, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var tagRepository = new TagRepository(accessor, AppCaches, Logger); var commonRepository = new ContentTypeCommonRepository(accessor, templateRepository, AppCaches, ShortStringHelper); @@ -72,7 +72,7 @@ namespace Umbraco.Tests.Persistence.Repositories private UserRepository CreateRepository(IScopeProvider provider) { var accessor = (IScopeAccessor) provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var repository = new UserRepository(accessor, AppCaches.Disabled, Logger, Mappers, Microsoft.Extensions.Options.Options.Create(globalSettings), Microsoft.Extensions.Options.Options.Create(new UserPasswordConfigurationSettings()), new JsonNetSerializer()); return repository; } diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs index 1fe7153dd0..676e46e06d 100644 --- a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs +++ b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs @@ -18,7 +18,7 @@ namespace Umbraco.Tests.Persistence [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] public class SqlCeTableByTableTest : TestWithDatabaseBase { - public GlobalSettings GlobalSettings => new GlobalSettingsBuilder().Build(); + public GlobalSettings GlobalSettings => new GlobalSettings(); [Test] public void Can_Create_umbracoNode_Table() diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs index 439036fa16..9d43ee2067 100644 --- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs +++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs @@ -5,11 +5,11 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Components; using Umbraco.Tests.TestHelpers; using Current = Umbraco.Web.Composing.Current; @@ -28,7 +28,7 @@ namespace Umbraco.Tests.PropertyEditors var register = TestHelper.GetRegister(); var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.IOHelper, AppCaches.NoCache); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); register.Register(_ => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings))); diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs index e50d6fe8ab..564e50d2bd 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs @@ -7,6 +7,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Events; using Umbraco.Core.Hosting; using Umbraco.Core.Logging; @@ -19,7 +20,6 @@ using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Core.Strings; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; @@ -139,8 +139,8 @@ namespace Umbraco.Tests.PublishedContent var typeFinder = TestHelper.GetTypeFinder(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var nuCacheSettings = new NuCacheSettings(); // at last, create the complete NuCache snapshot service! var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true }; diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index 010569fe42..74052df9b6 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -6,6 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -17,7 +18,6 @@ using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Core.Strings; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; @@ -179,8 +179,8 @@ namespace Umbraco.Tests.PublishedContent var typeFinder = TestHelper.GetTypeFinder(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var nuCacheSettings = new NuCacheSettings(); // at last, create the complete NuCache snapshot service! var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true }; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index 50e82998f9..d02a49385d 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -4,10 +4,10 @@ using System.Collections.ObjectModel; using System.Linq; using Moq; using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Web; @@ -39,7 +39,7 @@ namespace Umbraco.Tests.PublishedContent // Spanish falls back to English and Italian to Spanish (and then to English). // French has no fall back. // Danish, Swedish and Norweigan create an invalid loop. - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var languages = new List { new Language(globalSettings, "en-US") { Id = 1, CultureName = "English", IsDefault = true }, diff --git a/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs b/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs index a4f472898e..9860b5739f 100644 --- a/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs +++ b/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs @@ -1,9 +1,9 @@ using System.Linq; using Moq; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Routing; @@ -24,8 +24,8 @@ namespace Umbraco.Tests.Routing protected override void ComposeSettings() { - var contentSettings = new ContentSettingsBuilder().Build(); - var userPasswordConfigurationSettings = new UserPasswordConfigurationSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); + var userPasswordConfigurationSettings = new UserPasswordConfigurationSettings(); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(contentSettings)); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(userPasswordConfigurationSettings)); @@ -33,7 +33,7 @@ namespace Umbraco.Tests.Routing protected IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider) { - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); return new UrlProvider( new TestUmbracoContextAccessor(umbracoContext), Microsoft.Extensions.Options.Options.Create(webRoutingSettings), diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs index 069aead6b3..100c398b7f 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using Umbraco.Core; -using Umbraco.Tests.Common.Builders; +using Umbraco.Core.Configuration.Models; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Routing; @@ -18,7 +18,7 @@ namespace Umbraco.Tests.Routing var umbracoContext = GetUmbracoContext(urlAsString); var publishedRouter = CreatePublishedRouter(); var frequest = publishedRouter.CreateRequest(umbracoContext); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var lookup = new ContentFinderByIdPath(Microsoft.Extensions.Options.Options.Create(webRoutingSettings), Logger, Factory.GetInstance()); diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs index 14a7ec3ab1..a8a5f68df8 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs @@ -1,14 +1,9 @@ -using Moq; -using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; -using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Routing; +using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; +using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Composing.Current; -using Umbraco.Tests.Common.Builders; +using Umbraco.Web.Routing; namespace Umbraco.Tests.Routing { @@ -31,16 +26,14 @@ namespace Umbraco.Tests.Routing [TestCase("/home/Sub1.aspx/blah")] public void Match_Document_By_Url_With_Template(string urlAsString) { - var globalSettings = new GlobalSettingsBuilder() - .WithHideTopLevelNodeFromPath(false) - .Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var template1 = CreateTemplate("test"); var template2 = CreateTemplate("blah"); var umbracoContext = GetUmbracoContext(urlAsString, template1.Id, globalSettings: globalSettings); var publishedRouter = CreatePublishedRouter(); var frequest = publishedRouter.CreateRequest(umbracoContext); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var lookup = new ContentFinderByUrlAndTemplate(Logger, ServiceContext.FileService, ServiceContext.ContentTypeService, Microsoft.Extensions.Options.Options.Create(webRoutingSettings)); var result = lookup.TryFindContent(frequest); diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs index 0614d4a2bb..9564181889 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs @@ -1,11 +1,7 @@ using System; using System.Globalization; -using Moq; using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Web.Composing; -using Umbraco.Core.Configuration; -using Umbraco.Tests.Common.Builders; +using Umbraco.Core.Configuration.Models; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Web.Routing; @@ -29,7 +25,7 @@ namespace Umbraco.Tests.Routing [TestCase("/test-page", 1172)] public void Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(true).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = true }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext(urlString, globalSettings:globalSettings, snapshotService: snapshotService); @@ -64,7 +60,7 @@ namespace Umbraco.Tests.Routing [TestCase("/home/Sub1.aspx", 1173)] public void Match_Document_By_Url(string urlString, int expectedId) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(urlString, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(); @@ -88,7 +84,7 @@ namespace Umbraco.Tests.Routing [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)] public void Match_Document_By_Url_With_Special_Characters(string urlString, int expectedId) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(urlString, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(); @@ -114,7 +110,7 @@ namespace Umbraco.Tests.Routing [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)] public void Match_Document_By_Url_With_Special_Characters_Using_Hostname(string urlString, int expectedId) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(urlString, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(); @@ -142,7 +138,7 @@ namespace Umbraco.Tests.Routing [TestCase("/æøå/home/sub1/custom-sub-4-with-æøå", 1180)] public void Match_Document_By_Url_With_Special_Characters_In_Hostname(string urlString, int expectedId) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(urlString, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(); diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs index 622df53d9e..b7ab02eeff 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; @@ -128,7 +129,7 @@ namespace Umbraco.Tests.Routing { SetDomains3(); - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(true).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = true }; var umbracoContext = GetUmbracoContext(url, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(Factory); @@ -169,7 +170,7 @@ namespace Umbraco.Tests.Routing // defaults depend on test environment expectedCulture = expectedCulture ?? System.Threading.Thread.CurrentThread.CurrentUICulture.Name; - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(true).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = true }; var umbracoContext = GetUmbracoContext(url, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(Factory); diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs index 0d39092b88..fd5d12b672 100644 --- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs +++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs @@ -1,12 +1,9 @@ -using Moq; -using NUnit.Framework; -using Umbraco.Core.Models; -using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Routing; +using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration; -using Umbraco.Tests.Common.Builders; +using Umbraco.Core.Configuration.Models; +using Umbraco.Core.Models; +using Umbraco.Web.Routing; namespace Umbraco.Tests.Routing { @@ -267,8 +264,7 @@ namespace Umbraco.Tests.Routing { SetDomains1(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(inputUrl, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(Factory); @@ -316,7 +312,7 @@ namespace Umbraco.Tests.Routing // defaults depend on test environment expectedCulture = expectedCulture ?? System.Threading.Thread.CurrentThread.CurrentUICulture.Name; - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(inputUrl, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(Factory); @@ -370,7 +366,7 @@ namespace Umbraco.Tests.Routing { SetDomains3(); - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext(inputUrl, globalSettings:globalSettings); var publishedRouter = CreatePublishedRouter(Factory); var frequest = publishedRouter.CreateRequest(umbracoContext); diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs index 27027c007f..c2c4c2f05a 100644 --- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs +++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs @@ -8,7 +8,6 @@ using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Web.Routing; @@ -25,9 +24,9 @@ namespace Umbraco.Tests.Routing { base.SetUp(); - _globalSettings = new GlobalSettingsBuilder().Build(); - _webRoutingSettings = new WebRoutingSettingsBuilder().Build(); - _requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + _globalSettings = new GlobalSettings(); + _webRoutingSettings = new WebRoutingSettings(); + _requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; } private ILocalizedTextService GetTextService() diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs index b134934ee9..5a6ea14419 100644 --- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs @@ -4,7 +4,7 @@ using Moq; using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -13,7 +13,6 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; using Umbraco.Core.Services; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.PublishedContent; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; @@ -35,7 +34,7 @@ namespace Umbraco.Tests.Routing var logger = Mock.Of(); var mediaFileSystemMock = Mock.Of(); - var contentSettings = new ContentSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); var dataTypeService = Mock.Of(); var propertyEditors = new MediaUrlGeneratorCollection(new IMediaUrlGenerator[] { @@ -150,7 +149,7 @@ namespace Umbraco.Tests.Routing private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext) { - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); return new UrlProvider( new TestUmbracoContextAccessor(umbracoContext), Microsoft.Extensions.Options.Options.Create(webRoutingSettings), diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 5082919dc1..9ef758db8b 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -73,7 +73,7 @@ namespace Umbraco.Tests.Routing var umbracoApiControllerTypes = new UmbracoApiControllerTypeCollection(Composition.TypeLoader.GetUmbracoApiControllers()); Composition.RegisterUnique(umbracoApiControllerTypes); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); Composition.RegisterUnique(_ => new DefaultShortStringHelper(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings))); } diff --git a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs index c0b83b08cb..e3d6477988 100644 --- a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs +++ b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs @@ -2,6 +2,7 @@ using System.Web.Mvc; using System.Web.Routing; using NUnit.Framework; +using Umbraco.Core.Configuration.Models; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Web; @@ -51,10 +52,7 @@ namespace Umbraco.Tests.Routing { //reset the app config, we only want to test routes not the hard coded paths - var globalSettings = new GlobalSettingsBuilder() - .WithReservedPaths(string.Empty) - .WithReservedUrls(String.Empty) - .Build(); + var globalSettings = new GlobalSettings { ReservedPaths = string.Empty, ReservedUrls = string.Empty }; var routableDocFilter = new RoutableDocumentFilter(globalSettings, IOHelper); diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index ceea358a42..31f627827b 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -24,9 +24,8 @@ namespace Umbraco.Tests.Routing // FIXME: be able to get the UmbracoModule from the container. any reason settings were from testobjects? //create the module var logger = Mock.Of(); - var globalSettings = new GlobalSettingsBuilder() - .WithReservedPaths((GlobalSettings.StaticReservedPaths + "~/umbraco")) - .Build(); + + var globalSettings = new GlobalSettings { ReservedPaths = GlobalSettings.StaticReservedPaths + "~/umbraco" }; var runtime = Umbraco.Core.RuntimeState.Booting(); _module = new UmbracoInjectedModule diff --git a/src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs b/src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs index 2c5bfc52e9..18e0480a7b 100644 --- a/src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs +++ b/src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs @@ -1,7 +1,6 @@ using NUnit.Framework; using Umbraco.Core.Configuration.Models; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Testing; using Umbraco.Web.Routing; @@ -15,7 +14,7 @@ namespace Umbraco.Tests.Routing public override void SetUp() { - _globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(HideTopLevelNodeFromPath).Build(); + _globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = HideTopLevelNodeFromPath }; base.SetUp(); PublishedSnapshotService = CreatePublishedSnapshotService(_globalSettings); @@ -40,8 +39,7 @@ namespace Umbraco.Tests.Routing [TestCase(1172, "/test-page/")] // not hidden because not first root public void Get_Url_Hiding_Top_Level(int nodeId, string niceUrlMatch) { - - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: _globalSettings, snapshotService:PublishedSnapshotService); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); diff --git a/src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs b/src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs index e8f3bf97fd..ea64aa43f2 100644 --- a/src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs +++ b/src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs @@ -8,7 +8,6 @@ using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Tests.PublishedContent; using Umbraco.Tests.Testing; @@ -25,7 +24,7 @@ namespace Umbraco.Tests.Routing public UrlProviderWithoutHideTopLevelNodeFromPathTests() { - _globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(HideTopLevelNodeFromPath).Build(); + _globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = HideTopLevelNodeFromPath }; } protected override bool HideTopLevelNodeFromPath => false; @@ -43,7 +42,7 @@ namespace Umbraco.Tests.Routing [Test] public void Ensure_Cache_Is_Correct() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: _globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -104,7 +103,7 @@ namespace Umbraco.Tests.Routing [TestCase(1172, "/test-page/")] public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: _globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -124,7 +123,7 @@ namespace Umbraco.Tests.Routing { const string currentUri = "http://example.us/test"; - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty(), Enumerable.Empty(), ContentVariation.Culture); var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 }; @@ -170,7 +169,7 @@ namespace Umbraco.Tests.Routing { const string currentUri = "http://example.fr/test"; - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty(), Enumerable.Empty(), ContentVariation.Culture); var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 }; @@ -225,7 +224,7 @@ namespace Umbraco.Tests.Routing { const string currentUri = "http://example.us/test"; - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty(), Enumerable.Empty(), ContentVariation.Culture); var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 }; @@ -276,7 +275,7 @@ namespace Umbraco.Tests.Routing [Test] public void Get_Url_Relative_Or_Absolute() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: _globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -296,7 +295,7 @@ namespace Umbraco.Tests.Routing [Test] public void Get_Url_Unpublished() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var urlProvider = new DefaultUrlProvider(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings), Logger, diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs index d0dd708561..4894e1ad7e 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.LegacyXmlPublishedCache; @@ -197,7 +198,7 @@ DetermineRouteById(id): [TestCase(2006, false, "/x/b/e")] public void GetRouteByIdNoHide(int id, bool hide, string expected) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(hide).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = hide }; var umbracoContext = GetUmbracoContext("/test", 0, globalSettings: globalSettings); var cache = umbracoContext.Content as PublishedContentCache; @@ -220,7 +221,7 @@ DetermineRouteById(id): [TestCase(2006, true, "/b/e")] // risky! public void GetRouteByIdHide(int id, bool hide, string expected) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(hide).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = hide }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext("/test", 0, globalSettings: globalSettings, snapshotService: snapshotService); @@ -234,7 +235,7 @@ DetermineRouteById(id): [Test] public void GetRouteByIdCache() { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext("/test", 0, globalSettings:globalSettings, snapshotService: snapshotService); @@ -265,7 +266,7 @@ DetermineRouteById(id): [TestCase("/x", false, 2000)] public void GetByRouteNoHide(string route, bool hide, int expected) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(hide).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = hide }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext("/test", 0, globalSettings:globalSettings, snapshotService: snapshotService); @@ -296,7 +297,7 @@ DetermineRouteById(id): [TestCase("/b/c", true, 1002)] // (hence the 2005 collision) public void GetByRouteHide(string route, bool hide, int expected) { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(hide).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = hide }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext("/test", 0, globalSettings:globalSettings, snapshotService: snapshotService); @@ -319,7 +320,7 @@ DetermineRouteById(id): [Test] public void GetByRouteCache() { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var snapshotService = CreatePublishedSnapshotService(globalSettings); var umbracoContext = GetUmbracoContext("/test", 0, globalSettings:globalSettings, snapshotService:snapshotService); diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs index a960cdba53..b5142ae480 100644 --- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs @@ -4,11 +4,11 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Web; using Umbraco.Web.Routing; @@ -177,9 +177,8 @@ namespace Umbraco.Tests.Routing [TestCase(10011, "https://domain1.com", false, "/1001-1/")] public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -212,8 +211,8 @@ namespace Umbraco.Tests.Routing [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")] public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -238,9 +237,8 @@ namespace Umbraco.Tests.Routing [TestCase(1002, "http://domain1.com", false, "/1002/")] public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -271,9 +269,8 @@ namespace Umbraco.Tests.Routing [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")] public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -295,9 +292,8 @@ namespace Umbraco.Tests.Routing [Test] public void Get_Url_DomainsAndCache() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -361,9 +357,8 @@ namespace Umbraco.Tests.Routing [Test] public void Get_Url_Relative_Or_Absolute() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("http://domain1.com/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -388,9 +383,8 @@ namespace Umbraco.Tests.Routing [Test] public void Get_Url_Alternate() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); - - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; var umbracoContext = GetUmbracoContext("http://domain1.com/en/test", 1111, globalSettings: globalSettings); var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext); @@ -417,7 +411,7 @@ namespace Umbraco.Tests.Routing private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider) { - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); return new UrlProvider( new TestUmbracoContextAccessor(umbracoContext), Microsoft.Extensions.Options.Options.Create(webRoutingSettings), diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index 03faa70d8c..d4fac0cf9b 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -3,14 +3,14 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Web.Routing; using Umbraco.Core.Services; +using Umbraco.Tests.Common; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Web; -using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; +using Umbraco.Web.Routing; namespace Umbraco.Tests.Routing { @@ -32,8 +32,8 @@ namespace Umbraco.Tests.Routing [Test] public void DoNotPolluteCache() { - var globalSettings = new GlobalSettingsBuilder().WithHideTopLevelNodeFromPath(false).Build(); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().WithAddTrailingSlash(true).Build(); + var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true }; + var globalSettings = new GlobalSettings { HideTopLevelNodeFromPath = false }; SetDomains1(); @@ -97,7 +97,7 @@ namespace Umbraco.Tests.Routing private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider) { - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); return new UrlProvider( new TestUmbracoContextAccessor(umbracoContext), Microsoft.Extensions.Options.Options.Create(webRoutingSettings), diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs index 7c834d7cf3..aee0275fe0 100644 --- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs +++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs @@ -39,6 +39,7 @@ using Umbraco.Tests.Common.Composing; using Umbraco.Core.Media; using Umbraco.Tests.Common.Builders; using Microsoft.Extensions.Options; +using Umbraco.Core.Configuration.Models; namespace Umbraco.Tests.Runtimes { @@ -65,8 +66,8 @@ namespace Umbraco.Tests.Runtimes var profiler = new LogProfiler(logger); var profilingLogger = new ProfilingLogger(logger, profiler); var appCaches = AppCaches.Disabled; - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); var typeFinder = TestHelper.GetTypeFinder(); var databaseFactory = new UmbracoDatabaseFactory(logger, Options.Create(globalSettings), Options.Create(connectionStrings), new Lazy(() => factory.GetInstance()), TestHelper.DbProviderFactoryCreator); var ioHelper = TestHelper.IOHelper; @@ -120,12 +121,12 @@ namespace Umbraco.Tests.Runtimes // TODO: found these registration were necessary here as dependencies for ComponentCollection // are not resolved. Need to check this if these explicit registrations are the best way to handle this. - var contentSettings = new ContentSettingsBuilder().Build(); - var coreDebugSettings = new CoreDebugSettingsBuilder().Build(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); - var userPasswordConfigurationSettings = new UserPasswordConfigurationSettingsBuilder().Build(); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); + var coreDebugSettings = new CoreDebugSettings(); + var nuCacheSettings = new NuCacheSettings(); + var requestHandlerSettings = new RequestHandlerSettings(); + var userPasswordConfigurationSettings = new UserPasswordConfigurationSettings(); + var webRoutingSettings = new WebRoutingSettings(); composition.Register(x => Options.Create(globalSettings)); composition.Register(x => Options.Create(contentSettings)); @@ -292,8 +293,8 @@ namespace Umbraco.Tests.Runtimes composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator, hostingEnvironment, backOfficeInfo); // create the core runtime and have it compose itself - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); var coreRuntime = new CoreRuntime(globalSettings, connectionStrings, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder, AppCaches.NoCache); diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs index 5ca6308bcd..f5748e7dba 100644 --- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs @@ -5,18 +5,18 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; -using Umbraco.Core.Scoping; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.TestHelpers.Entities; +using Umbraco.Core.Models; using Umbraco.Core.Persistence.Mappers; +using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Tests.Components; +using Umbraco.Tests.TestHelpers; +using Umbraco.Tests.TestHelpers.Entities; using Current = Umbraco.Web.Composing.Current; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.Scoping { @@ -39,7 +39,7 @@ namespace Umbraco.Tests.Scoping _testObjects = new TestObjects(register); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); composition.RegisterUnique(factory => new FileSystems(factory, factory.TryGetInstance(), TestHelper.IOHelper, Microsoft.Extensions.Options.Options.Create(globalSettings), TestHelper.GetHostingEnvironment())); composition.WithCollectionBuilder(); diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index 243ad50eef..fcc1d4c7b3 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Scoping var typeFinder = TestHelper.GetTypeFinder(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); + var nuCacheSettings = new NuCacheSettings(); return new PublishedSnapshotService( options, @@ -105,7 +105,7 @@ namespace Umbraco.Tests.Scoping documentRepository, mediaRepository, memberRepository, DefaultCultureAccessor, new DatabaseDataSource(Mock.Of()), - Microsoft.Extensions.Options.Options.Create(globalSettings ?? new GlobalSettingsBuilder().Build()), + Microsoft.Extensions.Options.Options.Create(globalSettings ?? new GlobalSettings()), Factory.GetInstance(), new NoopPublishedModelFactory(), new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(ShortStringHelper) }), diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs index da90d7fefa..15e9162708 100644 --- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs @@ -33,7 +33,7 @@ namespace Umbraco.Tests.Scoping { base.SetUp(); - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } protected override void Compose() diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs index 59610e43bd..21c9c2c67c 100644 --- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs @@ -5,6 +5,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Events; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -44,9 +45,9 @@ namespace Umbraco.Tests.Scoping protected override void ComposeSettings() { - var contentSettings = new ContentSettingsBuilder().Build(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var userPasswordConfigurationSettings = new UserPasswordConfigurationSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); + var globalSettings = new GlobalSettings(); + var userPasswordConfigurationSettings = new UserPasswordConfigurationSettings(); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(contentSettings)); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(globalSettings)); diff --git a/src/Umbraco.Tests/Security/OwinDataProtectorTokenProviderTests.cs b/src/Umbraco.Tests/Security/OwinDataProtectorTokenProviderTests.cs index 4874545571..66965ca632 100644 --- a/src/Umbraco.Tests/Security/OwinDataProtectorTokenProviderTests.cs +++ b/src/Umbraco.Tests/Security/OwinDataProtectorTokenProviderTests.cs @@ -229,7 +229,7 @@ namespace Umbraco.Tests.Security _mockDataProtector.Setup(x => x.Protect(It.IsAny())).Returns((byte[] originalBytes) => originalBytes); _mockDataProtector.Setup(x => x.Unprotect(It.IsAny())).Returns((byte[] originalBytes) => originalBytes); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); _mockUserManager = new Mock>(new Mock>().Object, null, null, null, null, null, null, null, null); diff --git a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs index 208afe5b4b..c22679a820 100644 --- a/src/Umbraco.Tests/Services/ContentServiceEventTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceEventTests.cs @@ -26,7 +26,7 @@ namespace Umbraco.Tests.Services { base.SetUp(); ContentRepositoryBase.ThrowOnWarning = true; - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } public override void TearDown() diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index 02f6ad330f..24aac13ade 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -2,21 +2,17 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.IO; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.TestHelpers.Stubs; @@ -44,7 +40,7 @@ namespace Umbraco.Tests.Services private DocumentRepository CreateDocumentRepository(IScopeProvider provider) { var accessor = (IScopeAccessor)provider; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var tRepository = new TemplateRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper); var tagRepo = new TagRepository(accessor, AppCaches.Disabled, Logger); var commonRepository = new ContentTypeCommonRepository(accessor, tRepository, AppCaches, ShortStringHelper); diff --git a/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs b/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs index 35bbaa5f68..51adfbeae9 100644 --- a/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs +++ b/src/Umbraco.Tests/Services/ContentServicePublishBranchTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Tests.Common.Builders; @@ -426,7 +427,7 @@ namespace Umbraco.Tests.Services private void CreateTypes(out IContentType iContentType, out IContentType vContentType) { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var langDe = new Language(globalSettings, "de") { IsDefault = true }; ServiceContext.LocalizationService.Save(langDe); diff --git a/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs b/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs index 10bd82cbde..d443951cad 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTagsTests.cs @@ -29,7 +29,7 @@ namespace Umbraco.Tests.Services { base.SetUp(); ContentRepositoryBase.ThrowOnWarning = true; - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } public override void TearDown() diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index 82d7235388..49767e02dd 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -46,7 +46,7 @@ namespace Umbraco.Tests.Services { base.SetUp(); ContentRepositoryBase.ThrowOnWarning = true; - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } public override void TearDown() diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs index bef6fde816..bece3d2f68 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Services var typeFinder = TestHelper.GetTypeFinder(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); + var nuCacheSettings = new NuCacheSettings(); return new PublishedSnapshotService( options, @@ -77,7 +77,7 @@ namespace Umbraco.Tests.Services documentRepository, mediaRepository, memberRepository, DefaultCultureAccessor, new DatabaseDataSource(Mock.Of()), - Microsoft.Extensions.Options.Options.Create(globalSettings ?? new GlobalSettingsBuilder().Build()), + Microsoft.Extensions.Options.Options.Create(globalSettings ?? new GlobalSettings()), Factory.GetInstance(), Mock.Of(), new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(ShortStringHelper) }), @@ -313,7 +313,7 @@ namespace Umbraco.Tests.Services var nlContentName = "Content nl-NL"; var nlCulture = "nl-NL"; - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); ServiceContext.LocalizationService.Save(new Language(globalSettings, nlCulture)); @@ -671,7 +671,7 @@ namespace Umbraco.Tests.Services // can change it to variant and back // can then switch one property to variant - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var languageEn = new Language(globalSettings, "en") { IsDefault = true }; ServiceContext.LocalizationService.Save(languageEn); @@ -1266,7 +1266,7 @@ namespace Umbraco.Tests.Services private void CreateFrenchAndEnglishLangs() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var languageEn = new Language(globalSettings, "en") { IsDefault = true }; ServiceContext.LocalizationService.Save(languageEn); var languageFr = new Language(globalSettings, "fr"); diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index 8be2dcc962..ca2f123deb 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Core.Persistence.DatabaseModelDefinitions; @@ -32,7 +33,7 @@ namespace Umbraco.Tests.Services if (_langFr == null && _langEs == null) { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); _langFr = new Language(globalSettings, "fr-FR"); _langEs = new Language(globalSettings, "es-ES"); ServiceContext.LocalizationService.Save(_langFr); diff --git a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs index 8497208d93..1e8e6bd17d 100644 --- a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs +++ b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs @@ -23,7 +23,7 @@ namespace Umbraco.Tests.Services public override void SetUp() { base.SetUp(); - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } [Test] diff --git a/src/Umbraco.Tests/Services/LocalizationServiceTests.cs b/src/Umbraco.Tests/Services/LocalizationServiceTests.cs index 2785cdea27..4d3c5fdddc 100644 --- a/src/Umbraco.Tests/Services/LocalizationServiceTests.cs +++ b/src/Umbraco.Tests/Services/LocalizationServiceTests.cs @@ -36,7 +36,7 @@ namespace Umbraco.Tests.Services public override void SetUp() { base.SetUp(); - _globalSettings = new GlobalSettingsBuilder().Build(); + _globalSettings = new GlobalSettings(); } [Test] diff --git a/src/Umbraco.Tests/Services/SectionServiceTests.cs b/src/Umbraco.Tests/Services/SectionServiceTests.cs index 82fda67003..032d317ebc 100644 --- a/src/Umbraco.Tests/Services/SectionServiceTests.cs +++ b/src/Umbraco.Tests/Services/SectionServiceTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.Membership; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Testing; @@ -35,7 +36,7 @@ namespace Umbraco.Tests.Services private IUser CreateTestUser() { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var user = new User(globalSettings) { Name = "Test user", diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs index fef2fa30af..76eda054bc 100644 --- a/src/Umbraco.Tests/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests/Services/UserServiceTests.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.Querying; @@ -721,7 +722,7 @@ namespace Umbraco.Tests.Services var hash = new HMACSHA1(); hash.Key = Encoding.Unicode.GetBytes(password); var encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var membershipUser = new User(globalSettings, "JohnDoe", "john@umbraco.io", encodedPassword, encodedPassword); userService.Save(membershipUser); diff --git a/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs b/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs index 71d789eddb..382d984e52 100644 --- a/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs +++ b/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Strings; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; @@ -31,7 +32,7 @@ namespace Umbraco.Tests.Strings [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // issue is fixed public void CompatibleDefaultReplacement(string input, string expected) { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings)); var output = input.Length < 2 ? input : helper.SplitPascalCasing(input, ' ').ToFirstUpperInvariant(); Assert.AreEqual(expected, output); diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs index 12f5022b55..73e08ee1d8 100644 --- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs @@ -6,9 +6,9 @@ using System.Text.RegularExpressions; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Composing; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Testing; namespace Umbraco.Tests.Strings @@ -24,7 +24,7 @@ namespace Umbraco.Tests.Strings // NOTE pre-filters runs _before_ Recode takes place // so there still may be utf8 chars even though you want ascii - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); _helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.FileName, new DefaultShortStringHelperConfig.Config { @@ -93,10 +93,7 @@ namespace Umbraco.Tests.Strings [Test] public void U4_4056() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder() - .WithConvertUrlsToAscii("false") - .WithCharCollection(Enumerable.Empty()) - .Build(); + var requestHandlerSettings = new RequestHandlerSettings { ConvertUrlsToAscii = "false", CharCollection = Enumerable.Empty() }; const string input = "ÆØÅ and æøå and 中文测试 and אודות האתר and größer БбДдЖж page"; @@ -118,10 +115,7 @@ namespace Umbraco.Tests.Strings [Test] public void U4_4056_TryAscii() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder() - .WithConvertUrlsToAscii("false") - .WithCharCollection(Enumerable.Empty()) - .Build(); + var requestHandlerSettings = new RequestHandlerSettings { ConvertUrlsToAscii = "false", CharCollection = Enumerable.Empty() }; const string input1 = "ÆØÅ and æøå and 中文测试 and אודות האתר and größer БбДдЖж page"; const string input2 = "ÆØÅ and æøå and größer БбДдЖж page"; @@ -144,7 +138,8 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringUnderscoreInTerm() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings { ConvertUrlsToAscii = "false", CharCollection = Enumerable.Empty() }; + var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -169,7 +164,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringLeadingChars() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -198,7 +193,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringTermOnUpper() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -223,7 +218,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringAcronymOnNonUpper() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -254,7 +249,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringGreedyAcronyms() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -285,7 +280,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringWhiteSpace() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -299,7 +294,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringSeparator() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -335,7 +330,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringSymbols() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { @@ -390,7 +385,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringEncoding() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config @@ -414,10 +409,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringDefaultConfig() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder() - .WithCharCollection(Enumerable.Empty()) - .WithConvertUrlsToAscii("false") - .Build(); + var requestHandlerSettings = new RequestHandlerSettings { ConvertUrlsToAscii = "false", CharCollection = Enumerable.Empty() }; var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)); @@ -440,7 +432,7 @@ namespace Umbraco.Tests.Strings [Test] public void CleanStringCasing() { - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings) .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config { diff --git a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs index 4dc7ad0278..4a796e67af 100644 --- a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs +++ b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs @@ -1,20 +1,16 @@ -using Umbraco.Core.Logging; +using System; +using System.Diagnostics; +using System.Linq; using Moq; using NUnit.Framework; -using Umbraco.Web.Templates; -using Umbraco.Web; -using Umbraco.Core.Models.PublishedContent; -using Umbraco.Web.Routing; -using Umbraco.Tests.Testing.Objects; -using System.Web; -using System; -using System.Linq; -using Umbraco.Core.Models; using Umbraco.Core; -using System.Diagnostics; -using Umbraco.Tests.TestHelpers; +using Umbraco.Core.Configuration.Models; +using Umbraco.Core.Models; +using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; +using Umbraco.Tests.Testing.Objects; +using Umbraco.Web.Routing; +using Umbraco.Web.Templates; namespace Umbraco.Tests.Templates { @@ -77,7 +73,7 @@ namespace Umbraco.Tests.Templates var umbracoContextFactory = TestUmbracoContextFactory.Create( umbracoContextAccessor: umbracoContextAccessor); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var publishedUrlProvider = new UrlProvider(umbracoContextAccessor, Microsoft.Extensions.Options.Options.Create(webRoutingSettings), new UrlProviderCollection(Enumerable.Empty()), diff --git a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs index 375dc91d19..60fd2f103c 100644 --- a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs +++ b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs @@ -1,16 +1,13 @@ -using Moq; -using NUnit.Framework; -using System; +using System; using System.Linq; -using System.Web; +using Moq; +using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; -using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; -using Umbraco.Web; using Umbraco.Web.Routing; using Umbraco.Web.Templates; @@ -73,7 +70,7 @@ namespace Umbraco.Tests.Templates var umbracoContextFactory = TestUmbracoContextFactory.Create( umbracoContextAccessor: umbracoContextAccessor); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var publishedUrlProvider = new UrlProvider(umbracoContextAccessor, Microsoft.Extensions.Options.Options.Create(webRoutingSettings), new UrlProviderCollection(new []{contentUrlProvider.Object}), diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index e51a10da50..8f18d96a97 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -93,7 +93,7 @@ namespace Umbraco.Tests.TestHelpers internal PublishedRouter CreatePublishedRouter(IFactory container = null, ContentFinderCollection contentFinders = null) { - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); return CreatePublishedRouter(webRoutingSettings, container ?? Factory, contentFinders); } diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs index 4977b5d81a..4707c4af38 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs @@ -1,8 +1,8 @@ -using Moq; -using System; +using System; using System.Collections.Generic; +using Moq; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.Membership; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.TestHelpers.Entities { @@ -24,7 +24,7 @@ namespace Umbraco.Tests.TestHelpers.Entities internal static User CreateUser(string suffix = "") { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var user = new User(globalSettings) { Language = "en", @@ -43,7 +43,7 @@ namespace Umbraco.Tests.TestHelpers.Entities { var list = new List(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); for (int i = 0; i < amount; i++) { var name = "Member No-" + i; diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs index 760fb7dbaa..4311abc52b 100644 --- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs @@ -104,7 +104,7 @@ namespace Umbraco.Tests.TestHelpers public static IMainDom MainDom => _testHelperInternal.MainDom; public static UriUtility UriUtility => _testHelperInternal.UriUtility; - public static IEmailSender EmailSender { get; } = new EmailSender(Options.Create(new GlobalSettingsBuilder().Build())); + public static IEmailSender EmailSender { get; } = new EmailSender(Options.Create(new GlobalSettings())); /// diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index e101bb33a3..8e6dadaaeb 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -82,10 +82,10 @@ namespace Umbraco.Tests.TestHelpers public IScopeProvider GetScopeProvider(ILogger logger, ITypeFinder typeFinder = null, FileSystems fileSystems = null, IUmbracoDatabaseFactory databaseFactory = null) { - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var connectionString = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ConnectionString; - var connectionStrings = new ConnectionStringsBuilder().WithUmbracoConnectionString(connectionString).Build(); - var coreDebugSettings = new CoreDebugSettingsBuilder().Build(); + var connectionStrings = new ConnectionStrings { UmbracoConnectionString = new ConfigConnectionString(Constants.System.UmbracoConnectionName, connectionString) }; + var coreDebugSettings = new CoreDebugSettings(); if (databaseFactory == null) { diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index f1a834021f..ad36b3e9c3 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -373,7 +373,7 @@ namespace Umbraco.Tests.TestHelpers httpContextAccessor, service, Mock.Of(), - globalSettings ?? new GlobalSettingsBuilder().Build(), + globalSettings ?? new GlobalSettings(), HostingEnvironment, new TestVariationContextAccessor(), UriUtility, diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs index 8a08e2be07..04bae0372a 100644 --- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs +++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs @@ -86,7 +86,7 @@ namespace Umbraco.Tests.Testing.TestingTests .Returns(UrlInfo.Url("/hello/world/1234")); var urlProvider = urlProviderMock.Object; - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var theUrlProvider = new UrlProvider( new TestUmbracoContextAccessor(umbracoContext), Microsoft.Extensions.Options.Options.Create(webRoutingSettings), diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 0c39ee47f0..d6f65e4ce5 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -40,7 +40,6 @@ using Umbraco.Core.Services.Implement; using Umbraco.Core.Strings; using Umbraco.Net; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Components; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; @@ -173,7 +172,7 @@ namespace Umbraco.Tests.Testing TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash()); var appCaches = GetAppCaches(); - var globalSettings = new GlobalSettingsBuilder().Build(); + var globalSettings = new GlobalSettings(); var settings = new WebRoutingSettings(); IBackOfficeInfo backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, IOHelper, logger, Microsoft.Extensions.Options.Options.Create(settings)); @@ -323,7 +322,7 @@ namespace Umbraco.Tests.Testing Composition.RegisterUnique(); Composition.RegisterUnique(); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); Composition.RegisterUnique(factory => new UrlProvider( factory.GetInstance(), @@ -414,13 +413,13 @@ namespace Umbraco.Tests.Testing protected virtual void ComposeSettings() { - var contentSettings = new ContentSettingsBuilder().Build(); - var coreDebugSettings = new CoreDebugSettingsBuilder().Build(); - var globalSettings = new GlobalSettingsBuilder().Build(); - var nuCacheSettings = new NuCacheSettingsBuilder().Build(); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); - var userPasswordConfigurationSettings = new UserPasswordConfigurationSettingsBuilder().Build(); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var contentSettings = new ContentSettings(); + var coreDebugSettings = new CoreDebugSettings(); + var globalSettings = new GlobalSettings(); + var nuCacheSettings = new NuCacheSettings(); + var requestHandlerSettings = new RequestHandlerSettings(); + var userPasswordConfigurationSettings = new UserPasswordConfigurationSettings(); + var webRoutingSettings = new WebRoutingSettings(); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(contentSettings)); Composition.Register(x => Microsoft.Extensions.Options.Options.Create(coreDebugSettings)); @@ -465,8 +464,8 @@ namespace Umbraco.Tests.Testing Composition.RegisterUnique(_ => new TransientEventMessagesFactory()); - var globalSettings = new GlobalSettingsBuilder().Build(); - var connectionStrings = new ConnectionStringsBuilder().Build(); + var globalSettings = new GlobalSettings(); + var connectionStrings = new ConnectionStrings(); Composition.RegisterUnique(f => new UmbracoDatabaseFactory(Logger, globalSettings, diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs index eac16e457f..0767bf3191 100644 --- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs @@ -1,13 +1,10 @@ using System.IO; using NUnit.Framework; -using Umbraco.Core; using Umbraco.Core.Composing; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Logging.Serilog; using Umbraco.Core.Strings; -using Umbraco.Tests.Common.Builders; -using Umbraco.Tests.Components; using Umbraco.Tests.TestHelpers; namespace Umbraco.Tests.UmbracoExamine @@ -34,7 +31,7 @@ namespace Umbraco.Tests.UmbracoExamine protected override void Compose() { base.Compose(); - var requestHandlerSettings = new RequestHandlerSettingsBuilder().Build(); + var requestHandlerSettings = new RequestHandlerSettings(); Composition.RegisterUnique(_ => new DefaultShortStringHelper(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings))); } } diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs index 8e0c534550..6950d69b3e 100644 --- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs @@ -2,24 +2,18 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; -using System.Web.Security; using Moq; using NUnit.Framework; -using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Core.Dictionary; -using Umbraco.Core.Logging; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Tests.Common; -using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Web; using Umbraco.Web.Mvc; using Umbraco.Web.PublishedCache; -using Umbraco.Web.Security; -using Umbraco.Web.Security.Providers; using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Web.Mvc @@ -156,7 +150,7 @@ namespace Umbraco.Tests.Web.Mvc var content = Mock.Of(publishedContent => publishedContent.Id == 12345); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var publishedRouter = BaseWebTest.CreatePublishedRouter(webRoutingSettings); var frequest = publishedRouter.CreateRequest(umbracoContext, new Uri("http://localhost/test")); frequest.PublishedContent = content; diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs index 5e89f29496..e0e5aa0b2a 100644 --- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs @@ -1,28 +1,25 @@ using System; using System.Globalization; -using System.Linq; using System.Web.Mvc; using System.Web.Routing; using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; -using Umbraco.Web.Composing; -using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.Configuration.Models; using Umbraco.Core.Logging; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; -using Umbraco.Core.Strings; +using Umbraco.Tests.Common; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; -using Umbraco.Tests.Common; using Umbraco.Web; +using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Mvc; using Umbraco.Web.Routing; using Umbraco.Web.Security; -using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.Web.Mvc { @@ -388,7 +385,7 @@ namespace Umbraco.Tests.Web.Mvc { var umbracoContext = GetUmbracoContext("/dang", 0); - var webRoutingSettings = new WebRoutingSettingsBuilder().Build(); + var webRoutingSettings = new WebRoutingSettings(); var publishedRouter = BaseWebTest.CreatePublishedRouter(webRoutingSettings); var frequest = publishedRouter.CreateRequest(umbracoContext, new Uri("http://localhost/dang"));