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

it builds! ... but not sure it works yet.

Browse Source
This commit is contained in:
Shannon
2016-03-10 19:47:10 +01:00
parent f6f54fd057
commit 8729e00864
20 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
View File

@@ -328,10 +328,10 @@ namespace Umbraco.Tests.Models.Mapping
//return a textbox property editor for any requested editor by alias
_propertyEditorResolver.Setup(resolver => resolver.GetByAlias(It.IsAny<string>()))
.Returns(new TextboxPropertyEditor());
.Returns(new TextboxPropertyEditor(Mock.Of<ILogger>()));
//for testing, just return a list of whatever property editors we want
_propertyEditorResolver.Setup(resolver => resolver.PropertyEditors)
.Returns(new[] { new TextboxPropertyEditor() });
.Returns(new[] { new TextboxPropertyEditor(Mock.Of<ILogger>()) });
var memberType = MockedContentTypes.CreateSimpleMemberType();
memberType.MemberTypePropertyTypes[memberType.PropertyTypes.Last().Alias] = new MemberTypePropertyProfileAccess(true, true);
@@ -398,10 +398,10 @@ namespace Umbraco.Tests.Models.Mapping
//return a textbox property editor for any requested editor by alias
_propertyEditorResolver.Setup(resolver => resolver.GetByAlias(It.IsAny<string>()))
.Returns(new TextboxPropertyEditor());
.Returns(new TextboxPropertyEditor(Mock.Of<ILogger>()));
//for testing, just return a list of whatever property editors we want
_propertyEditorResolver.Setup(resolver => resolver.PropertyEditors)
.Returns(new[] { new TextboxPropertyEditor() });
.Returns(new[] { new TextboxPropertyEditor(Mock.Of<ILogger>()) });
var mediaType = MockedContentTypes.CreateImageMediaType();
MockedContentTypes.EnsureAllIds(mediaType, 8888);
@@ -741,10 +741,10 @@ namespace Umbraco.Tests.Models.Mapping
//return a textbox property editor for any requested editor by alias
_propertyEditorResolver.Setup(resolver => resolver.GetByAlias(It.IsAny<string>()))
.Returns(new TextboxPropertyEditor());
.Returns(new TextboxPropertyEditor(Mock.Of<ILogger>()));
//for testing, just return a list of whatever property editors we want
_propertyEditorResolver.Setup(resolver => resolver.PropertyEditors)
.Returns(new[] { new TextboxPropertyEditor() });
.Returns(new[] { new TextboxPropertyEditor(Mock.Of<ILogger>()) });
var ctMain = MockedContentTypes.CreateSimpleMediaType("parent", "Parent");
//not assigned to tab

2
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
View File

@@ -533,7 +533,7 @@ namespace Umbraco.Tests.Persistence.Repositories
unitOfWork.Commit();
// Act
var contentTypes = repository.GetByQuery(new Query<IContentType>().Where(x => x.ParentId == contentType.Id));
var contentTypes = repository.GetByQuery(repository.Query.Where(x => x.ParentId == contentType.Id));
// Assert
Assert.That(contentTypes.Count(), Is.EqualTo(3));

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

@@ -27,13 +27,11 @@ namespace Umbraco.Tests.Persistence.Repositories
CreateTestData();
}
private DictionaryRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
private IDictionaryRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
{
var dictionaryRepository = new DictionaryRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), new SqlCeSyntaxProvider());
return dictionaryRepository;
return Container.GetInstance<IDatabaseUnitOfWork, IDictionaryRepository>(unitOfWork);
}
[Test]
public void Can_Perform_Get_By_Key_On_DictionaryRepository()
{
@@ -246,7 +244,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// Arrange
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax))
using (var languageRepository = Container.GetInstance<IDatabaseUnitOfWork, ILanguageRepository>(unitOfWork))
using (var repository = CreateRepository(unitOfWork))
{
@@ -304,7 +302,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// Arrange
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
var repository = new DictionaryRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), new SqlCeSyntaxProvider());
var repository = CreateRepository(unitOfWork);
var languageNo = new Language("nb-NO") { CultureName = "nb-NO" };
ServiceContext.LocalizationService.Save(languageNo);

3
src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Globalization;
using System.Linq;
using LightInject;
using Moq;
using Newtonsoft.Json;
using NUnit.Framework;
@@ -141,7 +142,7 @@ namespace Umbraco.Tests.PropertyEditors
{
try
{
PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(new ActivatorServiceProvider(), Mock.Of<ILogger>());
PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(Mock.Of<IServiceContainer>(), Mock.Of<ILogger>());
Resolution.Freeze();
var dataTypeService = new Mock<IDataTypeService>();

1
src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
View File

@@ -374,7 +374,6 @@ namespace Umbraco.Tests.Web.Mvc
ServiceContext GetServiceContext()
{
return MockHelper.GetMockedServiceContext();
new Mock<IEntityService>().Object,
}
ViewContext GetViewContext()