yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes unit tests

Browse Source
This commit is contained in:
Shannon
2014-03-11 15:02:23 +11:00
parent c500d29029
commit 48bbf1ecb2
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
View File

@@ -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);

2
src/Umbraco.Tests/Models/MediaXmlTest.cs
View File

@@ -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);

10
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
View File

@@ -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<ContentTypeSort>
{
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

2
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
View File

@@ -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)

4
src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
View File

@@ -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",