From 48bbf1ecb2bb1b37f00c4ff30c0082950de1d5db Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 11 Mar 2014 15:02:23 +1100 Subject: [PATCH] Fixes unit tests --- .../Membership/DynamicMemberContentTests.cs | 4 ++-- src/Umbraco.Tests/Models/MediaXmlTest.cs | 2 +- .../Persistence/Repositories/ContentRepositoryTest.cs | 10 +++++----- .../PublishedContent/PublishedMediaTests.cs | 2 +- .../TestHelpers/Entities/MockedContentTypes.cs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs index 09437e2ddc..023e330871 100644 --- a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs +++ b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs @@ -76,7 +76,7 @@ namespace Umbraco.Tests.Membership var d = mpc.AsDynamic(); - Assert.AreEqual("test comment", d.Comment); + Assert.AreEqual("test comment", d.Comments); Assert.AreEqual(date, d.CreationDate); Assert.AreEqual("test@email.com", d.Email); Assert.AreEqual(true, d.IsApproved); @@ -117,7 +117,7 @@ namespace Umbraco.Tests.Membership var d = mpc.AsDynamic(); - Assert.AreEqual("test comment", d.comment); + Assert.AreEqual("test comment", d.comments); Assert.AreEqual(date, d.creationDate); Assert.AreEqual("test@email.com", d.email); Assert.AreEqual(true, d.isApproved); diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs index 5b24b8a8ae..ecfbc3ce61 100644 --- a/src/Umbraco.Tests/Models/MediaXmlTest.cs +++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs @@ -37,7 +37,7 @@ namespace Umbraco.Tests.Models public void Can_Generate_Xml_Representation_Of_Media() { // Arrange - var mediaType = MockedContentTypes.CreateImageMediaType(); + var mediaType = MockedContentTypes.CreateImageMediaType("image2"); ServiceContext.ContentTypeService.Save(mediaType); var media = MockedMedia.CreateMediaImage(mediaType, -1); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs index 3cecf55a06..1433920eba 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs @@ -53,7 +53,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); + var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage"); contentType.AllowedContentTypes = new List { new ContentTypeSort @@ -105,7 +105,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); + ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage"); Content textpage = MockedContent.CreateSimpleContent(contentType); // Act @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); + var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage"); contentTypeRepository.AddOrUpdate(contentType); unitOfWork.Commit(); @@ -163,7 +163,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); + ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage"); Content textpage = MockedContent.CreateSimpleContent(contentType); // Act @@ -193,7 +193,7 @@ namespace Umbraco.Tests.Persistence.Repositories ContentTypeRepository contentTypeRepository; using (var repository = CreateRepository(unitOfWork, out contentTypeRepository)) { - ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage"); + ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage"); Content textpage = MockedContent.CreateSimpleContent(contentType); // Act diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 8919afe0ba..ab7a015175 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -73,7 +73,7 @@ namespace Umbraco.Tests.PublishedContent [Test] public void Get_Property_Value_Uses_Converter() { - var mType = MockedContentTypes.CreateImageMediaType(); + var mType = MockedContentTypes.CreateImageMediaType("image2"); //lets add an RTE to this mType.PropertyGroups.First().PropertyTypes.Add( new PropertyType(Guid.Parse(Constants.PropertyEditors.TinyMCEv3), DataTypeDatabaseType.Nvarchar) diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs index 58d2179a59..f8a93ae3c4 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs @@ -237,11 +237,11 @@ namespace Umbraco.Tests.TestHelpers.Entities return mediaType; } - public static MediaType CreateImageMediaType() + public static MediaType CreateImageMediaType(string alias = Constants.Conventions.MediaTypes.Image) { var mediaType = new MediaType(-1) { - Alias = Constants.Conventions.MediaTypes.Image, + Alias = alias, Name = "Image", Description = "ContentType used for images", Icon = ".sprTreeDoc3",