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

fix merge issues

Browse Source
This commit is contained in:
Shannon
2016-05-19 17:21:34 +02:00
parent f9ba3fe76f
commit 4ce9964019
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Tests/Persistence/UnitOfWorkTests.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Persistence
[Test]
public void ReadLockNonExisting()
{
var provider = new NPocoUnitOfWorkProvider(Logger);
var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver);
Assert.Throws<Exception>(() =>
{
using (var uow = provider.CreateUnitOfWork())
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Persistence
[Test]
public void ReadLockExisting()
{
var provider = new NPocoUnitOfWorkProvider(Logger);
var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver);
using (var uow = provider.CreateUnitOfWork())
{
uow.ReadLock(Constants.Locks.Servers);
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Persistence
[Test]
public void WriteLockNonExisting()
{
var provider = new NPocoUnitOfWorkProvider(Logger);
var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver);
Assert.Throws<Exception>(() =>
{
using (var uow = provider.CreateUnitOfWork())
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.Persistence
[Test]
public void WriteLockExisting()
{
var provider = new NPocoUnitOfWorkProvider(Logger);
var provider = new NPocoUnitOfWorkProvider(Logger, MappingResolver);
using (var uow = provider.CreateUnitOfWork())
{
uow.WriteLock(Constants.Locks.Servers);

1
src/UmbracoExamine/BaseUmbracoIndexer.cs
View File

@@ -19,6 +19,7 @@ using Examine.LuceneEngine.Indexing;
using Lucene.Net.Documents;
using Lucene.Net.Store;
using Umbraco.Core.Logging;
using Umbraco.Core.Xml;
using UmbracoExamine.LocalStorage;
using Directory = Lucene.Net.Store.Directory;