From 1fc09cda0f6b3587c27d8c5ed903b48b26f8b7f3 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 15 Jul 2018 08:01:16 +0200 Subject: [PATCH] Following small R# hints, removed commented out line --- .../Persistence/Querying/PetaPocoSqlTests.cs | 106 +++++++++--------- 1 file changed, 52 insertions(+), 54 deletions(-) diff --git a/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs b/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs index 50b78fa078..7bb2ee581d 100644 --- a/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs @@ -1,6 +1,5 @@ using NUnit.Framework; using System.Diagnostics; -using System.Linq; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Querying; @@ -12,16 +11,15 @@ namespace Umbraco.Tests.Persistence.Querying [TestFixture] public class PetaPocoSqlTests : BaseUsingSqlCeSyntax { - private readonly ISqlSyntaxProvider sqlSyntax = new SqlCeSyntaxProvider(); - //x => + private readonly ISqlSyntaxProvider _sqlSyntax = new SqlCeSyntaxProvider(); [Test] public void Where_Clause_With_Starts_With_Additional_Parameters() { var content = new NodeDto() { NodeId = 123, Path = "-1,123" }; var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar), _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[path]) LIKE upper(@0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -33,8 +31,8 @@ namespace Umbraco.Tests.Persistence.Querying { var content = new NodeDto() { NodeId = 123, Path = "-1,123" }; var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[path]) LIKE upper(@0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(2, sql.Arguments.Length); @@ -45,10 +43,10 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Where_Clause_With_Not_Starts_With() { - var level = 1; + const int level = 1; var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Level == level && !x.Path.StartsWith("-20"), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Level == level && x.Path.StartsWith("-20") == false, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(2, sql.Arguments.Length); @@ -59,10 +57,10 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Where_Clause_With_EqualsFalse_Starts_With() { - var level = 1; + const int level = 1; var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Level == level && x.Path.StartsWith("-20") == false, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Level == level && x.Path.StartsWith("-20") == false, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(2, sql.Arguments.Length); @@ -74,8 +72,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_Equals_Clause() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Text.Equals("Hello@world.com"), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Text.Equals("Hello@world.com"), _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) = upper(@0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -86,8 +84,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_False_Boolean() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => !x.Trashed, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Trashed == false, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -98,8 +96,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_EqualsFalse_Boolean() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Trashed == false, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Trashed == false, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -110,8 +108,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_Boolean() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Trashed, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Trashed, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -122,8 +120,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_ToUpper() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Text.ToUpper() == "hello".ToUpper(), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Text.ToUpper() == "hello".ToUpper(), _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[text]) = upper(@0)))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -134,8 +132,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_ToString() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Text == 1.ToString(), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Text == 1.ToString(), _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[text] = @0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -146,8 +144,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_With_Wildcard() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Text.StartsWith("D"), sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Text.StartsWith("D"), _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) LIKE upper(@0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -158,8 +156,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_Single_Constant() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.NodeId == 2, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.NodeId == 2, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] = @0))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(1, sql.Arguments.Length); @@ -170,8 +168,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_And_Constant() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.NodeId != 2 && x.NodeId != 3, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.NodeId != 2 && x.NodeId != 3, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[id] <> @0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(2, sql.Arguments.Length); @@ -183,8 +181,8 @@ namespace Umbraco.Tests.Persistence.Querying public void Where_Clause_Or_Constant() { var sql = new Sql("SELECT *") - .From(sqlSyntax) - .Where(x => x.Text == "hello" || x.NodeId == 3, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.Text == "hello" || x.NodeId == 3, _sqlSyntax); Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[text] = @0) OR ([umbracoNode].[id] = @1)))", sql.SQL.Replace("\n", " ")); Assert.AreEqual(2, sql.Arguments.Length); @@ -199,7 +197,7 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*").From("[cmsContent]"); var sql = new Sql(); - sql.Select("*").From(sqlSyntax); + sql.Select("*").From(_sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -216,9 +214,9 @@ namespace Umbraco.Tests.Persistence.Querying .On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]"); var sql = new Sql(); - sql.Select("*").From(sqlSyntax) - .InnerJoin(sqlSyntax) - .On(sqlSyntax, left => left.VersionId, right => right.VersionId); + sql.Select("*").From(_sqlSyntax) + .InnerJoin(_sqlSyntax) + .On(_sqlSyntax, left => left.VersionId, right => right.VersionId); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -232,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*").From("[cmsContent]").OrderBy("([cmsContent].[contentType])"); var sql = new Sql(); - sql.Select("*").From(sqlSyntax).OrderBy(x => x.ContentTypeId, sqlSyntax); + sql.Select("*").From(_sqlSyntax).OrderBy(x => x.ContentTypeId, _sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -246,7 +244,7 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*").From("[cmsContent]").GroupBy("[contentType]"); var sql = new Sql(); - sql.Select("*").From(sqlSyntax).GroupBy(x => x.ContentTypeId, sqlSyntax); + sql.Select("*").From(_sqlSyntax).GroupBy(x => x.ContentTypeId, _sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -260,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*").From("[cmsContent]").Where("([cmsContent].[nodeId] = @0)", 1045); var sql = new Sql(); - sql.Select("*").From(sqlSyntax).Where(x => x.NodeId == 1045, sqlSyntax); + sql.Select("*").From(_sqlSyntax).Where(x => x.NodeId == 1045, _sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -278,9 +276,9 @@ namespace Umbraco.Tests.Persistence.Querying var sql = new Sql(); sql.Select("*") - .From(sqlSyntax) - .Where(x => x.NodeId == 1045, sqlSyntax) - .Where(x => x.ContentTypeId == 1050, sqlSyntax); + .From(_sqlSyntax) + .Where(x => x.NodeId == 1045, _sqlSyntax) + .Where(x => x.ContentTypeId == 1050, _sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -295,8 +293,8 @@ namespace Umbraco.Tests.Persistence.Querying .From("[cmsContent]"); var sql = new Sql(); - sql.Select(sqlSyntax) - .From(sqlSyntax); + sql.Select(_sqlSyntax) + .From(_sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -311,8 +309,8 @@ namespace Umbraco.Tests.Persistence.Querying .From("[cmsContent]"); var sql = new Sql(); - sql.Select(sqlSyntax, c => c.NodeId) - .From(sqlSyntax); + sql.Select(_sqlSyntax, c => c.NodeId) + .From(_sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -327,8 +325,8 @@ namespace Umbraco.Tests.Persistence.Querying .From("[cmsContent]"); var sql = new Sql(); - sql.Select(sqlSyntax, c => c.NodeId, c => c.ContentTypeId, c => c.PrimaryKey) - .From(sqlSyntax); + sql.Select(_sqlSyntax, c => c.NodeId, c => c.ContentTypeId, c => c.PrimaryKey) + .From(_sqlSyntax); Assert.That(sql.SQL, Is.EqualTo(expected.SQL)); @@ -345,11 +343,11 @@ namespace Umbraco.Tests.Persistence.Querying .On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]"); var sql = new Sql(); - sql.Select(sqlSyntax, d => d.NodeId, d => d.Published) - .AndSelect(sqlSyntax, cv => cv.Id) - .From(sqlSyntax) - .InnerJoin(sqlSyntax) - .On(sqlSyntax, left => left.VersionId, right => right.VersionId); + sql.Select(_sqlSyntax, d => d.NodeId, d => d.Published) + .AndSelect(_sqlSyntax, cv => cv.Id) + .From(_sqlSyntax) + .InnerJoin(_sqlSyntax) + .On(_sqlSyntax, left => left.VersionId, right => right.VersionId); Assert.That(sql.SQL, Is.EqualTo(expected.SQL));