From 2f83e5ba31734b04cda29a12f1b1541e21af28fa Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Thu, 29 Nov 2012 13:05:51 -0100 Subject: [PATCH] Fixing a few broken unit tests --- .../Persistence/Querying/PetaPocoSqlTests.cs | 8 ++-- .../Persistence/Querying/QueryBuilderTests.cs | 4 +- .../Routing/RenderRouteHandlerTests.cs | 12 ++++-- .../Services/ContentServiceTests.cs | 3 +- .../TestHelpers/BaseRoutingTest.cs | 1 - .../install/steps/database.ascx | 39 ------------------- 6 files changed, 16 insertions(+), 51 deletions(-) diff --git a/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs b/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs index e7727685b5..0e57c019bb 100644 --- a/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs @@ -46,7 +46,7 @@ namespace Umbraco.Tests.Persistence.Querying public void Can_OrderBy_With_Type() { var expected = new Sql(); - expected.Select("*").From("[cmsContent]").OrderBy("[contentType]"); + expected.Select("*").From("[cmsContent]").OrderBy("[cmsContent].[contentType]"); var sql = new Sql(); sql.Select("*").From().OrderBy(x => x.ContentTypeId); @@ -74,7 +74,7 @@ namespace Umbraco.Tests.Persistence.Querying public void Can_Use_Where_Predicate() { var expected = new Sql(); - expected.Select("*").From("[cmsContent]").Where("(nodeId=1045)"); + expected.Select("*").From("[cmsContent]").Where("nodeId=1045"); var sql = new Sql(); sql.Select("*").From().Where(x => x.NodeId == 1045); @@ -90,8 +90,8 @@ namespace Umbraco.Tests.Persistence.Querying var expected = new Sql(); expected.Select("*") .From("[cmsContent]") - .Where("(nodeId=1045)") - .Where("(contentType=1050)"); + .Where("nodeId=1045") + .Where("contentType=1050"); var sql = new Sql(); sql.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs index 905b6a08ef..2fc46144c1 100644 --- a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs @@ -48,7 +48,7 @@ namespace Umbraco.Tests.Persistence.Querying var result = translator.Translate(); var strResult = result.SQL; - string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([umbracoNode].[parentID]=-1))"; + string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE ([umbracoNode].[parentID]=-1)"; // Assert Assert.That(strResult, Is.Not.Empty); @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Querying var result = translator.Translate(); var strResult = result.SQL; - string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([cmsContentType].[alias]='umbTextpage'))"; + string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE ([cmsContentType].[alias]='umbTextpage')"; // Assert Assert.That(strResult, Is.Not.Empty); diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 306a02bb5b..2c20529d6f 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -19,12 +19,16 @@ namespace Umbraco.Tests.Routing public override void Initialize() { + //this ensures its reset + PluginManager.Current = new PluginManager(); + + SurfaceControllerResolver.Current = new SurfaceControllerResolver( + PluginManager.Current.ResolveSurfaceControllers()); + base.Initialize(); + System.Configuration.ConfigurationManager.AppSettings.Set("umbracoPath", "~/umbraco"); - - SurfaceControllerResolver.Current = new SurfaceControllerResolver( - PluginManager.Current.ResolveSurfaceControllers()); - + var webBoot = new WebBootManager(new UmbracoApplication(), true); //webBoot.Initialize(); //webBoot.Startup(null); -> don't call startup, we don't want any other application event handlers to bind for this test. diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index c78c5e0f44..c8c9956fe1 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -650,6 +650,7 @@ namespace Umbraco.Tests.Services var contentService = ServiceContext.ContentService; var subpage2 = contentService.GetById(1048); var version = subpage2.Version; + var nameBeforeRollback = subpage2.Name; subpage2.Name = "Text Page 2 Updated"; subpage2.SetValue("author", "Jane Doe"); contentService.Save(subpage2, 0); @@ -661,7 +662,7 @@ namespace Umbraco.Tests.Services Assert.That(rollback, Is.Not.Null); Assert.AreNotEqual(rollback.Version, version); Assert.That(rollback.GetValue("author"), Is.Not.EqualTo("Jane Doe")); - Assert.AreEqual(subpage2.Name, rollback.Name); + Assert.AreEqual(nameBeforeRollback, rollback.Name); } [Test] diff --git a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs index 8151c277e5..585733e309 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseRoutingTest.cs @@ -16,7 +16,6 @@ namespace Umbraco.Tests.TestHelpers public override void Initialize() { base.Initialize(); - UmbracoSettings.ResetSetters(); } public override void TearDown() diff --git a/src/Umbraco.Web.UI/install/steps/database.ascx b/src/Umbraco.Web.UI/install/steps/database.ascx index a28efb6712..d3446f49cb 100644 --- a/src/Umbraco.Web.UI/install/steps/database.ascx +++ b/src/Umbraco.Web.UI/install/steps/database.ascx @@ -318,45 +318,6 @@ } }); }); - - /*var intervalId = 0; - - jQuery(document).ready(function () { - - jQuery(".btn-box").hide(); - jQuery.ajax({ - type: 'POST', - contentType: 'application/json; charset=utf-8', - data: '{}', - dataType: 'json', - url: 'utills/p.aspx/installOrUpgrade' - }); - - intervalId = setInterval("progressBarCallback()", 1000); - }); - - function progressBarCallback() { - jQuery.getJSON('utills/p.aspx?feed=progress', function (data) { - - updateProgressBar(data.Percentage); - updateStatusMessage(data.Description); - - if (data.Error != "") { - clearInterval(intervalId); - updateStatusMessage(jQuery(".loader > strong").text(), data.Error); - - jQuery(".btn-continue").hide(); - jQuery(".btn-back").show(); - jQuery(".btn-box").show(); - } - - if (data.Percentage == 100) { - clearInterval(intervalId); - jQuery(".btn-box").show(); - jQuery('.ui-progressbar-value').css("background-image", "url(../umbraco_client/installer/images/pbar.gif)"); - } - }); - }*/