From ee24fb4ef75d71693a304b7659d7fc5dddf32e74 Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 9 Oct 2018 23:02:22 +0200 Subject: [PATCH] Make Tests Green Again --- src/Umbraco.Core/Models/Section.cs | 6 ++---- .../Repositories/Implement/MemberRepository.cs | 1 - .../Repositories/Implement/UserRepository.cs | 2 -- src/Umbraco.Tests/Composing/TypeLoaderTests.cs | 4 ++-- .../PublishedContentLanguageVariantTests.cs | 12 +++++++++--- .../Models/Mapping/SectionMapperProfile.cs | 3 ++- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Core/Models/Section.cs b/src/Umbraco.Core/Models/Section.cs index b9eda285b0..4b7f8309dd 100644 --- a/src/Umbraco.Core/Models/Section.cs +++ b/src/Umbraco.Core/Models/Section.cs @@ -1,7 +1,7 @@ namespace Umbraco.Core.Models { /// - /// Represents a section defined in the app.config file + /// Represents a section defined in the app.config file. /// public class Section { @@ -13,9 +13,7 @@ } public Section() - { - - } + { } public string Name { get; set; } public string Alias { get; set; } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs index ee6727a32e..84ef154ae8 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs @@ -175,7 +175,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement { var list = new List { - "DELETE FROM cmsTask WHERE nodeId = @id", "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @id", "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @id", "DELETE FROM umbracoRelation WHERE parentId = @id", diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs index 853b716242..23c7c055f8 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs @@ -421,8 +421,6 @@ ORDER BY colName"; { var list = new List { - "DELETE FROM cmsTask WHERE userId = @id", - "DELETE FROM cmsTask WHERE parentUserId = @id", "DELETE FROM umbracoUser2UserGroup WHERE userId = @id", "DELETE FROM umbracoUser2NodeNotify WHERE userId = @id", "DELETE FROM umbracoUser WHERE id = @id", diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs index c6365ba4a2..d7f2e7dd53 100644 --- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs +++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs @@ -258,7 +258,7 @@ AnotherContentFinder public void Resolves_Assigned_Mappers() { var foundTypes1 = _typeLoader.GetAssignedMapperTypes(); - Assert.AreEqual(30, foundTypes1.Count()); + Assert.AreEqual(29, foundTypes1.Count()); } [Test] @@ -279,7 +279,7 @@ AnotherContentFinder public void Resolves_Trees() { var trees = _typeLoader.GetTrees(); - Assert.AreEqual(3, trees.Count()); + Assert.AreEqual(1, trees.Count()); } [Test] diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index 4e98aea000..2288ff80c2 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -62,17 +62,21 @@ namespace Umbraco.Tests.PublishedContent internal override void PopulateCache(PublishedContentTypeFactory factory, SolidPublishedContentCache cache) { + var prop1Type = factory.CreatePropertyType("prop1", 1); + var welcomeType = factory.CreatePropertyType("welcomeText", 1); + var welcome2Type = factory.CreatePropertyType("welcomeText2", 1); var props = new[] { - factory.CreatePropertyType("prop1", 1), - factory.CreatePropertyType("welcomeText", 1), - factory.CreatePropertyType("welcomeText2", 1), + prop1Type, + welcomeType, + welcome2Type, }; var contentType1 = factory.CreateContentType(1, "ContentType1", Enumerable.Empty(), props); var prop1 = new SolidPublishedPropertyWithLanguageVariants { Alias = "welcomeText", + PropertyType = welcomeType }; prop1.SetSourceValue("en-US", "Welcome", true); prop1.SetValue("en-US", "Welcome", true); @@ -84,6 +88,7 @@ namespace Umbraco.Tests.PublishedContent var prop2 = new SolidPublishedPropertyWithLanguageVariants { Alias = "welcomeText2", + PropertyType = welcome2Type }; prop2.SetSourceValue("en-US", "Welcome", true); prop2.SetValue("en-US", "Welcome", true); @@ -91,6 +96,7 @@ namespace Umbraco.Tests.PublishedContent var prop3 = new SolidPublishedPropertyWithLanguageVariants { Alias = "welcomeText", + PropertyType = welcomeType }; prop3.SetSourceValue("en-US", "Welcome", true); prop3.SetValue("en-US", "Welcome", true); diff --git a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs index 11b4deff48..ba7ff3c38d 100644 --- a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs @@ -11,8 +11,9 @@ namespace Umbraco.Web.Models.Mapping { CreateMap() .ForMember(dest => dest.RoutePath, opt => opt.Ignore()) + .ForMember(dest => dest.Icon, opt => opt.Ignore()) .ForMember(dest => dest.Name, opt => opt.MapFrom(src => textService.Localize("sections/" + src.Alias, (IDictionary)null))) - .ReverseMap(); //backwards too! + .ReverseMap(); //backwards too! } } }