Remove Entities and Objects from common testshelpers since they don't exist anymore

And fix a single typo

src/Umbraco.Tests.Common/Builders/MemberBuilder.cs

@@ -113,10 +113,10 @@ namespace Umbraco.Tests.Common.Builders
             var lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
             var lastLoginDate = _lastLoginDate ?? DateTime.Now;
             var lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
-            
+
             if (_memberTypeBuilder is null && _memberType is null)
             {
-                throw new InvalidOperationException("A membercannot be constructed without providing a member type. Use AddMemberType() or WithMemberType().");
+                throw new InvalidOperationException("A member cannot be constructed without providing a member type. Use AddMemberType() or WithMemberType().");
             }
 
             var memberType = _memberType ?? _memberTypeBuilder.Build();

src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj

@@ -19,9 +19,4 @@
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="TestHelpers\Entities\" />
-    <Folder Include="TestHelpers\Objects" />
-  </ItemGroup>
 </Project>

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

@@ -9,7 +9,6 @@ using Umbraco.Core.Scoping;
 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.Persistence.Repositories
@@ -42,7 +41,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories
             }
 
             //Create media
-            
+
             var mediaService = GetRequiredService<IMediaService>();
             var mediaTypeService = GetRequiredService<IMediaTypeService>();
             var createdMedia = new List<IMedia>();
@@ -64,7 +63,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories
             var createdMembers = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10).ToList();
             memberService.Save(createdMembers);
 
-            
+
             var provider = ScopeProvider;
             using (provider.CreateScope())
             {
@@ -78,7 +77,7 @@ namespace Umbraco.Tests.Integration.Persistence.Repositories
                     .WhereIn(e => e.Id, ids);
 
                 var entities = repo.GetPagedResultsByQuery(query, objectTypes, 0, 20, out var totalRecords, null, null).ToList();
-                
+
                 Assert.AreEqual(20, entities.Count);
                 Assert.AreEqual(30, totalRecords);
 

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

@@ -19,7 +19,6 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Integration.Persistence.Repositories

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

@@ -7,7 +7,6 @@ using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Integration.Persistence.Repositories

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

@@ -10,7 +10,6 @@ using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Tests/Services/ContentTypeServiceTests.cs

@@ -7,13 +7,11 @@ using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Scoping;
 
 namespace Umbraco.Tests.Services
 {