From eb2cf9b4daeb930bd1e7582d96057668ce46a61a Mon Sep 17 00:00:00 2001 From: Mole Date: Wed, 10 Feb 2021 14:58:22 +0100 Subject: [PATCH] Align namespaces in Umbraco.Tests.UnitTests --- .../AutoFixture/AutoMoqDataAttribute.cs | 4 +--- .../AutoFixture/InlineAutoMoqDataAttribute.cs | 2 +- .../TestHelpers/BaseUsingSqlSyntax.cs | 3 +-- .../TestHelpers/CompositionExtensions.cs | 2 +- .../TestHelpers/Objects/TestUmbracoContextFactory.cs | 7 +------ src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs | 2 +- .../Models/ConnectionStringsTests.cs | 2 +- .../Umbraco.Core/AttemptTests.cs | 3 +-- .../BackOfficeClaimsPrincipalFactoryTests.cs | 3 +-- .../BackOffice/IdentityExtensionsTests.cs | 2 +- .../BackOffice/NopLookupNormalizerTests.cs | 2 +- .../BackOffice/UmbracoBackOfficeIdentityTests.cs | 2 +- .../Umbraco.Core/Cache/AppCacheTests.cs | 3 +-- .../Umbraco.Core/Cache/DeepCloneAppCacheTests.cs | 2 +- .../Umbraco.Core/Cache/DefaultCachePolicyTests.cs | 3 +-- .../Umbraco.Core/Cache/DictionaryAppCacheTests.cs | 3 +-- .../Cache/DistributedCache/DistributedCacheTests.cs | 4 +--- .../Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs | 3 +-- .../Umbraco.Core/Cache/HttpRequestAppCacheTests.cs | 3 +-- .../Umbraco.Core/Cache/ObjectAppCacheTests.cs | 3 +-- .../Umbraco.Core/Cache/RefresherTests.cs | 3 +-- .../Umbraco.Core/Cache/RuntimeAppCacheTests.cs | 2 +- .../Cache/SingleItemsOnlyCachePolicyTests.cs | 3 +-- .../Umbraco.Core/ClaimsIdentityExtensionsTests.cs | 2 +- .../Collections/DeepCloneableListTests.cs | 2 +- .../Umbraco.Core/Collections/OrderedHashSetTests.cs | 2 +- .../Umbraco.Core/Components/ComponentTests.cs | 10 +++------- .../Umbraco.Core/Composing/CollectionBuildersTests.cs | 5 ++--- .../Umbraco.Core/Composing/ComposingTestBase.cs | 7 ++----- .../Umbraco.Core/Composing/CompositionTests.cs | 2 +- .../Composing/LazyCollectionBuilderTests.cs | 5 ++--- .../Composing/PackageActionCollectionTests.cs | 5 ++--- .../Umbraco.Core/Composing/TypeFinderTests.cs | 2 +- .../Umbraco.Core/Composing/TypeHelperTests.cs | 3 +-- .../Umbraco.Core/Composing/TypeLoaderExtensions.cs | 2 +- .../Umbraco.Core/Composing/TypeLoaderTests.cs | 5 ++--- .../Extensions/HealthCheckSettingsExtensionsTests.cs | 2 +- .../Configuration/Models/GlobalSettingsTests.cs | 4 ++-- .../Validation/ContentSettingsValidatorTests.cs | 2 +- .../Models/Validation/GlobalSettingsValidatorTests.cs | 2 +- .../Validation/HealthChecksSettingsValidatorTests.cs | 2 +- .../RequestHandlerSettingsValidatorTests.cs | 2 +- .../Umbraco.Core/Configuration/NCronTabParserTests.cs | 2 +- .../Umbraco.Core/CoreThings/CallContextTests.cs | 4 +--- .../Umbraco.Core/CoreThings/ObjectExtensionsTests.cs | 2 +- .../Umbraco.Core/CoreThings/TryConvertToTests.cs | 2 +- .../Umbraco.Core/CoreThings/UdiTests.cs | 4 +--- .../Umbraco.Core/CoreXml/FrameworkXmlTests.cs | 2 +- .../Umbraco.Core/CoreXml/NavigableNavigatorTests.cs | 2 +- .../Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs | 2 +- .../Umbraco.Core/DelegateExtensionsTests.cs | 2 +- .../Umbraco.Core/EnumExtensionsTests.cs | 2 +- .../Umbraco.Core/EnumerableExtensionsTests.cs | 2 +- .../Umbraco.Core/Events/EventAggregatorTests.cs | 5 ++--- .../Extensions/ClaimsPrincipalExtensionsTests.cs | 4 +--- .../Umbraco.Core/Extensions/UriExtensionsTests.cs | 2 +- .../Umbraco.Core/GuidUtilsTests.cs | 3 +-- .../Umbraco.Core/HashCodeCombinerTests.cs | 3 +-- .../Umbraco.Core/HashGeneratorTests.cs | 3 +-- .../Umbraco.Core/HexEncoderTests.cs | 3 +-- .../Umbraco.Core/IO/AbstractFileSystemTests.cs | 2 +- .../Umbraco.Core/IO/PhysicalFileSystemTests.cs | 4 ++-- .../Umbraco.Core/Manifest/ManifestContentAppTests.cs | 6 ++---- .../Umbraco.Core/Manifest/ManifestParserTests.cs | 7 ++----- .../Umbraco.Core/Models/Collections/Item.cs | 2 +- .../Umbraco.Core/Models/Collections/OrderItem.cs | 2 +- .../Models/Collections/PropertyCollectionTests.cs | 4 ++-- .../Umbraco.Core/Models/Collections/SimpleOrder.cs | 2 +- .../Umbraco.Core/Models/ContentExtensionsTests.cs | 2 +- .../Umbraco.Core/Models/ContentScheduleTests.cs | 3 +-- .../Umbraco.Core/Models/ContentTests.cs | 2 +- .../Umbraco.Core/Models/ContentTypeTests.cs | 3 +-- .../Umbraco.Core/Models/CultureImpactTests.cs | 3 +-- .../Umbraco.Core/Models/DeepCloneHelperTests.cs | 3 +-- .../Umbraco.Core/Models/DictionaryItemTests.cs | 3 +-- .../Umbraco.Core/Models/DictionaryTranslationTests.cs | 3 +-- .../Umbraco.Core/Models/DocumentEntityTests.cs | 2 +- .../Umbraco.Core/Models/LanguageTests.cs | 3 +-- .../Umbraco.Core/Models/MacroTests.cs | 3 +-- .../Umbraco.Core/Models/MemberGroupTests.cs | 3 +-- .../Umbraco.Core/Models/MemberTests.cs | 3 +-- .../Umbraco.Core/Models/PropertyGroupTests.cs | 3 +-- .../Umbraco.Core/Models/PropertyTests.cs | 3 +-- .../Umbraco.Core/Models/PropertyTypeTests.cs | 3 +-- .../Umbraco.Core/Models/RangeTests.cs | 3 +-- .../Umbraco.Core/Models/RelationTests.cs | 3 +-- .../Umbraco.Core/Models/RelationTypeTests.cs | 3 +-- .../Umbraco.Core/Models/StylesheetTests.cs | 3 +-- .../Umbraco.Core/Models/TemplateTests.cs | 3 +-- .../Umbraco.Core/Models/UserExtensionsTests.cs | 4 +--- .../Umbraco.Core/Models/UserTests.cs | 2 +- .../Umbraco.Core/Models/VariationTests.cs | 5 ++--- .../Umbraco.Core/Packaging/PackageExtractionTests.cs | 3 +-- .../PropertyEditors/BlockEditorComponentTests.cs | 2 +- .../BlockListPropertyValueConverterTests.cs | 8 +------- .../PropertyEditors/ColorListValidatorTest.cs | 3 +-- .../Umbraco.Core/PropertyEditors/ConvertersTests.cs | 5 ++--- .../DataValueReferenceFactoryCollectionTests.cs | 2 +- .../EnsureUniqueValuesValidatorTest.cs | 3 +-- .../PropertyEditors/MultiValuePropertyEditorTests.cs | 5 +---- .../NestedContentPropertyComponentTests.cs | 2 +- .../PropertyEditorValueConverterTests.cs | 5 +---- .../PropertyEditors/PropertyEditorValueEditorTests.cs | 2 +- .../Umbraco.Core/Published/ConvertersTests.cs | 3 +-- .../Umbraco.Core/Published/ModelTypeTests.cs | 11 +++++------ .../Umbraco.Core/Published/NestedContentTests.cs | 3 +-- .../Umbraco.Core/Published/PropertyCacheLevelTests.cs | 3 +-- .../Umbraco.Core/ReflectionTests.cs | 2 +- .../Umbraco.Core/ReflectionUtilitiesTests.cs | 2 +- .../Umbraco.Core/Routing/SiteDomainHelperTests.cs | 4 +--- .../Umbraco.Core/Routing/UmbracoRequestPathsTests.cs | 2 +- .../Umbraco.Core/Routing/UriUtilityTests.cs | 3 +-- .../Umbraco.Core/Routing/WebPathTests.cs | 2 +- .../Umbraco.Core/Scoping/EventNameExtractorTests.cs | 4 +--- .../Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs | 6 +----- .../Umbraco.Core/Security/ContentPermissionsTests.cs | 5 +---- .../Security/LegacyPasswordSecurityTests.cs | 5 +---- .../Umbraco.Core/Security/MediaPermissionsTests.cs | 5 +---- .../Services/ContentTypeServiceExtensionsTests.cs | 2 +- .../ShortStringHelper/CmsHelperCasingTests.cs | 2 +- .../DefaultShortStringHelperTests.cs | 2 +- .../DefaultShortStringHelperTestsWithoutSetup.cs | 2 +- .../ShortStringHelper/MockShortStringHelper.cs | 2 +- .../ShortStringHelper/StringExtensionsTests.cs | 2 +- .../ShortStringHelper/StringValidationTests.cs | 2 +- .../ShortStringHelper/StylesheetHelperTests.cs | 2 +- .../Umbraco.Core/TaskHelperTests.cs | 5 ++--- .../Templates/HtmlImageSourceParserTests.cs | 8 ++------ .../Templates/HtmlLocalLinkParserTests.cs | 8 ++------ .../Umbraco.Core/Templates/ViewHelperTests.cs | 2 +- .../Umbraco.Core/VersionExtensionTests.cs | 2 +- .../Web/Routing/PublishedRequestBuilderTests.cs | 6 +----- .../Umbraco.Core/Xml/XmlHelperTests.cs | 2 +- .../Umbraco.Core/XmlExtensionsTests.cs | 2 +- .../BackOffice/BackOfficeLookupNormalizerTests.cs | 2 +- .../Editors/UserEditorAuthorizationHelperTests.cs | 5 +---- .../Examine/UmbracoContentValueSetValidatorTests.cs | 5 +---- .../HealthChecks/HealthCheckResultsTests.cs | 2 +- .../HostedServices/HealthCheckNotifierTests.cs | 6 +----- .../HostedServices/KeepAliveTests.cs | 5 +---- .../HostedServices/LogScrubberTests.cs | 7 +------ .../HostedServices/ScheduledPublishingTests.cs | 5 +---- .../ServerRegistration/InstructionProcessTaskTests.cs | 4 +--- .../ServerRegistration/TouchServerTaskTests.cs | 4 +--- .../HostedServices/TempFileCleanupTests.cs | 4 +--- .../Umbraco.Infrastructure/Logging/LogviewerTests.cs | 7 ++----- .../Umbraco.Infrastructure/Mapping/MappingTests.cs | 3 +-- .../Media/ImageSharpImageUrlGeneratorTests.cs | 4 +--- .../Migrations/AlterMigrationTests.cs | 4 ++-- .../Migrations/MigrationPlanTests.cs | 4 ++-- .../Migrations/MigrationTests.cs | 3 +-- .../Migrations/PostMigrationTests.cs | 3 +-- .../Migrations/Stubs/AlterUserTableMigrationStub.cs | 2 +- .../Migrations/Stubs/DropForeignKeyMigrationStub.cs | 2 +- .../Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs | 3 +-- .../Migrations/Stubs/FiveZeroMigration.cs | 2 +- .../Migrations/Stubs/FourElevenMigration.cs | 2 +- .../Migrations/Stubs/SixZeroMigration1.cs | 2 +- .../Migrations/Stubs/SixZeroMigration2.cs | 2 +- .../Umbraco.Infrastructure/Models/DataTypeTests.cs | 3 +-- .../Models/PathValidationTests.cs | 2 +- .../Persistence/BulkDataReaderTests.cs | 2 +- .../Persistence/DatabaseContextTests.cs | 2 +- .../Persistence/Mappers/ContentMapperTest.cs | 6 ++---- .../Persistence/Mappers/ContentTypeMapperTest.cs | 4 ++-- .../Persistence/Mappers/DataTypeMapperTest.cs | 5 ++--- .../Persistence/Mappers/DictionaryMapperTest.cs | 4 ++-- .../Mappers/DictionaryTranslationMapperTest.cs | 4 ++-- .../Persistence/Mappers/LanguageMapperTest.cs | 4 ++-- .../Persistence/Mappers/MediaMapperTest.cs | 5 ++--- .../Persistence/Mappers/PropertyGroupMapperTest.cs | 4 ++-- .../Persistence/Mappers/PropertyTypeMapperTest.cs | 5 ++--- .../Persistence/Mappers/RelationMapperTest.cs | 4 ++-- .../Persistence/Mappers/RelationTypeMapperTest.cs | 4 ++-- .../Persistence/NPocoTests/NPocoSqlExtensionsTests.cs | 4 ++-- .../Persistence/NPocoTests/NPocoSqlTemplateTests.cs | 2 +- .../Persistence/NPocoTests/NPocoSqlTests.cs | 5 ++--- .../Querying/ContentTypeRepositorySqlClausesTest.cs | 5 ++--- .../DataTypeDefinitionRepositorySqlClausesTest.cs | 5 ++--- .../Persistence/Querying/ExpressionTests.cs | 8 ++------ .../Querying/MediaRepositorySqlClausesTest.cs | 5 ++--- .../Querying/MediaTypeRepositorySqlClausesTest.cs | 5 ++--- .../Persistence/Querying/QueryBuilderTests.cs | 5 ++--- .../Serialization/JsonNetSerializerTests.cs | 2 +- .../Services/AmbiguousEventTests.cs | 3 +-- .../Services/LocalizedTextServiceTests.cs | 2 +- .../Services/PropertyValidationServiceTests.cs | 6 +----- .../Umbraco.ModelsBuilder.Embedded/BuilderTests.cs | 2 +- .../StringExtensions.cs | 2 +- .../UmbracoApplicationTests.cs | 2 +- .../SnapDictionaryTests.cs | 2 +- .../Builders/AllowedContentTypeDetail.cs | 2 +- .../Builders/ContentTypeBuilderTests.cs | 4 +--- .../Builders/DataTypeBuilderTests.cs | 3 +-- .../Builders/DocumentEntitySlimBuilderTests.cs | 2 +- .../Builders/LanguageBuilderTests.cs | 3 +-- .../Builders/MacroBuilderTests.cs | 3 +-- .../Builders/MediaTypeBuilderTests.cs | 4 +--- .../Builders/MemberBuilderTests.cs | 4 +--- .../Builders/MemberGroupBuilderTests.cs | 3 +-- .../Builders/MemberTypeBuilderTests.cs | 4 +--- .../Builders/PropertyBuilderTests.cs | 3 +-- .../Builders/PropertyGroupBuilderTests.cs | 3 +-- .../Builders/PropertyTypeBuilderTests.cs | 3 +-- .../Builders/PropertyTypeDetail.cs | 2 +- .../Builders/RelationBuilderTests.cs | 3 +-- .../Builders/RelationTypeBuilderTests.cs | 3 +-- .../Builders/StylesheetBuilderTests.cs | 3 +-- .../Builders/TemplateBuilderTests.cs | 3 +-- .../Umbraco.Tests.Common/Builders/TemplateDetail.cs | 2 +- .../Umbraco.Tests.Common/Builders/UserBuilderTests.cs | 2 +- .../Builders/UserGroupBuilderTests.cs | 2 +- .../Builders/XmlDocumentBuilderTests.cs | 2 +- .../Umbraco.Tests.UnitTests.csproj | 1 + .../Authorization/AdminUsersHandlerTests.cs | 5 +---- .../Authorization/BackOfficeHandlerTests.cs | 4 +--- .../ContentPermissionsPublishBranchHandlerTests.cs | 7 +------ .../ContentPermissionsQueryStringHandlerTests.cs | 6 +----- .../ContentPermissionsResourceHandlerTests.cs | 6 +----- .../Authorization/DenyLocalLoginHandlerTests.cs | 2 +- .../MediaPermissionsQueryStringHandlerTests.cs | 6 +----- .../MediaPermissionsResourceHandlerTests.cs | 5 +---- .../Authorization/SectionHandlerTests.cs | 4 +--- .../Authorization/TreeHandlerTests.cs | 4 +--- .../Authorization/UserGroupHandlerTests.cs | 5 +---- .../Controllers/UsersControllerTests.cs | 4 ++-- .../Extensions/ModelStateExtensionsTests.cs | 3 +-- .../Filters/AppendUserModifiedHeaderAttributeTests.cs | 3 +-- .../Filters/ContentModelValidatorTests.cs | 2 +- .../FilterAllowedOutgoingContentAttributeTests.cs | 2 +- .../Filters/OnlyLocalRequestsAttributeTests.cs | 2 +- .../Filters/ValidationFilterAttributeTests.cs | 2 +- .../Security/BackOfficeAntiforgeryTests.cs | 2 +- .../Security/BackOfficeCookieManagerTests.cs | 4 ++-- .../ContentModelSerializationTests.cs | 2 +- .../AngularIntegration/JsInitializationTests.cs | 2 +- .../AngularIntegration/ServerVariablesParserTests.cs | 2 +- .../Extensions/HtmlHelperExtensionMethodsTests.cs | 2 +- .../Umbraco.Web.Common/FileNameTests.cs | 4 ++-- .../ValidateUmbracoFormRouteStringFilterTests.cs | 2 +- .../IgnoreRequiredAttributesResolverUnitTests.cs | 2 +- .../Umbraco.Web.Common/ImageCropperTest.cs | 2 +- .../Umbraco.Web.Common/Macros/MacroParserTests.cs | 2 +- .../Umbraco.Web.Common/Macros/MacroTests.cs | 4 +--- .../ModelBinders/ContentModelBinderTests.cs | 7 +------ .../ModelBinders/HttpQueryStringModelBinderTests.cs | 2 +- .../Mvc/HtmlStringUtilitiesTests.cs | 2 +- .../Routing/BackOfficeAreaRoutesTests.cs | 2 +- .../Routing/EndpointRouteBuilderExtensionsTests.cs | 2 +- .../Routing/InstallAreaRoutesTests.cs | 2 +- .../Umbraco.Web.Common/Routing/PreviewRoutesTests.cs | 2 +- .../Routing/RoutableDocumentFilterTests.cs | 2 +- .../Umbraco.Web.Common/Routing/TestRouteBuilder.cs | 2 +- .../Security/EncryptionHelperTests.cs | 2 +- .../Umbraco.Web.Common/Views/UmbracoViewPageTests.cs | 5 +---- .../AspNetCoreHostingEnvironmentTests.cs | 4 ++-- .../Controllers/RenderNoContentControllerTests.cs | 3 +-- .../Controllers/SurfaceControllerTests.cs | 11 ++--------- .../Routing/ControllerActionSearcherTests.cs | 2 +- .../Routing/UmbracoRouteValueTransformerTests.cs | 4 ++-- .../Routing/UmbracoRouteValuesFactoryTests.cs | 2 +- .../Security/UmbracoWebsiteSecurityTests.cs | 5 +---- 262 files changed, 312 insertions(+), 562 deletions(-) diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs index 44060e69cb..c3a1ff8995 100644 --- a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs +++ b/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs @@ -19,11 +19,9 @@ using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Routing; using Umbraco.Cms.Web.Common.Install; using Umbraco.Cms.Web.Common.Security; -using Umbraco.Core; -using Umbraco.Core.Configuration; using Umbraco.Core.Security; -namespace Umbraco.Tests.UnitTests.AutoFixture +namespace Umbraco.Cms.Tests.UnitTests.AutoFixture { [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor)] public class AutoMoqDataAttribute : AutoDataAttribute diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs b/src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs index 0c182e6116..c06ff1a0f3 100644 --- a/src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs +++ b/src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs @@ -4,7 +4,7 @@ using System; using AutoFixture.NUnit3; -namespace Umbraco.Tests.UnitTests.AutoFixture +namespace Umbraco.Cms.Tests.UnitTests.AutoFixture { [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)] public class InlineAutoMoqDataAttribute : InlineAutoDataAttribute diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs index 5684444f15..6fc78ce393 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs @@ -13,9 +13,8 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Extensions; -using Umbraco.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.TestHelpers +namespace Umbraco.Cms.Tests.UnitTests.TestHelpers { [TestFixture] public abstract class BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs index 24419761a9..72793780f8 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.DependencyInjection; -namespace Umbraco.Tests.UnitTests.TestHelpers +namespace Umbraco.Cms.Tests.UnitTests.TestHelpers { public static class CompositionExtensions { diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs index 9629971809..15c2e91bc5 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs @@ -13,13 +13,8 @@ using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Cms.Web.Common.UmbracoContext; -using Umbraco.Core.Security; -using Umbraco.Tests.TestHelpers; -using Umbraco.Web; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; -namespace Umbraco.Tests.UnitTests.TestHelpers.Objects +namespace Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects { /// /// Simplify creating test UmbracoContext's diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index b6c8a412a6..f2dbb9c577 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -43,7 +43,7 @@ using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Tests.TestHelpers +namespace Umbraco.Cms.Tests.UnitTests.TestHelpers { /// /// Common helper properties and methods useful to testing diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs index 7756086396..8d3d266515 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Configuration.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Configuration.Models { public class ConnectionStringsTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs index bd334a114f..73987c3c4a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs @@ -3,9 +3,8 @@ using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class AttemptTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs index 9c27ba03b6..f53dc2b7d6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs @@ -12,12 +12,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; -using Umbraco.Core; using Umbraco.Core.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice { [TestFixture] public class BackOfficeClaimsPrincipalFactoryTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs index 3b2d0391e2..ce47b490a6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Identity; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice { public class IdentityExtensionsTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/NopLookupNormalizerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/NopLookupNormalizerTests.cs index f4ea348892..21ff01b296 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/NopLookupNormalizerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/NopLookupNormalizerTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Core.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice { public class NopLookupNormalizerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs index 91bb6b19d4..46332df4b2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice { [TestFixture] public class UmbracoBackOfficeIdentityTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs index 08e246bec4..115be24f8a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Cache; -using Umbraco.Core.Cache; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { public abstract class AppCacheTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs index 0e36132332..260cd3c6ca 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class DeepCloneAppCacheTests : RuntimeAppCacheTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs index 9a5883561e..a9bfd2e099 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs @@ -9,10 +9,9 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Scoping; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class DefaultCachePolicyTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs index 5adced0cb5..97acab7ce4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs @@ -3,9 +3,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; -using Umbraco.Core.Cache; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class DictionaryAppCacheTests : AppCacheTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs index 673b3124f5..0273690f09 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs @@ -7,10 +7,8 @@ using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Sync; -using Umbraco.Core.Cache; -using Umbraco.Core.Sync; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache { /// /// Ensures that calls to DistributedCache methods carry through to the IServerMessenger correctly diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs index 95ab415bc7..b1b635fb01 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs @@ -12,10 +12,9 @@ using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Scoping; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class FullDataSetCachePolicyTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpRequestAppCacheTests.cs index b8d86d5949..e2d0dfeb07 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpRequestAppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpRequestAppCacheTests.cs @@ -4,9 +4,8 @@ using Microsoft.AspNetCore.Http; using NUnit.Framework; using Umbraco.Cms.Core.Cache; -using Umbraco.Core.Cache; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class HttpRequestAppCacheTests : AppCacheTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs index 045b431759..73b50e2d63 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs @@ -4,9 +4,8 @@ using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Cache; -using Umbraco.Core.Cache; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class ObjectAppCacheTests : RuntimeAppCacheTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs index 680e9ef3d9..5c9d2b13cf 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs @@ -6,9 +6,8 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Services.Changes; -using Umbraco.Web.Cache; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class RefresherTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs index 88daec7fea..89e8fdb072 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { public abstract class RuntimeAppCacheTests : AppCacheTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs index 97788134b7..00d9ebe530 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs @@ -9,10 +9,9 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Scoping; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Cache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache { [TestFixture] public class SingleItemsOnlyCachePolicyTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs index 2265eb6664..d531b091c9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs @@ -7,7 +7,7 @@ using System.Security.Claims; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { public class ClaimsIdentityExtensionsTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs index d317236365..d5e6a88589 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Tests.Common; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections { [TestFixture] public class DeepCloneableListTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs index 275707b870..4b77543140 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core.Collections; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections { [TestFixture] public class OrderedHashSetTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs index b5acbc045b..751a988309 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs @@ -20,18 +20,14 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Scoping; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components { [TestFixture] public class ComponentTests @@ -202,7 +198,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components } catch (Exception e) { - Assert.AreEqual("Broken composer dependency: Umbraco.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer2 -> Umbraco.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer4.", e.Message); + Assert.AreEqual("Broken composer dependency: Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer2 -> Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer4.", e.Message); } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs index 1f8545666c..9b3c3a09e3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs @@ -10,10 +10,9 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.UnitTests.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { [TestFixture] public class CollectionBuildersTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs index b29cb8175e..17f271888b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs @@ -10,13 +10,10 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Tests.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { public abstract class ComposingTestBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CompositionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CompositionTests.cs index 984f598ef4..4056f5fdd4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CompositionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CompositionTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { [TestFixture] public class CompositionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs index 595678c5ec..0a45415647 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs @@ -10,11 +10,10 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { /// /// Tests for lazy collection builder. diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/PackageActionCollectionTests.cs index 5d5bdb25e4..f393ff9910 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/PackageActionCollectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/PackageActionCollectionTests.cs @@ -12,11 +12,10 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.PackageActions; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { [TestFixture] public class PackageActionCollectionTests : ComposingTestBase diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs index 44256bb829..6f64a67683 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { /// /// Tests for typefinder diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs index d355191685..b2fade7e36 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs @@ -12,9 +12,8 @@ using System.Reflection; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { /// /// Tests for TypeHelper diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs index a03893d3b1..973ce87ff1 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Umbraco.Cms.Core.Composing; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { /// /// Used for PluginTypeResolverTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs index fe8049c799..f12413716e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs @@ -15,15 +15,14 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Cms.Web.Common.UmbracoContext; using Umbraco.Core.PropertyEditors; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -using Umbraco.Web; using Umbraco.Web.PropertyEditors; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing { [TestFixture] public class TypeLoaderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs index 77343e1466..39739d2cfd 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Core.Configuration; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Extensions +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Extensions { [TestFixture] public class HealthCheckSettingsExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs index 964f67d0c4..a530912b5d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs @@ -5,11 +5,11 @@ using AutoFixture.NUnit3; using Microsoft.Extensions.Options; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Tests.UnitTests.AutoFixture; using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; -using Umbraco.Tests.UnitTests.AutoFixture; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models { [TestFixture] public class GlobalSettingsTests 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 e7e8dd46ac..d0b29f4cac 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 @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Configuration.Models.Validation; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { [TestFixture] public class ContentSettingsValidatorTests 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 0bb5e2bdbf..9228182a8a 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 @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Configuration.Models.Validation; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { [TestFixture] public class GlobalSettingsValidatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs index fc2e5a6dad..505e37a51e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Configuration.Models.Validation; using Umbraco.Core.Configuration; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { [TestFixture] public class HealthChecksSettingsValidatorTests 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 242ab8e393..d8f0c0847a 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 @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Configuration.Models.Validation; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation { [TestFixture] public class RequestHandlerSettingsValidatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs index 383ed93fbd..b58a7309e2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration; using Umbraco.Core.Configuration; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Configuration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration { [TestFixture] public class NCronTabParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/CallContextTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/CallContextTests.cs index 57e9e32a67..ac54e72cce 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/CallContextTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/CallContextTests.cs @@ -4,10 +4,8 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Scoping; -using Umbraco.Core; -using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings { [TestFixture] public class CallContextTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs index 6f34053932..f8a07fdf21 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings { [TestFixture] public class ObjectExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs index 76b35836e3..6857a055bb 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings { [TestFixture] public class TryConvertToTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs index c4840ec6af..89c5969281 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs @@ -9,12 +9,10 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Deploy; -using Umbraco.Core; -using Umbraco.Core.Deploy; using Umbraco.Core.Serialization; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings { [TestFixture] public class UdiTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs index e91f47893f..97814824d6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs @@ -5,7 +5,7 @@ using System.Xml; using System.Xml.XPath; using NUnit.Framework; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreXml +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml { [TestFixture] public class FrameworkXmlTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs index c2b00e6dee..90d999c01d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs @@ -16,7 +16,7 @@ using Umbraco.Cms.Core.Xml.XPath; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreXml +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml { [TestFixture] public class NavigableNavigatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs index c0c54eaa2d..245d5f36a4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs @@ -8,7 +8,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Xml.XPath; using Umbraco.Cms.Tests.Common.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreXml +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml { [TestFixture] public class RenamedRootNavigatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs index 4142305b00..c7a849cbc2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class DelegateExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs index 5959c5dd9c..ebb563bdf4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Trees; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class EnumExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs index bd0fc22eff..a3e29c28aa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs @@ -7,7 +7,7 @@ using System.Linq; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class EnumerableExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs index 5ca4b7cf13..bd43daf975 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs @@ -9,10 +9,9 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Events; -using Umbraco.Core.Events; -using Umbraco.Tests.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Events +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Events { [TestFixture] public class EventAggregatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs index 2f8dcea492..fe688ceb76 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs @@ -6,12 +6,10 @@ using System.Linq; using System.Security.Claims; using NUnit.Framework; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Extensions +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions { [TestFixture] public class ClaimsPrincipalExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs index 7f7037cbc5..0baec74432 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Extensions +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions { [TestFixture] public class UriExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs index 20e22d061c..da9865e72e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs @@ -4,9 +4,8 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { public class GuidUtilsTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs index 29bb82acef..416368b9b0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs @@ -6,9 +6,8 @@ using System.IO; using System.Reflection; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class HashCodeCombinerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs index 6012a90ea3..1a6f77d2c8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs @@ -6,9 +6,8 @@ using System.IO; using System.Reflection; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class HashGeneratorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs index f293a27fa7..22b43205a2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs @@ -5,9 +5,8 @@ using System; using System.Text; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { public class HexEncoderTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs index 9dadef9647..133913d91a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs @@ -10,7 +10,7 @@ using System.Threading; using NUnit.Framework; using Umbraco.Cms.Core.IO; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.IO +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs index 1e0c833502..d72a906def 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs @@ -9,9 +9,9 @@ using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.IO; -using Umbraco.Tests.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.IO +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs index e8a6121bc2..8cd8dc85ab 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs @@ -10,11 +10,9 @@ using Umbraco.Cms.Core.Manifest; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; -using Umbraco.Core.Manifest; -using Umbraco.Core.Models; -using Umbraco.Tests.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Manifest +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest { [TestFixture] public class ManifestContentAppTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs index 89248a2fa9..7524b8f51c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs @@ -20,14 +20,11 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Cache; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Manifest; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Manifest +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest { [TestFixture] public class ManifestParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs index 08ef820b3c..6c4a0e2828 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs @@ -10,7 +10,7 @@ using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections { public abstract class Item : IEntity, ICanBeDirty { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs index 91ccc3cac8..bb9129951e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs @@ -3,7 +3,7 @@ using System; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections { public class OrderItem : Item { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs index d673326f9d..580774b43a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs @@ -6,10 +6,10 @@ using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections { [TestFixture] public class PropertyCollectionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs index 86022f094b..5bd6389b23 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs @@ -6,7 +6,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models.Collections +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections { public class SimpleOrder : KeyedCollection, INotifyCollectionChanged { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs index 6501042094..abe7c1d08e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class ContentExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs index 9a0df85406..81aecc94e7 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class ContentScheduleTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs index 74fe16dbda..21d495f3a0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs @@ -23,7 +23,7 @@ using Umbraco.Cms.Tests.Common.Extensions; using Umbraco.Cms.Tests.Common.TestHelpers.Stubs; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class ContentTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs index 3e55b16e20..00b2a3273a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs @@ -11,9 +11,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class ContentTypeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs index 425fac7b82..a6a71b3c6e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs @@ -4,9 +4,8 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class CultureImpactTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs index a673f610e1..07b25965e9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class DeepCloneHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs index a11d913c36..17d06deafa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs @@ -7,9 +7,8 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class DictionaryItemTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs index c1868e0701..ef8dda0ba8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class DictionaryTranslationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs index 289cf5511f..6ede1a5bf3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class DocumentEntityTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs index 50b92c7723..4f2d70a407 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs @@ -7,9 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class LanguageTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs index a5152b26c9..cfdb08e7f4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs @@ -9,9 +9,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class MacroTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs index 9310c1429f..cffe093c09 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class MemberGroupTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs index 14387a5cc7..83dbe0a266 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class MemberTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs index 2d3b90bf8b..80a3391787 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs @@ -8,9 +8,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class PropertyGroupTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs index 864f85b45c..d9cfe3e0d5 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs @@ -7,9 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class PropertyTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs index e63f341163..b5127715ff 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs @@ -10,9 +10,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class PropertyTypeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs index f57ffba40a..c76f8dc7e5 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs @@ -1,9 +1,8 @@ using System.Globalization; using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; -namespace Umbraco.Tests.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class RangeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs index 280096a973..81f1c4c49e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class RelationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs index f5048b502a..77195a9d49 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs @@ -8,9 +8,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class RelationTypeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs index 779c0d804f..dc163ab39f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs @@ -9,9 +9,8 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class StylesheetTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs index c77b74774a..a2d6f95f6c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs @@ -10,9 +10,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class TemplateTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs index 004c92af4c..556fb42ff0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs @@ -10,11 +10,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using User = Umbraco.Cms.Core.Models.Membership.User; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class UserExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs index 239de6628a..a0383bd2ca 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class UserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs index 38e9d790b4..89ea1f61c7 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs @@ -5,7 +5,6 @@ using System; using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; @@ -14,14 +13,14 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Serialization; using Umbraco.Core.Services; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; using Umbraco.Web.PropertyEditors; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models { [TestFixture] public class VariationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs index eb79f208b4..435c2f14dc 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PackageExtractionTests.cs @@ -6,9 +6,8 @@ using System.IO; using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Packaging; -using Umbraco.Core.Packaging; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Packaging +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Packaging { [TestFixture] public class PackageExtractionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs index a771717727..c8a70fe0ed 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs @@ -11,7 +11,7 @@ using Umbraco.Extensions; using Umbraco.Web.Compose; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class BlockEditorComponentTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs index a52c27dd88..b0e07c442d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs @@ -10,16 +10,10 @@ using Umbraco.Cms.Core.Models.Blocks; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Models.Blocks; -using Umbraco.Core.PropertyEditors; -using Umbraco.Web.PropertyEditors; using Umbraco.Web.PropertyEditors.ValueConverters; -using Umbraco.Web.PublishedCache; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class BlockListPropertyValueConverterTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs index f965237c67..6940f2fb2a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs @@ -13,10 +13,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Web.PropertyEditors; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class ColorListValidatorTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs index 2cbda2e7c0..9e30acaa2f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs @@ -18,12 +18,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Published; using Umbraco.Cms.Tests.Common.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.UnitTests.TestHelpers; -namespace Umbraco.Tests.Published +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class ConvertersTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs index 4fd6643d2e..d030f7a67a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs @@ -22,7 +22,7 @@ using Umbraco.Web.PropertyEditors; using static Umbraco.Cms.Core.Models.Property; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class DataValueReferenceFactoryCollectionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs index 47dbb6be0b..86b0fe9ed9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs @@ -13,10 +13,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Web.PropertyEditors; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class EnsureUniqueValuesValidatorTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs index 057a456bab..d03bb41e55 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs @@ -12,13 +12,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Web.PropertyEditors; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { /// /// Tests for the base classes of ValueEditors and PreValueEditors that are used for Property Editors that edit diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs index 022e19c18e..cb99bb2931 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Web.Compose; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class NestedContentPropertyComponentTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs index b3d9e229ef..599ce254d2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs @@ -11,13 +11,10 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PropertyEditors.ValueConverters; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.PropertyEditors.ValueConverters; using Umbraco.Core.Serialization; using Umbraco.Web.PropertyEditors.ValueConverters; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class PropertyEditorValueConverterTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs index 35a0d1e250..4248120b5e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors { [TestFixture] public class PropertyEditorValueEditorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs index 8ceb1c2f93..e386437ea4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; @@ -18,7 +17,7 @@ using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Core.Serialization; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published { [TestFixture] public class ConvertersTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs index 262073bc42..1ae968301d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using NUnit.Framework; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Tests.Common.Published; -using Umbraco.Tests.Published; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published { [TestFixture] public class ModelTypeTests @@ -58,16 +57,16 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published }; Assert.AreEqual( - "Umbraco.Tests.Published.PublishedSnapshotTestObjects+TestElementModel1", + "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1", ModelType.Map(ModelType.For("alias1"), map).ToString()); Assert.AreEqual( - "Umbraco.Tests.Published.PublishedSnapshotTestObjects+TestElementModel1[]", + "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]", ModelType.Map(ModelType.For("alias1").MakeArrayType(), map).ToString()); Assert.AreEqual( - "System.Collections.Generic.IEnumerable`1[Umbraco.Tests.Published.PublishedSnapshotTestObjects+TestElementModel1]", + "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1]", ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), map).ToString()); Assert.AreEqual( - "System.Collections.Generic.IEnumerable`1[Umbraco.Tests.Published.PublishedSnapshotTestObjects+TestElementModel1[]]", + "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]]", ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1").MakeArrayType()), map).ToString()); } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs index 25ef82c3c5..734944755e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models; @@ -24,7 +23,7 @@ using Umbraco.Extensions; using Umbraco.Web.PropertyEditors; using Umbraco.Web.PropertyEditors.ValueConverters; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published { [TestFixture] public class NestedContentTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs index 56868a2bd2..16c941656c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; @@ -17,7 +16,7 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Core.Serialization; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published { [TestFixture] public class PropertyCacheLevelTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs index 20e1728727..817bef62d4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs @@ -6,7 +6,7 @@ using System.Linq; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class ReflectionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs index 57cf76d19e..5545b471c6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs @@ -10,7 +10,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Core; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class ReflectionUtilitiesTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainHelperTests.cs index e20f9d77f1..729ec5fb7f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainHelperTests.cs @@ -3,13 +3,11 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Routing; -using Umbraco.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing { [TestFixture] public class SiteDomainHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs index 2d3e7f2546..fffabb8d79 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Web.Common.AspNetCore; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing { [TestFixture] public class UmbracoRequestPathsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs index 6593b570c5..fad2e00db9 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs @@ -7,9 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Routing; -using Umbraco.Web; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing { // FIXME: not testing virtual directory! diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs index 5de4b382fd..2f9c05994f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing { [TestFixture] public class WebPathTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs index ddd2c5d360..b58291505e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs @@ -5,10 +5,8 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; -using Umbraco.Core; -using Umbraco.Core.Events; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Scoping +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping { [TestFixture] public class EventNameExtractorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs index 7f0eeb706e..87c8a90e34 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs @@ -14,14 +14,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -namespace Umbraco.Tests.Scoping +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping { [TestFixture] public class ScopeEventDispatcherTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs index 92cc93939a..fc52aaf275 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs @@ -10,11 +10,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security { [TestFixture] public class ContentPermissionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs index 09f2e7769d..273823eec3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs @@ -5,12 +5,9 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security { [TestFixture] public class LegacyPasswordSecurityTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs index 70b5c2e0bd..370e968a76 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs @@ -10,11 +10,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security { [TestFixture] public class MediaPermissionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs index d361d5cc46..12c7f93ff8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Services +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services { [TestFixture] public class ContentTypeServiceExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs index 34a34f797f..5f72f0d93d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Strings; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class CmsHelperCasingTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs index 988ac0f908..c9f74e1f9d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Strings; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class DefaultShortStringHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs index 420962be1a..6f9ee481cc 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Configuration.UmbracoSettings; using Umbraco.Cms.Core.Strings; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class DefaultShortStringHelperTestsWithoutSetup diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs index 4a339892e0..35b5ed63e4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs @@ -3,7 +3,7 @@ using Umbraco.Cms.Core.Strings; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { internal class MockShortStringHelper : IShortStringHelper { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs index 7df3846b7d..c6a5510986 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Strings; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class StringExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs index 80eaf2df98..0f982fb946 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using NUnit.Framework; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class StringValidationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs index 5e26051639..f918251566 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Strings.Css; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper { [TestFixture] public class StylesheetHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs index 426639e2ba..48c9b984ca 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs @@ -10,10 +10,9 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Tests.Common.TestHelpers; -using Umbraco.Core; -using Umbraco.Tests.UnitTests.AutoFixture; +using Umbraco.Cms.Tests.UnitTests.AutoFixture; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class TaskHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs index 8e3a9ec9b1..ba338cdf31 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs @@ -15,13 +15,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Tests.UnitTests.TestHelpers.Objects; -using Umbraco.Web; -using Umbraco.Web.Routing; +using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates { [TestFixture] public class HtmlImageSourceParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs index 7a2dd31ef0..b3c4d96328 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs @@ -13,13 +13,9 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Tests.UnitTests.TestHelpers.Objects; -using Umbraco.Web; -using Umbraco.Web.Routing; +using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates { [TestFixture] public class HtmlLocalLinkParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs index e27e372e89..c5854b4c15 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.IO; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Templates +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates { [TestFixture] public class ViewHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs index d6323bcb59..04bf021346 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class VersionExtensionTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs index d991764928..ceeb0de7bb 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs @@ -1,17 +1,13 @@ using System; using System.Collections.Generic; -using System.Globalization; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Web.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Web.Routing { [TestFixture] public class PublishedRequestBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs index 0881c9bdb5..cea8625d3f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core.Xml +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Xml { [TestFixture] public class XmlHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs index 92a53aa0df..eda2c8d7aa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs @@ -6,7 +6,7 @@ using System.Xml.Linq; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Core +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core { [TestFixture] public class XmlExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs index 9ce3a8a3c3..b2e8df9c12 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs @@ -5,7 +5,7 @@ using System; using NUnit.Framework; using Umbraco.Core.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.BackOffice { public class BackOfficeLookupNormalizerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs index c656c77f24..0cc7346d0e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs @@ -13,12 +13,9 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Editors +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Editors { [TestFixture] public class UserEditorAuthorizationHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs index 22a543b506..a865624cdd 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs @@ -10,12 +10,9 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Examine; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Examine +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Examine { [TestFixture] public class UmbracoContentValueSetValidatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs index 544f5941bb..c1a155d5a3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using NUnit.Framework; using Umbraco.Cms.Core.HealthChecks; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HealthChecks +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HealthChecks { [TestFixture] public class HealthCheckResultsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs index d9e50461e5..b7d7731ec6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs @@ -18,14 +18,10 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Scoping; -using Umbraco.Core.Sync; using Umbraco.Infrastructure.HostedServices; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { [TestFixture] public class HealthCheckNotifierTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs index d780180b29..c2b72e874b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs @@ -16,13 +16,10 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Scoping; -using Umbraco.Core.Sync; using Umbraco.Infrastructure.HostedServices; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { [TestFixture] public class KeepAliveTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs index 21d7a62c8b..ea6acd68bf 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs @@ -15,15 +15,10 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Logging; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Core.Sync; using Umbraco.Infrastructure.HostedServices; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { [TestFixture] public class LogScrubberTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs index 61a41a1667..e6b6b6d793 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs @@ -11,13 +11,10 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Services; -using Umbraco.Core.Sync; using Umbraco.Infrastructure.HostedServices; using Umbraco.Web; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { [TestFixture] public class ScheduledPublishingTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs index 60fffc90b7..dfafd76b74 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs @@ -10,11 +10,9 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Sync; using Umbraco.Infrastructure.HostedServices.ServerRegistration; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration { [TestFixture] public class InstructionProcessTaskTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs index 8a45ac55b4..8e4d9ea6ef 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs @@ -11,11 +11,9 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Infrastructure.HostedServices.ServerRegistration; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration { [TestFixture] public class TouchServerTaskTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs index 0fdc5f68b3..004124fe55 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs @@ -10,11 +10,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; -using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Infrastructure.HostedServices; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { [TestFixture] public class TempFileCleanupTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs index 810af16fd2..377c24b3e0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs @@ -15,14 +15,11 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Logging; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Logging.Viewer; -using Umbraco.Core.Models; -using Umbraco.Tests.TestHelpers; using File = System.IO.File; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Logging +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Logging { [TestFixture] public class LogviewerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs index e9d86cfcb2..6c883dad44 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs @@ -9,9 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Mapping +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Mapping { [TestFixture] public class MappingTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs index 8389e0fc9e..b0cd3de9f4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs @@ -3,11 +3,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; using Umbraco.Infrastructure.Media; -using Umbraco.Web.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Media +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Media { [TestFixture] public class ImageSharpImageUrlGeneratorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs index b1b05134ee..0af8d53347 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs @@ -8,10 +8,10 @@ using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; using Umbraco.Cms.Tests.Common.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs; using Umbraco.Core.Migrations; -using Umbraco.Tests.Migrations.Stubs; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Migrations +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations { [TestFixture] public class AlterMigrationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs index 29defe21f7..60a26ef4d0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs @@ -12,15 +12,15 @@ using NUnit.Framework; using Umbraco.Cms.Core.Migrations; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Migrations +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations { [TestFixture] public class MigrationPlanTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs index 11d197eb91..71741f137f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs @@ -9,12 +9,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Migrations; using Umbraco.Cms.Core.Scoping; -using Umbraco.Core.Events; using Umbraco.Core.Migrations; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Migrations +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations { [TestFixture] public class MigrationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs index c3c25de2d1..0279422efd 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs @@ -15,9 +15,8 @@ using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Migrations +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations { [TestFixture] public class PostMigrationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs index a5c119f995..7d82d309e1 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class AlterUserTableMigrationStub : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs index cf3a26c7d3..778d987d2e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class DropForeignKeyMigrationStub : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs index a8d809621d..626fa4f3c6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs @@ -2,9 +2,8 @@ // See LICENSE for more details. using Umbraco.Cms.Core.Migrations; -using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { /// /// This is just a dummy class that is used to ensure that implementations diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs index d870ef82db..dd1b14663d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class FiveZeroMigration : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs index c168fa1c8f..e630110d56 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class FourElevenMigration : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs index 1b5c580d5f..a5a8d1148a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class SixZeroMigration1 : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs index 689e770a98..f32670c060 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations; -namespace Umbraco.Tests.Migrations.Stubs +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs { public class SixZeroMigration2 : MigrationBase { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs index a66910f3cd..4ab4d769b2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs @@ -7,9 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models { [TestFixture] public class DataTypeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs index c99260875e..80efe1f286 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models { [TestFixture] public class PathValidationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs index e01f071f3c..1dc39fdde3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs @@ -10,7 +10,7 @@ using System.Data.SqlClient; using NUnit.Framework; using Umbraco.Core.Persistence; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence { /// /// Unit tests for . diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs index 8b40ca2ef4..7325c489cf 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using Umbraco.Core.Migrations.Install; -namespace Umbraco.Tests.Persistence +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence { [TestFixture] public class DatabaseContextTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs index 45bc3507a7..fb46a3d061 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs @@ -3,13 +3,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class ContentMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs index 923de28f13..cb3267a8fc 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class ContentTypeMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs index c780f691ea..6787a24c1b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs @@ -2,12 +2,11 @@ // See LICENSE for more details. using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class DataTypeMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs index f31110f30a..0bb5a6e8a6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class DictionaryMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs index ebe57e7746..a0234516da 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class DictionaryTranslationMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs index 20a446ad70..fae929b9a5 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class LanguageMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs index 2891e5b6f2..6f01081518 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs @@ -2,13 +2,12 @@ // See LICENSE for more details. using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; using MediaModel = Umbraco.Cms.Core.Models.Media; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class MediaMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs index 40c74f25a5..721dfdbd45 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class PropertyGroupMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs index 30b5a8eb90..e4c0fd2edb 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs @@ -2,12 +2,11 @@ // See LICENSE for more details. using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class PropertyTypeMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs index add7cd8b4b..bf6d4106b3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class RelationMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs index 310b12c1cf..9e6cfbe5e0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs @@ -2,10 +2,10 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers { [TestFixture] public class RelationTypeMapperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs index 89703749cc..611974edef 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs @@ -5,13 +5,13 @@ using System.Collections.Generic; using NPoco; using NUnit.Framework; using Umbraco.Cms.Tests.Common.TestHelpers; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; -using Umbraco.Tests.TestHelpers; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests { [TestFixture] public class NPocoSqlExtensionsTests : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs index efb75c5a30..bea42cd64b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs @@ -11,7 +11,7 @@ using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests { [TestFixture] public class NPocoSqlTemplateTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs index 2c831e470b..2b84ffda90 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs @@ -6,14 +6,13 @@ using System.Diagnostics; using NPoco; using NUnit.Framework; using Umbraco.Cms.Tests.Common.TestHelpers; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests { [TestFixture] public class NPocoSqlTests : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs index da161e70b2..9c41ddcc1a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs @@ -4,13 +4,12 @@ using System; using System.Diagnostics; using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class ContentTypeRepositorySqlClausesTest : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs index 23e3ab88aa..417e28a97d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs @@ -5,13 +5,12 @@ using System; using System.Diagnostics; using NPoco; using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class DataTypeDefinitionRepositorySqlClausesTest : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs index 78a06b9d06..6739955292 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs @@ -14,17 +14,13 @@ using Umbraco.Cms.Core.Persistence; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class ExpressionTests : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs index af5b23b6cc..87c37ce252 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs @@ -5,13 +5,12 @@ using System; using System.Diagnostics; using NPoco; using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class MediaRepositorySqlClausesTest : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs index 1e156e21df..2e74455e4f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs @@ -5,13 +5,12 @@ using System; using System.Diagnostics; using NPoco; using NUnit.Framework; -using Umbraco.Core; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class MediaTypeRepositorySqlClausesTest : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs index e5853cfee0..40ba6e4847 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs @@ -6,13 +6,12 @@ using NPoco; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; -using Umbraco.Tests.TestHelpers; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying { [TestFixture] public class QueryBuilderTests : BaseUsingSqlSyntax diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs index 335b7f3fd3..e763441138 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs @@ -6,7 +6,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Serialization; using Umbraco.Core.Serialization; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Serialization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Serialization { [TestFixture] public class JsonNetSerializerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs index b2bc32d15a..97386b8f47 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs @@ -6,10 +6,9 @@ using System.Reflection; using System.Text; using NUnit.Framework; using Umbraco.Cms.Core.Events; -using Umbraco.Core.Events; using Umbraco.Core.Services.Implement; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services { [TestFixture] public class AmbiguousEventTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs index 6bfc252574..316d8f3d9f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; using Umbraco.Core.Services.Implement; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services { [TestFixture] public class LocalizedTextServiceTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs index 9959b16c5d..308ec538a6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs @@ -10,15 +10,11 @@ using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; using Umbraco.Core.Services; -using Umbraco.Web.PropertyEditors; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services { [TestFixture] public class PropertyValidationServiceTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs index 3652394224..9bc2ba5b28 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs @@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Semver; using Umbraco.Cms.ModelsBuilder.Embedded; using Umbraco.Cms.ModelsBuilder.Embedded.Building; -namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded { [TestFixture] public class BuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs index 45065bbd53..b80ab5dfe6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded { public static class StringExtensions { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs index b8a7062c3d..a44c209ab6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Cms.ModelsBuilder.Embedded; using Umbraco.Cms.ModelsBuilder.Embedded.Building; -namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded { [TestFixture] public class UmbracoApplicationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs index 4226b767aa..d672da4c24 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs @@ -9,7 +9,7 @@ using NUnit.Framework; using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Core.Scoping; -namespace Umbraco.Tests.UnitTests.Umbraco.Umbraco.PublishedCache +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.PublishedCache.NuCache { [TestFixture] public class SnapDictionaryTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs index b4c59de805..9182dfe241 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs @@ -1,7 +1,7 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { public class AllowedContentTypeDetail { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs index affa869fb8..2efe4df18d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs @@ -7,10 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class ContentTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs index 54bfe32fe6..8079aed461 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs @@ -5,9 +5,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class DataTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs index 7cda0c18cc..e9e0c85584 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class DocumentEntitySlimBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs index 5be2e1379b..8d54f84b64 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class LanguageBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs index 7db42b0e0a..5ef76bf935 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class MacroBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs index f54e7a833a..515dfb4728 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs @@ -7,11 +7,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core; -using Umbraco.Core.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class MediaTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs index 4b9eaf6f62..f7392f9e38 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs @@ -8,10 +8,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class MemberBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs index 90d480eab1..9072a49b2c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs @@ -7,9 +7,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class MemberGroupBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs index e74cc760be..925b9386a6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs @@ -8,11 +8,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core; -using Umbraco.Core.Models; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class MemberTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs index eb2cdf72a9..33626f2f97 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class PropertyBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs index 0499bf4df0..5060a0b351 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class PropertyGroupBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs index 585ef32431..32a60247b6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class PropertyTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs index d074e6443d..67f993fe69 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs @@ -1,7 +1,7 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { public class PropertyTypeDetail { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs index a24772c691..67f887d123 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class RelationBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs index 197f26bd7b..877023f82f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class RelationTypeBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs index 92af03e390..51929cc445 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class StylesheetBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs index a1db45a4fa..88695cd48b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs @@ -6,9 +6,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -using Umbraco.Core.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class TemplateBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs index f612fcf0a3..53a9875382 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs @@ -1,7 +1,7 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { public class TemplateDetail { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs index 236c683aac..deb3e1a0f6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class UserBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs index b669773bb9..71c5b5835a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class UserGroupBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs index be1935e59a..efe5f96c76 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs @@ -5,7 +5,7 @@ using System.Xml; using NUnit.Framework; using Umbraco.Cms.Tests.Common.Builders; -namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders { [TestFixture] public class XmlDocumentBuilderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 25b0c97a1b..beddf1df65 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -4,6 +4,7 @@ Exe net5.0 false + Umbraco.Cms.Tests.UnitTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs index 64dade019d..ade6a304d3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs @@ -17,12 +17,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class AdminUsersHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs index 21a05556d6..1bdcb58c73 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs @@ -13,10 +13,8 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class BackOfficeHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs index 4266118549..416b2f0d40 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs @@ -15,14 +15,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class ContentPermissionsPublishBranchHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs index 0b5b1f9156..58ff85d427 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs @@ -17,13 +17,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class ContentPermissionsQueryStringHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs index 2875b4bfb6..345b9a2b0d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs @@ -13,13 +13,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class ContentPermissionsResourceHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs index 1ba49ebd07..56f51450b0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs @@ -10,7 +10,7 @@ using NUnit.Framework; using Umbraco.Cms.Web.BackOffice.Authorization; using Umbraco.Cms.Web.BackOffice.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class DenyLocalLoginHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs index f4b58edf0f..af2dd9226a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs @@ -17,12 +17,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class MediaPermissionsQueryStringHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs index e423d41c66..9b2c217ac6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs @@ -13,11 +13,8 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class MediaPermissionsResourceHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs index f221601271..b34918523c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs @@ -11,11 +11,9 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class SectionHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs index ee9690c897..547372a4ae 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs @@ -14,11 +14,9 @@ using Umbraco.Cms.Core.Trees; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Security; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class TreeHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs index 4e6f21a64a..f6fc89cc48 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs @@ -15,12 +15,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Web.BackOffice.Authorization; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization { public class UserGroupHandlerTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs index 2473a8b265..0c51700052 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -6,11 +6,11 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; +using Umbraco.Cms.Tests.UnitTests.AutoFixture; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Core.Security; -using Umbraco.Tests.UnitTests.AutoFixture; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers { [TestFixture] public class UsersControllerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs index 91ffb7c04d..3c4b78b4fa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs @@ -9,9 +9,8 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Extensions; -using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions { [TestFixture] public class ModelStateExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs index 174cc94b19..5dd39fcf80 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs @@ -14,9 +14,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Web.BackOffice.Filters; -using Umbraco.Core.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { [TestFixture] public class AppendUserModifiedHeaderAttributeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs index caf7a16fff..4a18ecf393 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs @@ -9,7 +9,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.PropertyEditors.Validation; using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { [TestFixture] public class ContentModelValidatorTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs index f170a5fff9..dbd6bd4bad 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs @@ -18,7 +18,7 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { [TestFixture] public class FilterAllowedOutgoingContentAttributeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs index 0cb9672921..3b12947034 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttributeTests.cs @@ -12,7 +12,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Web.BackOffice.Filters; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { [TestFixture] public class OnlyLocalRequestsAttributeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs index 8cf9ee99a2..49508fbac4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs @@ -12,7 +12,7 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Web.BackOffice.Filters; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters { [TestFixture] public class ValidationFilterAttributeTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs index 6efec685f0..9b77e6c60d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs @@ -17,7 +17,7 @@ using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security { [TestFixture] public class BackOfficeAntiforgeryTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs index 26431b572e..3c04fe5f40 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs @@ -10,13 +10,13 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Backoffice.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security { [TestFixture] public class BackOfficeCookieManagerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs index 30f817ced6..5b4ce0835f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs @@ -9,7 +9,7 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { [TestFixture] public class ContentModelSerializationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs index 6448417ac7..21943d1144 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Umbraco.Extensions; using Umbraco.Web.WebAssets; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { [TestFixture] public class JsInitializationTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs index fee2f577ad..18d1aae0c2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs @@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Events; using Umbraco.Extensions; using Umbraco.Web.WebAssets; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { [TestFixture] public class ServerVariablesParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs index 19433769fa..6936b2e5f0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs @@ -11,7 +11,7 @@ using Moq; using NUnit.Framework; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions { [TestFixture] public class HtmlHelperExtensionMethodsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index de34b245bb..98d4eaee3c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -13,11 +13,11 @@ using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Cms.Tests.UnitTests.AutoFixture; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Install; -using Umbraco.Tests.UnitTests.AutoFixture; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common { [TestFixture] internal class FileNameTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs index 3e9c5db175..ca4a5a7c90 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Web.Common.Exceptions; using Umbraco.Cms.Web.Common.Filters; using Umbraco.Cms.Web.Common.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Filters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Filters { [TestFixture] public class ValidateUmbracoFormRouteStringFilterTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs index de13be5628..c44baa044a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Web.Common.Formatters; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Formatters +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Formatters { [TestFixture] public class IgnoreRequiredAttributesResolverUnitTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs index e993cbbc17..e31034dbad 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Core.PropertyEditors.ValueConverters; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common { [TestFixture] public class ImageCropperTest diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs index daa4d7c73d..9b4837fa52 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs @@ -7,7 +7,7 @@ using NUnit.Framework; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Web.Macros; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Macros +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros { [TestFixture] public class MacroParserTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs index 5de12b33ef..b91054315c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs @@ -5,10 +5,8 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Web.Common.Macros; -using Umbraco.Core.Cache; -using Umbraco.Web.Macros; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Macros +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros { [TestFixture] public class MacroTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs index 97e9f7a5b3..e925a21a2f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs @@ -17,13 +17,8 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Cms.Web.Common.Routing; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Services; -using Umbraco.Web.Models; -using Umbraco.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders { [TestFixture] public class ContentModelBinderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs index c4fe1a3d2e..03412ca0b0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Primitives; using NUnit.Framework; using Umbraco.Cms.Web.Common.ModelBinders; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.ModelBinders +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders { [TestFixture] public class HttpQueryStringModelBinderTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs index c91409e96f..c63cee8b84 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Umbraco.Cms.Web.Common.Mvc; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Mvc +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Mvc { [TestFixture] public class HtmlStringUtilitiesTests 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 b5cbe6be8c..d785225ad2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs @@ -19,7 +19,7 @@ using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { [TestFixture] public class BackOfficeAreaRoutesTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs index 5b0a16c6fa..197f432bce 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs @@ -9,7 +9,7 @@ using Umbraco.Extensions; using static Umbraco.Cms.Core.Constants.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { [TestFixture] public class EndpointRouteBuilderExtensionsTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs index cb45691338..0833ba4576 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs @@ -14,7 +14,7 @@ using Umbraco.Extensions; using static Umbraco.Cms.Core.Constants.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { [TestFixture] public class InstallAreaRoutesTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs index f1daab3921..e4da74c707 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs @@ -17,7 +17,7 @@ using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { [TestFixture] public class PreviewRoutesTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs index 378cad7dd2..7ce84a854b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs @@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Web.Common.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { [TestFixture] public class RoutableDocumentFilterTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs index c35c1a1d9e..e2a916dd7d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Hosting.Internal; using Microsoft.Extensions.Logging; using Moq; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing { public class TestRouteBuilder : IEndpointRouteBuilder { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs index e1688fb11d..5fbc285616 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.DataProtection; using NUnit.Framework; using Umbraco.Cms.Web.Common.Security; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security { [TestFixture] public class EncryptionHelperTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs index 47a7b37a9c..c981a8d6ad 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Moq; using NUnit.Framework; @@ -13,10 +12,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Cms.Web.Common.ModelBinders; -using Umbraco.Core.Events; -using Umbraco.Web.Models; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Views +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Views { [TestFixture] public class UmbracoViewPageTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs index 53b1b8bb2e..fe9796251e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs @@ -4,10 +4,10 @@ using System; using NUnit.Framework; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Tests.UnitTests.AutoFixture; using Umbraco.Cms.Web.Common.AspNetCore; -using Umbraco.Tests.UnitTests.AutoFixture; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website { [TestFixture] public class AspNetCoreHostingEnvironmentTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs index 3f52e2e30b..52c976d8c1 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs @@ -11,9 +11,8 @@ using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Cms.Web.Website.Models; -using Umbraco.Web; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers { [TestFixture] public class RenderNoContentControllerTests 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 2f64d8de22..869fb7046b 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Moq; @@ -20,18 +19,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects; using Umbraco.Cms.Web.Common.Routing; using Umbraco.Cms.Web.Website.Controllers; -using Umbraco.Core.Cache; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Tests.UnitTests.TestHelpers.Objects; using Umbraco.Web; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; -using CoreConstants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers { [TestFixture] [UmbracoTest(WithApplication = true)] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs index 1bba6de689..9728fd7195 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs @@ -17,7 +17,7 @@ using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing { [TestFixture] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs index fe1df1142e..d2e2597415 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs @@ -17,15 +17,15 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Tests.UnitTests.TestHelpers; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Common.Routing; using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; -using Umbraco.Tests.TestHelpers; using static Umbraco.Cms.Core.Constants.Web.Routing; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing { [TestFixture] public class UmbracoRouteValueTransformerTests diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs index 24d63b1074..54c9fd9438 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs @@ -20,7 +20,7 @@ using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Cms.Web.Website.Routing; using Umbraco.Extensions; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing { [TestFixture] diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs index 5521cb1b1f..5e53486d11 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Security/UmbracoWebsiteSecurityTests.cs @@ -14,12 +14,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Web.Website.Security; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using CoreConstants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Security +namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Security { [TestFixture] public class UmbracoWebsiteSecurityTests