NetCore: Reorganised integration tests into project grouped folders and namespaces (#9208)

* Reorganised integration tests into folders and classes grouping by project.

* Updated namespaces and file locations from PR comments.

* Fix merge conflict

* Cleared content type service events looking to resolve failing integration test on build server.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>

src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs

@@ -13,7 +13,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Tests.Models.Mapping
+namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping
 {
     [TestFixture]
     [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs

@@ -13,7 +13,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Tests.Integration.Mapping
+namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping
 {
     [TestFixture]
     [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs

@@ -8,7 +8,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Tests.Models.Mapping
+namespace Umbraco.Tests.Integration.Umbraco.Core.Mapping
 {
     [TestFixture]
     [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs

@@ -15,7 +15,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Packaging
+namespace Umbraco.Tests.Integration.Umbraco.Core.Packaging
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]

src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs

@@ -8,7 +8,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Services;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Core.Services
 {
     /// <summary>
     /// Tests covering the SectionService

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs

@@ -10,7 +10,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Microsoft.Extensions.Logging;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs

@@ -24,7 +24,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs

@@ -9,7 +9,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.PropertyEditors;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs

@@ -9,7 +9,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs

@@ -5,22 +5,20 @@ using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration.Models;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
-using Umbraco.Tests.Testing;
-using Umbraco.Web.PropertyEditors;
-using Umbraco.Core.Configuration.Models;
-using Umbraco.Core.IO;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
+using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
@@ -36,8 +34,6 @@ namespace Umbraco.Tests.Persistence.Repositories
         private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
         private IFileService FileService => GetRequiredService<IFileService>();
         private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-        private ILocalizedTextService LocalizedTextService => GetRequiredService<ILocalizedTextService>();
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
         private IFileSystems FileSystems => GetRequiredService<IFileSystems>();
 
         [SetUp]
@@ -45,6 +41,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             CreateTestData();
 
+            // TODO: remove this once IPublishedSnapShotService has been implemented with nucache.
+            global::Umbraco.Core.Services.Implement.ContentTypeService.ClearScopeEvents();
+
             ContentRepositoryBase.ThrowOnWarning = true;
         }
 

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs

@@ -8,7 +8,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs

@@ -13,7 +13,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs

@@ -10,7 +10,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs

@@ -12,7 +12,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs

@@ -19,7 +19,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs

@@ -9,7 +9,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs

@@ -10,7 +10,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs

@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Core.Persistence.Repositories.Implement;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     public class SimilarNodeNameTests

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs

@@ -21,7 +21,7 @@ using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs

@@ -9,7 +9,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories
     {
         private UserGroupRepository CreateRepository(IScopeProvider provider)
         {
-            return new UserGroupRepository((IScopeAccessor) provider, Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+            return new UserGroupRepository((IScopeAccessor) provider, global::Umbraco.Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
         }
 
         [Test]
@@ -128,7 +128,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories
 
                 var id = userGroup.Id;
 
-                var repository2 = new UserGroupRepository((IScopeAccessor) provider, Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+                var repository2 = new UserGroupRepository((IScopeAccessor) provider, global::Umbraco.Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
                 repository2.Delete(userGroup);
                 scope.Complete();
 

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs

@@ -18,7 +18,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs

@@ -9,7 +9,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering the DataTypeService with cache enabled

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs

@@ -15,7 +15,7 @@ using Umbraco.Tests.Testing;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest,
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Integration.Services
             ContentRepositoryBase.ThrowOnWarning = true;
             _globalSettings = new GlobalSettings();
             // TODO: remove this once IPublishedSnapShotService has been implemented with nucache.
-            Core.Services.Implement.ContentTypeService.ClearScopeEvents();
+            global::Umbraco.Core.Services.Implement.ContentTypeService.ClearScopeEvents();
             CreateTestData();
         }
 

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using NUnit.Framework;
@@ -17,7 +16,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Testing;
 
 // ReSharper disable CommentTypo
 // ReSharper disable StringLiteralTypo
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest,

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs

@@ -3,21 +3,15 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.Models;
 using Umbraco.Core.Events;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.Common.Builders;
@@ -25,7 +19,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering all methods in the ContentService class.

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs

@@ -13,7 +13,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs

@@ -9,7 +9,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering the DataTypeService

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs

@@ -13,7 +13,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering the EntityService

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs

@@ -7,11 +7,11 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Integration.Services.Importing;
 using Umbraco.Tests.Integration.Testing;
+using Umbraco.Tests.Integration.Umbraco.Infrastructure.Services.Importing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Tests.Integration.Services.Importing {
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services.Importing {
     using System;
     
     
@@ -39,7 +39,8 @@ namespace Umbraco.Tests.Integration.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.Services.Importing.ImportResources", typeof(ImportResources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Tests.Integration.Umbraco.Infrastructure.Services.Importing.ImportResourc" +
+                            "es", typeof(ImportResources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs

@@ -4,7 +4,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering methods in the KeyValueService class.

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs

@@ -12,7 +12,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering all methods in the LocalizationService class.

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs

@@ -14,7 +14,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs

@@ -13,7 +13,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberGroupServiceTests.cs

@@ -7,7 +7,7 @@ using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs

@@ -19,7 +19,7 @@ using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.PublishedCache.NuCache;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Category("Slow")]
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Integration.Services
         public void SetupTest()
         {
             // TODO: remove this once IPublishedSnapShotService has been implemented with nucache.
-            Core.Services.Implement.MemberTypeService.ClearScopeEvents();
+            global::Umbraco.Core.Services.Implement.MemberTypeService.ClearScopeEvents();
         }
 
         [Test]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs

@@ -9,7 +9,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]
@@ -23,7 +23,7 @@ namespace Umbraco.Tests.Integration.Services
         public void SetupTest()
         {
             // TODO: remove this once IPublishedSnapShotService has been implemented with nucache.
-            Core.Services.Implement.MemberTypeService.ClearScopeEvents();
+            global::Umbraco.Core.Services.Implement.MemberTypeService.ClearScopeEvents();
         }
 
         [Test]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs

@@ -8,7 +8,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs

@@ -6,14 +6,11 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     [TestFixture]
     [Apartment(ApartmentState.STA)]

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs

@@ -8,10 +8,9 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering methods in the TagService class.

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs

@@ -13,13 +13,11 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.Common.Builders;
-using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Actions;
 
-namespace Umbraco.Tests.Integration.Services
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services
 {
     /// <summary>
     /// Tests covering the UserService

src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj

@@ -26,11 +26,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="Services\Importing\Dictionary-Package.xml" />
+      <None Remove="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="Services\Importing\Dictionary-Package.xml" />
+      <Content Include="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
     </ItemGroup>
 
     <ItemGroup>
@@ -77,7 +77,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Update="Services\Importing\ImportResources.Designer.cs">
+      <Compile Update="Umbraco.Infrastructure\Services\Importing\ImportResources.Designer.cs">
         <DependentUpon>ImportResources.resx</DependentUpon>
         <DesignTime>True</DesignTime>
         <AutoGen>True</AutoGen>
@@ -85,7 +85,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <EmbeddedResource Update="Services\Importing\ImportResources.resx">
+      <EmbeddedResource Update="Umbraco.Infrastructure\Services\Importing\ImportResources.resx">
         <SubType>Designer</SubType>
         <LastGenOutput>ImportResources.Designer.cs</LastGenOutput>
         <Generator>ResXFileCodeGenerator</Generator>

src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.DependencyInjection;
- using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -149,6 +149,7 @@
     <Compile Include="Scoping\ScopeEventDispatcherTests.cs" />
     <Compile Include="Security\OwinDataProtectorTokenProviderTests.cs" />
     <Compile Include="Persistence\Repositories\UserRepositoryTest.cs" />
+    <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
     <Compile Include="Services\TestWithSomeContentBase.cs" />
     <Compile Include="TestHelpers\Entities\MockedContent.cs" />
     <Compile Include="TestHelpers\Entities\MockedContentTypes.cs" />
@@ -167,7 +168,6 @@
     <Compile Include="Routing\RoutableDocumentFilterTests.cs" />
     <Compile Include="Runtimes\StandaloneTests.cs" />
     <Compile Include="Routing\GetContentUrlsTests.cs" />
-    <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
     <Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
     <Compile Include="TestHelpers\Stubs\TestUserPasswordConfig.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />