From b28548849f8d00aac24face208875cf2dbcbe7d8 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 22 Oct 2020 15:17:16 +0200
Subject: [PATCH] Migrate the bare minimum of BaseUsingSqlCeSyntax to be able
 to migrate NPoco unit tests

---
 .../TestHelpers/BaseUsingSqlSyntax.cs         | 46 +++++++++++++++++++
 .../NPocoTests/NPocoSqlExtensionsTests.cs     |  5 +-
 .../NPocoTests/NPocoSqlTemplateTests.cs       |  1 +
 .../Persistence/NPocoTests/NPocoSqlTests.cs   |  4 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  2 -
 5 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs (98%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/NPocoTests/NPocoSqlTests.cs (98%)

diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
new file mode 100644
index 0000000000..22c04a986a
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
@@ -0,0 +1,46 @@
+using System;
+using Moq;
+using NPoco;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Tests.TestHelpers
+{
+    [TestFixture]
+    public abstract class BaseUsingSqlSyntax
+    {
+        protected IMapperCollection Mappers { get; private set; }
+
+        protected ISqlContext SqlContext { get; private set; }
+
+        protected Sql<ISqlContext> Sql()
+        {
+            return NPoco.Sql.BuilderFor(SqlContext);
+        }
+
+        [SetUp]
+        public virtual void Setup()
+        {
+            var container = TestHelper.GetRegister();
+            var typeLoader = TestHelper.GetMockedTypeLoader();
+
+            var composition = new Composition(container, typeLoader, Mock.Of<IProfilingLogger>(), Mock.Of<IRuntimeState>(), TestHelper.IOHelper, AppCaches.NoCache);
+
+            composition.WithCollectionBuilder<MapperCollectionBuilder>()
+                .AddCoreMappers();
+
+            var factory = composition.CreateFactory();
+            var pocoMappers = new NPoco.MapperCollection { new PocoMapper() };
+            var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init());
+            var sqlSyntax = new SqlServerSyntaxProvider();
+            SqlContext = new SqlContext(sqlSyntax, DatabaseType.SqlServer2012, pocoDataFactory, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()));
+            Mappers = factory.GetInstance<IMapperCollection>();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
index b125bcbeea..9e9b148bb6 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
@@ -5,13 +5,12 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing;
 using static Umbraco.Core.Persistence.SqlExtensionsStatics;
 
-namespace Umbraco.Tests.Persistence.NPocoTests
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
 {
     [TestFixture]
-    public class NPocoSqlExtensionsTests : BaseUsingSqlCeSyntax
+    public class NPocoSqlExtensionsTests : BaseUsingSqlSyntax
     {
         [Test]
         public void WhereTest()
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
index dc0b55f2a1..0367571d61 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
 {
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
index ea439f3edd..80408bb211 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
@@ -9,10 +9,10 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Persistence.NPocoTests
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
 {
     [TestFixture]
-    public class NPocoSqlTests : BaseUsingSqlCeSyntax
+    public class NPocoSqlTests : BaseUsingSqlSyntax
     {
         [Test]
         public void Where_Clause_With_Starts_With_Additional_Parameters()
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 75703e332b..adb898f928 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -139,8 +139,6 @@
     <Compile Include="Migrations\MigrationPlanTests.cs" />
     <Compile Include="Migrations\MigrationTests.cs" />
     <Compile Include="Models\ContentXmlTest.cs" />
-    <Compile Include="Persistence\NPocoTests\NPocoSqlExtensionsTests.cs" />
-    <Compile Include="Persistence\NPocoTests\NPocoSqlTests.cs" />
     <Compile Include="PublishedContent\SolidPublishedSnapshot.cs" />
     <Compile Include="Published\ConvertersTests.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />