From 8e321b4364ec8283e492a3e538352be2dc0716dd Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu, 22 Oct 2020 15:31:56 +0200
Subject: [PATCH] Migrate Querying tests

---
 .../TestHelpers/BaseUsingSqlSyntax.cs                    | 2 ++
 .../Querying/ContentTypeRepositorySqlClausesTest.cs      | 6 ++----
 .../DataTypeDefinitionRepositorySqlClausesTest.cs        | 4 ++--
 .../Persistence/Querying/ExpressionTests.cs              | 9 +++------
 .../Querying/MediaRepositorySqlClausesTest.cs            | 4 ++--
 .../Querying/MediaTypeRepositorySqlClausesTest.cs        | 4 ++--
 .../Persistence/Querying/QueryBuilderTests.cs            | 4 ++--
 src/Umbraco.Tests/Umbraco.Tests.csproj                   | 6 ------
 8 files changed, 15 insertions(+), 24 deletions(-)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs (98%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs (93%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/ExpressionTests.cs (98%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/MediaRepositorySqlClausesTest.cs (92%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs (94%)
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Persistence/Querying/QueryBuilderTests.cs (96%)

diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
index 22c04a986a..749354ffde 100644
--- a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
+++ b/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
@@ -35,6 +35,8 @@ namespace Umbraco.Tests.TestHelpers
             composition.WithCollectionBuilder<MapperCollectionBuilder>()
                 .AddCoreMappers();
 
+            composition.RegisterUnique<ISqlContext>(_ => SqlContext);
+
             var factory = composition.CreateFactory();
             var pocoMappers = new NPoco.MapperCollection { new PocoMapper() };
             var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init());
diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
similarity index 98%
rename from src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
index 9745caa8c9..66253de575 100644
--- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
@@ -1,17 +1,15 @@
 using System;
 using System.Diagnostics;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Tests.TestHelpers;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class ContentTypeRepositorySqlClausesTest : BaseUsingSqlCeSyntax
+    public class ContentTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
     {
         [Test]
         public void Can_Verify_Base_Clause()
diff --git a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
similarity index 93%
rename from src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
index 53bc6e5c68..708e7cac70 100644
--- a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Tests.TestHelpers;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class DataTypeDefinitionRepositorySqlClausesTest : BaseUsingSqlCeSyntax
+    public class DataTypeDefinitionRepositorySqlClausesTest : BaseUsingSqlSyntax
     {
         [Test]
         public void Can_Verify_Base_Clause()
diff --git a/src/Umbraco.Tests/Persistence/Querying/ExpressionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Persistence/Querying/ExpressionTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
index 3da803505f..38a2addad6 100644
--- a/src/Umbraco.Tests/Persistence/Querying/ExpressionTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
@@ -2,9 +2,7 @@
 using System.Diagnostics;
 using System.Linq.Expressions;
 using Moq;
-using NPoco;
 using NUnit.Framework;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence;
@@ -17,12 +15,11 @@ using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Persistance.SqlCe;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class ExpressionTests : BaseUsingSqlCeSyntax
+    public class ExpressionTests : BaseUsingSqlSyntax
     {
         [Test]
         public void Equals_Claus_With_Two_Entity_Values()
@@ -154,7 +151,7 @@ namespace Umbraco.Tests.Persistence.Querying
         [Test]
         public void Equals_Method_For_Value_Gets_Escaped()
         {
-            var sqlSyntax = new SqlCeSyntaxProvider();
+            var sqlSyntax = new SqlServerSyntaxProvider();
             Expression<Func<IUser, bool>> predicate = user => user.Username.Equals("hello@world.com");
             var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
             var result = modelToSqlExpressionHelper.Visit(predicate);
diff --git a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
similarity index 92%
rename from src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
index 8ff0dd2a0d..8c26f6a06b 100644
--- a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Tests.TestHelpers;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class MediaRepositorySqlClausesTest : BaseUsingSqlCeSyntax
+    public class MediaRepositorySqlClausesTest : BaseUsingSqlSyntax
     {
         [Test]
         public void Can_Verify_Base_Clause()
diff --git a/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
similarity index 94%
rename from src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
index bcb62ec770..f28540454d 100644
--- a/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Tests.TestHelpers;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class MediaTypeRepositorySqlClausesTest : BaseUsingSqlCeSyntax
+    public class MediaTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
     {
         [Test]
         public void Can_Verify_Base_Clause()
diff --git a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
similarity index 96%
rename from src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
index ca6b4cd5f0..f4b8c2b250 100644
--- a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Tests.TestHelpers;
 
-namespace Umbraco.Tests.Persistence.Querying
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
 {
     [TestFixture]
-    public class QueryBuilderTests : BaseUsingSqlCeSyntax
+    public class QueryBuilderTests : BaseUsingSqlSyntax
     {
         [Test]
         public void Can_Build_StartsWith_Query_For_IContent()
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index adb898f928..bce3364efe 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -255,11 +255,6 @@
     <Compile Include="Models\Collections\PropertyCollectionTests.cs" />
     <Compile Include="Models\MediaXmlTest.cs" />
     <Compile Include="Persistence\FaultHandling\ConnectionRetryTest.cs" />
-    <Compile Include="Persistence\Querying\ContentTypeRepositorySqlClausesTest.cs" />
-    <Compile Include="Persistence\Querying\DataTypeDefinitionRepositorySqlClausesTest.cs" />
-    <Compile Include="Persistence\Querying\ExpressionTests.cs" />
-    <Compile Include="Persistence\Querying\MediaRepositorySqlClausesTest.cs" />
-    <Compile Include="Persistence\Querying\MediaTypeRepositorySqlClausesTest.cs" />
     <Compile Include="Persistence\SchemaValidationTest.cs" />
     <Compile Include="Persistence\SyntaxProvider\SqlCeSyntaxProviderTests.cs" />
     <Compile Include="PublishedContent\PublishedContentDataTableTests.cs" />
@@ -269,7 +264,6 @@
     <Compile Include="Web\Mvc\HtmlHelperExtensionMethodsTests.cs" />
     <Compile Include="Persistence\SqlCeTableByTableTest.cs" />
     <Compile Include="Persistence\DatabaseContextTests.cs" />
-    <Compile Include="Persistence\Querying\QueryBuilderTests.cs" />
     <Compile Include="PublishedContent\PublishedContentMoreTests.cs" />
     <Compile Include="Cache\PublishedCache\PublishedContentCacheTests.cs" />
     <Compile Include="Routing\ContentFinderByAliasWithDomainsTests.cs" />