From 4f5fb0c9c381eaf5ccaf1411a34bcbb48e3d609f Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 18 Aug 2020 15:53:25 +0200
Subject: [PATCH] Changes necessary for migrating old tests

---
 .../TestHelpers/Entities/MockedMedia.cs                   | 0
 .../TestHelpers/Entities/MockedMember.cs                  | 1 -
 .../TestHelpers/Entities/MockedUserGroup.cs               | 8 ++++++--
 .../Extensions/ApplicationBuilderExtensions.cs            | 7 ++++---
 src/Umbraco.Tests/Services/ContentServiceTests.cs         | 1 +
 src/Umbraco.Tests/Services/UserServiceTests.cs            | 2 ++
 6 files changed, 13 insertions(+), 6 deletions(-)
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/TestHelpers/Entities/MockedMedia.cs (100%)
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/TestHelpers/Entities/MockedMember.cs (98%)
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/TestHelpers/Entities/MockedUserGroup.cs (67%)

diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs b/src/Umbraco.Tests.Common/TestHelpers/Entities/MockedMedia.cs
similarity index 100%
rename from src/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs
rename to src/Umbraco.Tests.Common/TestHelpers/Entities/MockedMedia.cs
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs b/src/Umbraco.Tests.Common/TestHelpers/Entities/MockedMember.cs
similarity index 98%
rename from src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
rename to src/Umbraco.Tests.Common/TestHelpers/Entities/MockedMember.cs
index b721b508ba..e6916d7de7 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/Entities/MockedMember.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Tests.TestHelpers.Entities
 {
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs b/src/Umbraco.Tests.Common/TestHelpers/Entities/MockedUserGroup.cs
similarity index 67%
rename from src/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs
rename to src/Umbraco.Tests.Common/TestHelpers/Entities/MockedUserGroup.cs
index ce3852c540..0285005a84 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/Entities/MockedUserGroup.cs
@@ -1,12 +1,16 @@
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Tests.TestHelpers.Entities
 {
     public class MockedUserGroup
     {
-        internal static UserGroup CreateUserGroup(string suffix = "", string[] permissions = null, string[] allowedSections = null)
+        public static IShortStringHelper ShortStringHelper { get; } =
+            new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+        public static UserGroup CreateUserGroup(string suffix = "", string[] permissions = null, string[] allowedSections = null)
         {
-            var group = new UserGroup(TestHelper.ShortStringHelper)
+            var group = new UserGroup(ShortStringHelper)
             {
                 Alias = "testUserGroup" + suffix,
                 Name = "TestUserGroup" + suffix,
diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
index 3961657afe..edbdcd0722 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -99,10 +99,11 @@ namespace Umbraco.Tests.Integration.Extensions
                     break;
                 case UmbracoTestOptions.Database.NewSchemaPerFixture:
 
-                    throw new NotImplementedException();
+                    // New DB + Schema
+                    var newSchemaFixtureDbId = db.AttachSchema();
 
-                    //// Add teardown callback
-                    //integrationTest.OnFixtureTearDown(() => db.Detach());
+                    // Add teardown callback
+                    integrationTest.OnFixtureTearDown(() => db.Detach(newSchemaFixtureDbId));
 
                     break;
                 case UmbracoTestOptions.Database.NewEmptyPerFixture:
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index c8467b057f..81f8a5bcad 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -19,6 +19,7 @@ using Umbraco.Tests.Testing;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Cache;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Tests.Common.TestHelpers.Entities;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 
 namespace Umbraco.Tests.Services
diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs
index dbd71870d4..e00cf1364b 100644
--- a/src/Umbraco.Tests/Services/UserServiceTests.cs
+++ b/src/Umbraco.Tests/Services/UserServiceTests.cs
@@ -13,8 +13,10 @@ using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.Common.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Actions;
+using MockedUser = Umbraco.Tests.TestHelpers.Entities.MockedUser;
 
 
 namespace Umbraco.Tests.Services