From d621174f31a2c627eba4f314d14b4390876c834d Mon Sep 17 00:00:00 2001 From: Mole Date: Thu, 11 Feb 2021 08:30:27 +0100 Subject: [PATCH] Align namespaces in Umbraco.Tests.Integration --- .../Cache/DistributedCacheBinderTests.cs | 4 ++-- .../ComponentRuntimeTests.cs | 14 ++------------ .../UmbracoBuilderExtensions.cs | 4 ++-- .../Extensions/ServiceCollectionExtensions.cs | 4 ++-- .../GlobalSetupTeardown.cs | 2 +- .../Implementations/TestHelper.cs | 2 +- .../Implementations/TestHostingEnvironment.cs | 2 +- .../Implementations/TestLifetime.cs | 2 +- .../TestUmbracoBootPermissionChecker.cs | 3 +-- ...EnsureNotAmbiguousActionNameControllerTests.cs | 3 +-- .../TestServerTest/TestAuthHandler.cs | 4 +--- .../TestServerTest/UmbracoTestServerTestBase.cs | 6 +++--- .../UmbracoWebApplicationFactory.cs | 2 +- .../Testing/BaseTestDatabase.cs | 3 +-- .../Testing/ITestDatabase.cs | 2 +- .../Testing/IntegrationTestComponent.cs | 3 +-- .../Testing/LocalDbTestDatabase.cs | 2 +- .../Testing/SqlDeveloperTestDatabase.cs | 3 +-- .../Testing/TestDatabaseFactory.cs | 2 +- .../Testing/TestDatabaseSettings.cs | 2 +- .../Testing/TestDbMeta.cs | 2 +- .../Testing/TestUmbracoDatabaseFactoryProvider.cs | 2 +- .../Testing/UmbracoIntegrationTest.cs | 8 ++++---- .../Testing/UmbracoIntegrationTestWithContent.cs | 4 +--- .../Umbraco.Core/IO/FileSystemsTests.cs | 4 ++-- .../Umbraco.Core/IO/ShadowFileSystemTests.cs | 6 +++--- .../Mapping/ContentTypeModelMappingTests.cs | 4 ++-- .../Umbraco.Core/Mapping/UmbracoMapperTests.cs | 4 ++-- .../Umbraco.Core/Mapping/UserModelMapperTests.cs | 4 ++-- .../Packaging/CreatedPackagesRepositoryTests.cs | 4 ++-- .../Packaging/PackageDataInstallationTests.cs | 8 ++++---- .../Packaging/PackageInstallationTest.cs | 5 ++--- .../Umbraco.Core/Services/SectionServiceTests.cs | 5 ++--- .../Migrations/AdvancedMigrationTests.cs | 4 ++-- .../Persistence/DatabaseBuilderTests.cs | 4 ++-- .../Persistence/LocksTests.cs | 4 ++-- .../NPocoTests/NPocoBulkInsertTests.cs | 7 +++---- .../Persistence/NPocoTests/NPocoFetchTests.cs | 4 ++-- .../Repositories/AuditRepositoryTest.cs | 4 ++-- .../Repositories/ContentTypeRepositoryTest.cs | 4 ++-- .../DataTypeDefinitionRepositoryTest.cs | 4 ++-- .../Repositories/DictionaryRepositoryTest.cs | 4 ++-- .../Repositories/DocumentRepositoryTest.cs | 4 ++-- .../Repositories/DomainRepositoryTest.cs | 4 ++-- .../Repositories/EntityRepositoryTest.cs | 4 ++-- .../Repositories/KeyValueRepositoryTests.cs | 4 ++-- .../Repositories/LanguageRepositoryTest.cs | 4 ++-- .../Repositories/MacroRepositoryTest.cs | 4 ++-- .../Repositories/MediaRepositoryTest.cs | 4 ++-- .../Repositories/MediaTypeRepositoryTest.cs | 4 ++-- .../Repositories/MemberRepositoryTest.cs | 4 ++-- .../Repositories/MemberTypeRepositoryTest.cs | 9 ++------- .../Repositories/NotificationsRepositoryTest.cs | 6 ++---- .../Repositories/PartialViewRepositoryTests.cs | 6 ++---- .../Repositories/PublicAccessRepositoryTest.cs | 5 ++--- .../Repositories/RedirectUrlRepositoryTests.cs | 7 ++----- .../Repositories/RelationRepositoryTest.cs | 10 ++-------- .../Repositories/RelationTypeRepositoryTest.cs | 8 ++------ .../Repositories/ScriptRepositoryTest.cs | 6 ++---- .../ServerRegistrationRepositoryTest.cs | 6 ++---- .../Repositories/SimilarNodeNameTests.cs | 2 +- .../Repositories/StylesheetRepositoryTest.cs | 7 ++----- .../Persistence/Repositories/TagRepositoryTest.cs | 7 ++----- .../Repositories/TemplateRepositoryTest.cs | 7 +++---- .../Repositories/UserGroupRepositoryTest.cs | 6 ++---- .../Repositories/UserRepositoryTest.cs | 4 ++-- .../Persistence/SchemaValidationTest.cs | 5 ++--- .../Persistence/SqlServerTableByTableTest.cs | 5 ++--- .../SqlServerSyntaxProviderTests.cs | 5 ++--- .../Persistence/UnitOfWorkTests.cs | 4 ++-- .../Scoping/ScopeFileSystemsTests.cs | 4 ++-- .../Umbraco.Infrastructure/Scoping/ScopeTests.cs | 5 ++--- .../Scoping/ScopedRepositoryTests.cs | 9 ++------- .../Services/AuditServiceTests.cs | 4 ++-- .../Services/CachedDataTypeServiceTests.cs | 4 ++-- .../Services/ConsentServiceTests.cs | 4 ++-- .../Services/ContentEventsTests.cs | 4 ++-- .../Services/ContentServiceEventTests.cs | 4 ++-- .../Services/ContentServicePerformanceTest.cs | 4 ++-- .../Services/ContentServicePublishBranchTests.cs | 4 ++-- .../Services/ContentServiceTagsTests.cs | 4 ++-- .../Services/ContentServiceTests.cs | 4 ++-- .../Services/ContentTypeServiceTests.cs | 4 ++-- .../Services/ContentTypeServiceVariantsTests.cs | 4 ++-- .../Services/DataTypeServiceTests.cs | 4 ++-- .../Services/EntityServiceTests.cs | 4 ++-- .../Services/EntityXmlSerializerTests.cs | 6 ++---- .../Services/ExternalLoginServiceTests.cs | 6 +++--- .../Services/FileServiceTests.cs | 7 ++----- .../Importing/ImportResources.Designer.cs | 4 ++-- .../Services/KeyValueServiceTests.cs | 5 ++--- .../Services/LocalizationServiceTests.cs | 6 ++---- .../Services/MacroServiceTests.cs | 7 ++----- .../Services/MediaServiceTests.cs | 8 ++------ .../Services/MediaTypeServiceTests.cs | 7 ++----- .../Services/MemberGroupServiceTests.cs | 6 ++---- .../Services/MemberServiceTests.cs | 4 ++-- .../Services/MemberTypeServiceTests.cs | 7 ++----- .../Services/PublicAccessServiceTests.cs | 7 ++----- .../Services/RedirectUrlServiceTests.cs | 9 ++------- .../Services/RelationServiceTests.cs | 4 ++-- .../Services/TagServiceTests.cs | 4 ++-- .../Services/ThreadSafetyServiceTest.cs | 4 ++-- .../Services/TrackRelationsTests.cs | 8 ++------ .../Services/UserServiceTests.cs | 4 ++-- .../Umbraco.Tests.Integration.csproj | 1 + .../BackOfficeAssetsControllerTests.cs | 4 ++-- .../Controllers/ContentControllerTests.cs | 4 ++-- .../Controllers/TemplateQueryControllerTests.cs | 4 ++-- .../Controllers/UsersControllerTests.cs | 4 ++-- .../Filters/ContentModelValidatorTests.cs | 4 ++-- ...oBackOfficeServiceCollectionExtensionsTests.cs | 4 ++-- .../Routing/FrontEndRouteTests.cs | 15 ++------------- 113 files changed, 215 insertions(+), 327 deletions(-) diff --git a/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs index ce35fe2dac..4a0f30387b 100644 --- a/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs +++ b/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs @@ -9,10 +9,10 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Web.Cache; -namespace Umbraco.Tests.Cache +namespace Umbraco.Cms.Tests.Integration.Cache { [TestFixture] [UmbracoTest(Boot = true)] diff --git a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs index 893008e3e1..ddac52872f 100644 --- a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs +++ b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs @@ -1,11 +1,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using NUnit.Framework; using Umbraco.Cms.Core.Composing; @@ -13,16 +9,10 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Extensions; -using Umbraco.Tests.Integration.Extensions; -using Umbraco.Tests.Integration.Implementations; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration +namespace Umbraco.Cms.Tests.Integration { - [TestFixture] [UmbracoTest(Boot = true)] public class ComponentRuntimeTests : UmbracoIntegrationTest diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index 943337fd18..d389940042 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -20,14 +20,14 @@ using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Examine; using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Tests.Common.TestHelpers.Stubs; +using Umbraco.Cms.Tests.Integration.Implementations; using Umbraco.Core.Services.Implement; using Umbraco.Examine; using Umbraco.Extensions; using Umbraco.Infrastructure.HostedServices; -using Umbraco.Tests.Integration.Implementations; using Umbraco.Web.Search; -namespace Umbraco.Tests.Integration.DependencyInjection +namespace Umbraco.Cms.Tests.Integration.DependencyInjection { /// /// This is used to replace certain services that are normally registered from our Core / Infrastructure that diff --git a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs index cc01a08287..5b6a1db805 100644 --- a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs +++ b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs @@ -5,9 +5,9 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Umbraco.Tests.Integration.Implementations; +using Umbraco.Cms.Tests.Integration.Implementations; -namespace Umbraco.Tests.Integration.Extensions +namespace Umbraco.Cms.Tests.Integration.Extensions { public static class ServiceCollectionExtensions { diff --git a/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs b/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs index 4aca5ff98a..c952fcc663 100644 --- a/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs +++ b/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; using NUnit.Framework; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; // ReSharper disable once CheckNamespace diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs index 497b4f8278..6ea81fd59d 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs @@ -36,7 +36,7 @@ using Umbraco.Extensions; using File = System.IO.File; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Tests.Integration.Implementations +namespace Umbraco.Cms.Tests.Integration.Implementations { public class TestHelper : TestHelperBase { diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs index aad95eb792..8980a91cff 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Web.Common.AspNetCore; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; -namespace Umbraco.Tests.Integration.Implementations +namespace Umbraco.Cms.Tests.Integration.Implementations { public class TestHostingEnvironment : AspNetCoreHostingEnvironment, Cms.Core.Hosting.IHostingEnvironment { diff --git a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs index 07f517e710..0b444234af 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; -namespace Umbraco.Tests.Integration.Implementations +namespace Umbraco.Cms.Tests.Integration.Implementations { /// /// Ensures the host lifetime ends as soon as code execution is done diff --git a/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs b/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs index 8d346c4ebc..ff0bfa599a 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs @@ -2,9 +2,8 @@ // See LICENSE for more details. using Umbraco.Cms.Core.Runtime; -using Umbraco.Core.Runtime; -namespace Umbraco.Tests.Integration.Implementations +namespace Umbraco.Cms.Tests.Integration.Implementations { public class TestUmbracoBootPermissionChecker : IUmbracoBootPermissionChecker { diff --git a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs index 48b0eeae9b..c094ea3d9a 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs @@ -6,10 +6,9 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Web.BackOffice.Controllers; -using Umbraco.Core; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.TestServerTest.Controllers +namespace Umbraco.Cms.Tests.Integration.TestServerTest.Controllers { [TestFixture] public class EnsureNotAmbiguousActionNameControllerTests : UmbracoTestServerTestBase diff --git a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs index 256f5bc464..ac508686b4 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs @@ -11,12 +11,10 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Security; -using Umbraco.Core; using Umbraco.Core.Security; -using Umbraco.Core.Services; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.TestServerTest +namespace Umbraco.Cms.Tests.Integration.TestServerTest { public class TestAuthHandler : AuthenticationHandler { diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs index da2e945130..df0ef4600c 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs @@ -20,15 +20,15 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.DependencyInjection; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Extensions; -using Umbraco.Tests.Integration.DependencyInjection; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.TestServerTest +namespace Umbraco.Cms.Tests.Integration.TestServerTest { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console, Boot = true)] diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs index 5d923e583e..380603ae5c 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.Hosting; -namespace Umbraco.Tests.Integration.TestServerTest +namespace Umbraco.Cms.Tests.Integration.TestServerTest { public class UmbracoWebApplicationFactory : WebApplicationFactory where TStartup : class diff --git a/src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs index 33fe28abbb..d84ded1b18 100644 --- a/src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs +++ b/src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs @@ -12,11 +12,10 @@ using System.Threading; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; -using Umbraco.Core.Configuration; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public abstract class BaseTestDatabase { diff --git a/src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs index bdfde8d93b..fc400fe3ab 100644 --- a/src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs +++ b/src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs @@ -1,7 +1,7 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public interface ITestDatabase { diff --git a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs index e618798252..277510fc9e 100644 --- a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs +++ b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs @@ -4,9 +4,8 @@ using Examine; using Examine.LuceneEngine.Providers; using Umbraco.Cms.Core.Composing; -using Umbraco.Examine; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { /// /// A component to customize some services to work nicely with integration tests diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs index b208a72c2f..07caf94219 100644 --- a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs +++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs @@ -9,7 +9,7 @@ using System.Threading; using Microsoft.Extensions.Logging; using Umbraco.Core.Persistence; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { /// /// Manages a pool of LocalDb databases for integration testing diff --git a/src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs index 80cf3c654c..13b5bad20f 100644 --- a/src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs +++ b/src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Data.SqlClient; using System.Linq; using System.Threading; @@ -11,7 +10,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Core.Persistence; // ReSharper disable ConvertToUsingDeclaration -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { /// /// It's not meant to be pretty, rushed port of LocalDb.cs + LocalDbTestDatabase.cs diff --git a/src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs b/src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs index 9ca463c69a..1d55ca79ba 100644 --- a/src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs +++ b/src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.Extensions.Logging; using Umbraco.Core.Persistence; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public class TestDatabaseFactory { diff --git a/src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs b/src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs index 9d9e305bc9..b2c9b0cfa2 100644 --- a/src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs +++ b/src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs @@ -1,5 +1,5 @@ -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public class TestDatabaseSettings { diff --git a/src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs b/src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs index ea6f7d1c72..8e3dd355d5 100644 --- a/src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs +++ b/src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs @@ -3,7 +3,7 @@ using System.Text.RegularExpressions; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public class TestDbMeta { diff --git a/src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs b/src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs index 5e2ce7a318..4cba407e4c 100644 --- a/src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs +++ b/src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs @@ -9,7 +9,7 @@ using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { /// /// I want to be able to create a database for integration testsing without setting the connection string on the diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs index 42f414b400..4430f16533 100644 --- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs +++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs @@ -29,17 +29,17 @@ using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.DependencyInjection; +using Umbraco.Cms.Tests.Integration.Extensions; +using Umbraco.Cms.Tests.Integration.Implementations; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Scoping; using Umbraco.Extensions; using Umbraco.Infrastructure.DependencyInjection; -using Umbraco.Tests.Integration.DependencyInjection; -using Umbraco.Tests.Integration.Extensions; -using Umbraco.Tests.Integration.Implementations; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { /// /// Abstract class for integration tests diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs index 8ebfd60286..f279e5abf0 100644 --- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs +++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs @@ -6,11 +6,9 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -namespace Umbraco.Tests.Integration.Testing +namespace Umbraco.Cms.Tests.Integration.Testing { public abstract class UmbracoIntegrationTestWithContent : UmbracoIntegrationTest { diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs index 0831d2a1b1..358a5fb350 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs @@ -9,10 +9,10 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.IO.MediaPathSchemes; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.IO +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO { [TestFixture] [UmbracoTest] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs index 477e3b6284..54f5e04dd2 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs @@ -12,12 +12,12 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Implementations; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Implementations; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.IO +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO { [TestFixture] [UmbracoTest] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs index 523039f295..f0ff1ead5a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs @@ -14,12 +14,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.PropertyEditors; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping { [TestFixture] [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs index 5dd862103c..fb27ac5495 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs @@ -13,11 +13,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping { [TestFixture] [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs index f276d92cea..5b96ebed3c 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs @@ -9,9 +9,9 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping { [TestFixture] [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs index 98bd05903f..e2fb873611 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs @@ -14,10 +14,10 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Core.Packaging +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs index b3693dc680..3e50df1474 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs @@ -16,16 +16,16 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Packaging; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Services.Importing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Packaging +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging { [TestFixture] [Category("Slow")] @@ -354,7 +354,7 @@ namespace Umbraco.Tests.Packaging public void Can_Import_Media_Package_Xml() { // Arrange - Core.Services.Implement.MediaTypeService.ClearScopeEvents(); + global::Umbraco.Core.Services.Implement.MediaTypeService.ClearScopeEvents(); string strXml = ImportResources.MediaTypesAndMedia_Package_xml; var xml = XElement.Parse(strXml); XElement mediaTypesElement = xml.Descendants("MediaTypes").First(); @@ -399,7 +399,7 @@ namespace Umbraco.Tests.Packaging select doc).Count(); string configuration; - using (Core.Scoping.IScope scope = ScopeProvider.CreateScope()) + using (global::Umbraco.Core.Scoping.IScope scope = ScopeProvider.CreateScope()) { List dtos = scope.Database.Fetch("WHERE nodeId = @Id", new { dataTypeDefinitions.First().Id }); configuration = dtos.Single().Configuration; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageInstallationTest.cs index 878ef70734..2665cde3d7 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageInstallationTest.cs @@ -10,10 +10,9 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models.Packaging; using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Packaging; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Packaging +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs index 429b147a65..b9b3d0569e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs @@ -8,10 +8,9 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Core.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services { /// /// Tests covering the SectionService diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs index 647d63d184..e90af52069 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs @@ -10,15 +10,15 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Migrations +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Migrations { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs index ebf25a6088..faf9f4383e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs @@ -9,11 +9,11 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence { [TestFixture] [UmbracoTest] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs index 11e5def998..901fb4335f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs @@ -8,11 +8,11 @@ using NPoco; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Persistence +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence { [TestFixture] [Timeout(60000)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs index fa10599341..36a4604781 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs @@ -10,14 +10,13 @@ using NPoco; using NUnit.Framework; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Logging; +using Umbraco.Cms.Tests.Integration.Implementations; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Implementations; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests { // FIXME: npoco - is this still appropriate? [TestFixture] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs index 33f9eb537f..0754ab7c29 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs @@ -7,11 +7,11 @@ using System.Linq; using NPoco; using NUnit.Framework; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs index 72aefcd5f7..63c51230e8 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs @@ -9,13 +9,13 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs index d4ef68b18c..9e813482c9 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -17,14 +17,14 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Extensions; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; using Content = Umbraco.Cms.Core.Models.Content; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index 9e1f09b2a6..496f5017d1 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -13,14 +13,14 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Umbraco.Web.PropertyEditors; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs index b7f33dd465..eda61c5401 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs index cb73d5a0f2..5904839a49 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs @@ -19,15 +19,15 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs index cce2f4ad56..898bb39857 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs @@ -12,12 +12,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs index 9e7c15a05e..8d95dcabc7 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs @@ -11,12 +11,12 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs index 7aece542a7..5577c61a0e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs @@ -7,11 +7,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs index 60b67175ad..130acd99e5 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs @@ -13,12 +13,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs index c424e4c7ed..f3f9116117 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs @@ -10,11 +10,11 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs index d8bd09a186..ffd9638d1e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs @@ -20,13 +20,13 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs index f3345e5e24..14ca7addb4 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -12,12 +12,12 @@ using Umbraco.Cms.Core.Persistence; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs index 2a7e981236..2a1a296027 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs @@ -20,16 +20,16 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs index d3c68bee3d..f24201e5da 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs @@ -14,17 +14,12 @@ using Umbraco.Cms.Core.Persistence; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs index d8dac09bd5..4b00f46bc6 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs @@ -11,15 +11,13 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs index 842154726b..a218d0b87e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs @@ -11,14 +11,12 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.None)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs index 10d72cca23..ece7d56bf8 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs @@ -9,15 +9,14 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Content = Umbraco.Cms.Core.Models.Content; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs index c53836ec02..c62a227027 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs @@ -11,14 +11,11 @@ using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs index 6f24ee7822..227b9f90b5 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs @@ -15,18 +15,12 @@ using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs index 68f84e9cc1..92520e5052 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -9,16 +9,12 @@ using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Querying; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs index 691212fd16..39226231eb 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs @@ -15,13 +15,11 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.None)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs index f2517d5eba..05d0bcef0a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs @@ -10,13 +10,11 @@ using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs index 215303d981..fe22730456 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Umbraco.Core.Persistence.Repositories.Implement; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] public class SimilarNodeNameTests diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs index be4fcf2811..44f75575e5 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs @@ -16,13 +16,10 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; -using Umbraco.Tests.Integration.Implementations; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.None, Logger = UmbracoTestOptions.Logger.Console)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs index fd1e53dbdd..0739f0470d 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs @@ -10,15 +10,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs index 6e685d5d97..682ba9e672 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Text; using Microsoft.Extensions.Logging; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -19,15 +18,15 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Implementations; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Implementations; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs index af7aedc200..08ed5bf3bb 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs @@ -10,13 +10,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs index b48e3ea9fd..72d31faf0b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs @@ -18,6 +18,7 @@ using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Mappers; @@ -26,10 +27,9 @@ using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs index 87d5377290..027d11846a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs @@ -2,11 +2,10 @@ using NUnit.Framework; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Configuration; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Migrations.Install; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Persistence +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs index 81b9082873..a90059819a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs @@ -3,12 +3,11 @@ using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Configuration; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Persistence +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs index 83c1ac9943..f295fe18b4 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs @@ -6,7 +6,7 @@ using NPoco; using NUnit.Framework; using Umbraco.Cms.Tests.Common.TestHelpers; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Expressions.Common.Expressions; using Umbraco.Core.Migrations.Expressions.Create.Index; @@ -15,10 +15,9 @@ using Umbraco.Core.Persistence.DatabaseAnnotations; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Persistence.SyntaxProvider +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.SyntaxProvider { [TestFixture] public class SqlServerSyntaxProviderTests : UmbracoIntegrationTest diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs index 171fc64d98..ffa23920b2 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs @@ -4,11 +4,11 @@ using System; using NUnit.Framework; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs index ef6a1eb2d1..3d429cf059 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs @@ -10,13 +10,13 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; using FileSystems = Umbraco.Cms.Core.IO.FileSystems; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Scoping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs index 85ba82df1e..d333ea6385 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs @@ -6,12 +6,11 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Scoping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerFixture)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs index 26b8a43471..a1273518d2 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs @@ -14,18 +14,13 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Core.Sync; -using Umbraco.Tests.Integration.Testing; -using Umbraco.Web; using Umbraco.Web.Cache; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Scoping +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs index 52575f0b81..30fd5e6c6c 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs @@ -9,10 +9,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs index 4171e971b1..8c486c9fc5 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs @@ -8,10 +8,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.PropertyEditors; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering the DataTypeService with cache enabled diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs index 9fc724113b..54dcd96fed 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs @@ -7,10 +7,10 @@ using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs index 4d649b7842..4d343beedb 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs @@ -14,14 +14,14 @@ using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Sync; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Umbraco.Web.Cache; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs index b48b2e6621..a58f575a59 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs @@ -9,12 +9,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest( diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs index 21317d3f85..88e00ab8e0 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs @@ -15,12 +15,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.TestHelpers.Stubs; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs index 60859f0d1c..79c55f494b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs @@ -9,12 +9,12 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; // ReSharper disable CommentTypo // ReSharper disable StringLiteralTypo -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs index 4a472e6a48..3369b138ab 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs @@ -12,12 +12,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest( diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs index 2b4ab73cc8..0126d3d926 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs @@ -19,6 +19,7 @@ using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Extensions; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; @@ -26,10 +27,9 @@ using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs index a3a39a92f1..000f78fd91 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs @@ -11,12 +11,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs index 8ecfc3e114..8412f8bf27 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs @@ -14,12 +14,12 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs index 6d4ffb59f3..2be14e8843 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs @@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.PropertyEditors; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering the DataTypeService diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs index d1f983deb2..ba29acf837 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs @@ -13,12 +13,12 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering the EntityService diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs index bb727e209b..0c618dde8d 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs @@ -11,12 +11,10 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Tests.Services.Importing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs index b99a4f6878..7b53e811f3 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs @@ -10,10 +10,10 @@ using Umbraco.Cms.Core.Models.Identity; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] @@ -34,7 +34,7 @@ namespace Umbraco.Tests.Services DateTime latest = DateTime.Now.AddDays(-1); DateTime oldest = DateTime.Now.AddDays(-10); - using (Core.Scoping.IScope scope = ScopeProvider.CreateScope()) + using (global::Umbraco.Core.Scoping.IScope scope = ScopeProvider.CreateScope()) { // insert duplicates manuall scope.Database.Insert(new ExternalLoginDto diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs index 1523ce9961..0c8c7fd162 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs @@ -1,18 +1,15 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -using System; using System.Linq; using System.Threading; using NUnit.Framework; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs index f7e0541d95..35ab2e061a 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs @@ -39,8 +39,8 @@ namespace Umbraco.Tests.Services.Importing { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Tests.Integration.Umbraco.Infrastructure.Services.Importing.ImportResourc" + - "es", typeof(ImportResources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.Importing.ImportRes" + + "ources", typeof(ImportResources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs index 7a0446d3ac..3437e1b286 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs @@ -5,10 +5,9 @@ using System.Threading; using NUnit.Framework; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering methods in the KeyValueService class. diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs index c6e019a6eb..41c0acec01 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs @@ -12,13 +12,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering all methods in the LocalizationService class. diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs index 3d3ff2ed08..06b4c6859b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs @@ -14,14 +14,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs index cfe88afc2b..6d8fad4140 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs @@ -13,16 +13,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs index 19f5ab9313..abd6466ce4 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs @@ -11,13 +11,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberGroupServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberGroupServiceTests.cs index ded24c06ee..ef876f04eb 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberGroupServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberGroupServiceTests.cs @@ -9,11 +9,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs index 7673c7957e..faaaf7e8d3 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs @@ -19,14 +19,14 @@ using Umbraco.Cms.Infrastructure.PublishedCache; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Category("Slow")] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs index 631b8ddb2e..5f41203594 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs @@ -11,12 +11,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs index 3f2cb72612..6818f7b0d4 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs @@ -10,12 +10,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs index 06864a8ce5..0606dc76f9 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs @@ -6,20 +6,15 @@ using System.Threading; using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; -using System.Linq; -using System.Threading; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs index 69ce954b40..b9755d44c0 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs @@ -10,11 +10,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [TestFixture] [Apartment(ApartmentState.STA)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs index de6492b5a0..206a6c5713 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs @@ -11,11 +11,11 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering methods in the TagService class. diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs index 8767881668..51243ff9ed 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs @@ -11,12 +11,12 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Scoping; using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // these tests tend to fail from time to time esp. on VSTS // diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs index 0d9fcbabdd..644f4d959f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs @@ -4,14 +4,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Core.Services.Implement; -using Umbraco.Tests.Integration.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { [UmbracoTest( Database = UmbracoTestOptions.Database.NewSchemaPerTest, diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs index 5d49390880..baa61798d9 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs @@ -17,11 +17,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Services.Implement; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services +namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { /// /// Tests covering the UserService diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index b90a103d0f..18cc68996d 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -5,6 +5,7 @@ net5.0 false 8 + Umbraco.Cms.Tests.Integration diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs index 6dccfddc07..68dee932fa 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs @@ -5,10 +5,10 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using NUnit.Framework; +using Umbraco.Cms.Tests.Integration.TestServerTest; using Umbraco.Cms.Web.BackOffice.Controllers; -using Umbraco.Tests.Integration.TestServerTest; -namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers { [TestFixture] public class BackOfficeAssetsControllerTests : UmbracoTestServerTestBase diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs index 43f058e8f7..ab2acf9825 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -12,13 +12,13 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; +using Umbraco.Cms.Tests.Integration.TestServerTest; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; -using Umbraco.Tests.Integration.TestServerTest; using Constants = Umbraco.Cms.Core.Constants; -namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers { [TestFixture] public class ContentControllerTests : UmbracoTestServerTestBase diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs index 88413f5dce..1a36f3054b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs @@ -9,12 +9,12 @@ using Newtonsoft.Json.Linq; using NUnit.Framework; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Tests.Common.Builders.Extensions; +using Umbraco.Cms.Tests.Integration.TestServerTest; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; -using Umbraco.Tests.Integration.TestServerTest; -namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers { [TestFixture] public class TemplateQueryControllerTests : UmbracoTestServerTestBase diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs index e23f1c10f8..fd2481536b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -18,12 +18,12 @@ 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.Cms.Tests.Integration.TestServerTest; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.Common.Formatters; using Umbraco.Extensions; -using Umbraco.Tests.Integration.TestServerTest; -namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers { [TestFixture] public class UsersControllerTests : UmbracoTestServerTestBase diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs index 78eae3f98e..b43cc13840 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs @@ -22,14 +22,14 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Testing; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; using Umbraco.Web.PropertyEditors; using DataType = Umbraco.Cms.Core.Models.DataType; -namespace Umbraco.Tests.Integration.Umbraco.Web.Backoffice.Filters +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Filters { [TestFixture] [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Mapper = true, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)] diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs index 5b8feb8fd7..9c0698edc1 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs @@ -5,11 +5,11 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using NUnit.Framework; using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Tests.Integration.Testing; using Umbraco.Core.Security; using Umbraco.Extensions; -using Umbraco.Tests.Integration.Testing; -namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice { [TestFixture] public class UmbracoBackOfficeServiceCollectionExtensionsTests : UmbracoIntegrationTest diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs index 0bf2689a8a..a6e69e47f7 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs @@ -1,29 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Net; using System.Net.Http; -using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.Extensions.DependencyInjection; using NUnit.Framework; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Cms.Tests.Integration.TestServerTest; using Umbraco.Cms.Web.Website.Controllers; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; -using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Web; -using Umbraco.Web.Routing; -namespace Umbraco.Tests.Integration.Umbraco.Web.Website.Routing +namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Routing { [TestFixture] public class SurfaceControllerTests : UmbracoTestServerTestBase