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

fixes merge issues

Browse Source
This commit is contained in:
Shannon
2015-01-23 12:28:27 +11:00
parent c94eff9089
commit 0df22a16b5
5 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
-12
View File
@@ -1,22 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using NUnit.Framework;
using umbraco;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.Querying;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Tests.TestHelpers;
using umbraco.editorControls.tinyMCE3;
using umbraco.interfaces;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
namespace Umbraco.Tests.Persistence.Repositories
{
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+3 -3
View File
@@ -36,9 +36,9 @@ namespace Umbraco.Tests.Persistence.Repositories
private MediaRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
{
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider);
var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider, mediaTypeRepository, tagRepository);
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository);
return repository;
}
src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+2 -2
View File
@@ -132,7 +132,7 @@ namespace Umbraco.Tests.Routing
// must lookup domain else lookup by url fails
pcr.Engine.FindDomain();
var lookup = new ContentFinderByNiceUrl();
var lookup = new ContentFinderByNiceUrl(Logger);
var result = lookup.TryFindContent(pcr);
Assert.IsTrue(result);
Assert.AreEqual(expectedId, pcr.PublishedContent.Id);
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Routing
pcr.Engine.FindDomain();
Assert.AreEqual(expectedCulture, pcr.Culture.Name);
var lookup = new ContentFinderByNiceUrl();
var lookup = new ContentFinderByNiceUrl(Logger);
var result = lookup.TryFindContent(pcr);
Assert.IsTrue(result);
Assert.AreEqual(expectedId, pcr.PublishedContent.Id);
src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+3 -3
View File
@@ -152,8 +152,8 @@ namespace Umbraco.Tests.Routing
Assert.AreEqual(expectedCulture, pcr.Culture.Name);
SettingsForTests.HideTopLevelNodeFromPath = false;
var finder = new ContentFinderByNiceUrl();
SettingsForTests.HideTopLevelNodeFromPath = false;
var finder = new ContentFinderByNiceUrl(Logger);
var result = finder.TryFindContent(pcr);
Assert.IsTrue(result);
@@ -196,7 +196,7 @@ namespace Umbraco.Tests.Routing
// find document
SettingsForTests.HideTopLevelNodeFromPath = false;
var finder = new ContentFinderByNiceUrl();
var finder = new ContentFinderByNiceUrl(Logger);
var result = finder.TryFindContent(pcr);
// apply wildcard domain
src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace Umbraco.Tests.Routing
Assert.IsTrue(pcr.HasDomain);
// check that it's been routed
var lookup = new ContentFinderByNiceUrl();
var lookup = new ContentFinderByNiceUrl(Logger);
var result = lookup.TryFindContent(pcr);
Assert.IsTrue(result);
Assert.AreEqual(100111, pcr.PublishedContent.Id);