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

WIP sln is now building... though i doubt anything works atm, working on that now.

Browse Source
This commit is contained in:
Shannon
2015-12-20 16:49:24 +01:00
parent 73cc4b4e3f
commit 0fd9a074d8
29 changed files with 232 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Core/Persistence/PetaPoco.cs
+1 -1
View File
@@ -27,7 +27,7 @@ using System.Linq.Expressions;
namespace Umbraco.Core.Persistence
{
// Poco's marked [Explicit] require all column properties to be marked
// Poco's marked [Explicit] require all column properties to be marked
[AttributeUsage(AttributeTargets.Class)]
public class ExplicitColumnsAttribute : Attribute
{
src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs
+46 -56
View File
@@ -62,59 +62,46 @@ namespace Umbraco.Tests.BootManagers
{
}
/// <summary>
/// Creates and returns the application context singleton
/// </summary>
/// <param name="dbContext"></param>
/// <param name="serviceContext"></param>
protected override ApplicationContext CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
{
var appContext = base.CreateApplicationContext(dbContext, serviceContext);
///// <summary>
///// Creates and returns the application context singleton
///// </summary>
///// <param name="dbContext"></param>
///// <param name="serviceContext"></param>
//protected override ApplicationContext CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
//{
// var appContext = base.CreateApplicationContext(dbContext, serviceContext);
var dbContextMock = new Mock<DatabaseContext>(Mock.Of<IDatabaseFactory>(), ProfilingLogger.Logger, Mock.Of<ISqlSyntaxProvider>(), "test");
dbContextMock.Setup(x => x.CanConnect).Returns(true);
appContext.DatabaseContext = dbContextMock.Object;
// var dbContextMock = new Mock<DatabaseContext>(Mock.Of<IDatabaseFactory>(), ProfilingLogger.Logger, Mock.Of<ISqlSyntaxProvider>(), "test");
// dbContextMock.Setup(x => x.CanConnect).Returns(true);
// appContext.DatabaseContext = dbContextMock.Object;
return appContext;
}
// return appContext;
//}
protected override void InitializeApplicationEventsResolver()
{
//create an empty resolver so we can add our own custom ones (don't type find)
ApplicationEventsResolver.Current = new ApplicationEventsResolver(
new ActivatorServiceProvider(), ProfilingLogger.Logger,
new Type[]
{
typeof(LegacyStartupHandler),
typeof(TestApplicationEventHandler)
})
{
CanResolveBeforeFrozen = true
};
}
//protected override void InitializeApplicationEventsResolver()
//{
// //create an empty resolver so we can add our own custom ones (don't type find)
// ApplicationEventsResolver.Current = new ApplicationEventsResolver(
// new ActivatorServiceProvider(), ProfilingLogger.Logger,
// new Type[]
// {
// typeof(LegacyStartupHandler),
// typeof(TestApplicationEventHandler)
// })
// {
// CanResolveBeforeFrozen = true
// };
//}
protected override void InitializeLoggerResolver()
{
}
//protected override void InitializeLoggerResolver()
//{
//}
protected override void InitializeProfilerResolver()
{
}
//protected override void InitializeProfilerResolver()
//{
//}
}
/// <summary>
/// Test legacy startup handler
/// </summary>
public class LegacyStartupHandler : IApplicationStartupHandler
{
public static bool Initialized = false;
public LegacyStartupHandler()
{
Initialized = true;
}
}
/// <summary>
/// test event handler
/// </summary>
@@ -153,24 +140,27 @@ namespace Umbraco.Tests.BootManagers
[Test]
public void Ensure_Legacy_Startup_Handlers_Not_Started_Until_Complete()
{
EventHandler starting = (sender, args) =>
using (var app = new TestApp())
{
EventHandler starting = (sender, args) =>
{
Assert.IsTrue(TestApplicationEventHandler.Initialized);
Assert.IsTrue(TestApplicationEventHandler.Starting);
Assert.IsFalse(LegacyStartupHandler.Initialized);
};
EventHandler started = (sender, args) =>
EventHandler started = (sender, args) =>
{
Assert.IsTrue(TestApplicationEventHandler.Started);
Assert.IsTrue(LegacyStartupHandler.Initialized);
};
TestApp.ApplicationStarting += starting;
TestApp.ApplicationStarted += started;
_testApp.StartApplication(_testApp, new EventArgs());
app.ApplicationStarting += starting;
app.ApplicationStarted += started;
TestApp.ApplicationStarting -= starting;
TestApp.ApplicationStarting -= started;
_testApp.StartApplication(_testApp, new EventArgs());
app.ApplicationStarting -= starting;
app.ApplicationStarting -= started;
}
}
src/Umbraco.Tests/Macros/MacroTests.cs
+9 -6
View File
@@ -12,7 +12,10 @@ using Umbraco.Core.Profiling;
using umbraco;
using umbraco.cms.businesslogic.macro;
using Umbraco.Core.Configuration;
using Umbraco.Core.Models;
using Umbraco.Tests.TestHelpers;
using File = System.IO.File;
using Macro = umbraco.cms.businesslogic.macro.Macro;
namespace Umbraco.Tests.Macros
{
@@ -61,7 +64,7 @@ namespace Umbraco.Tests.Macros
public void SetUserControlProperty(string val, string macroPropName, Type convertTo)
{
var ctrl = new UserControlTest();
var macroModel = new MacroModel("test", "test", "", "~/usercontrols/menu.ascx", "", "", 0, false, false);
var macroModel = new MacroModel("test", "test", "", "~/usercontrols/menu.ascx", "", 0, false, false);
macroModel.Properties.Add(new MacroPropertyModel(macroPropName, val));
macro.UpdateControlProperties(ctrl, macroModel);
@@ -86,7 +89,7 @@ namespace Umbraco.Tests.Macros
public void Determine_Macro_Type(string xslt, string scriptFile, string scriptType, string scriptAssembly, string expectedType)
{
var expected = Enum<MacroTypes>.Parse(expectedType);
Assert.AreEqual(expected, Macro.FindMacroType(xslt, scriptFile, scriptType, scriptAssembly));
Assert.AreEqual(expected, Macro.FindMacroType(xslt, scriptFile, scriptType));
}
[TestCase("text.xslt", "", "", "", "~/xslt/text.xslt")]
@@ -96,7 +99,7 @@ namespace Umbraco.Tests.Macros
[TestCase("", "", "~/usercontrols/menu.ascx", "", "~/usercontrols/menu.ascx")]
public void Get_Macro_File(string xslt, string scriptFile, string scriptType, string scriptAssembly, string expectedResult)
{
var model = new MacroModel("Test", "test", scriptAssembly, scriptType, xslt, scriptFile, 0, false, false);
var model = new MacroModel("Test", "test", scriptAssembly, scriptType, xslt, 0, false, false);
var file = macro.GetMacroFile(model);
Assert.AreEqual(expectedResult, file);
}
@@ -111,7 +114,7 @@ namespace Umbraco.Tests.Macros
public void Macro_Is_File_Based(string macroType, bool expectedResult)
{
var mType = Enum<MacroTypes>.Parse(macroType);
var model = new MacroModel("Test", "test", "", "", "", "", 0, false, false);
var model = new MacroModel("Test", "test", "", "", "", 0, false, false);
model.MacroType = mType; //force the type
Assert.AreEqual(expectedResult, macro.MacroIsFileBased(model));
}
@@ -126,7 +129,7 @@ namespace Umbraco.Tests.Macros
public void Can_Cache_As_String(string macroType, bool expectedResult)
{
var mType = Enum<MacroTypes>.Parse(macroType);
var model = new MacroModel("Test", "test", "", "", "", "", 0, false, false);
var model = new MacroModel("Test", "test", "", "", "", 0, false, false);
model.MacroType = mType; //force the type
Assert.AreEqual(expectedResult, macro.CacheMacroAsString(model));
}
@@ -147,7 +150,7 @@ namespace Umbraco.Tests.Macros
File.CreateText(path).Close();
//needs to be file based (i.e. xslt)
var model = new MacroModel("Test", "test", "", "", "test.xslt", "", 0, false, false);
var model = new MacroModel("Test", "test", "", "", "test.xslt", 0, false, false);
Assert.AreEqual(expectedResult, macro.MacroNeedsToBeClearedFromCache(model, "TestDate", new FileInfo(path)));
}
src/Umbraco.Tests/Migrations/FindingMigrationsTest.cs
+5 -2
View File
@@ -4,6 +4,7 @@ using System.Linq;
using Moq;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.LightInject;
using Umbraco.Core.Logging;
using Umbraco.Core.ObjectResolution;
using Umbraco.Core.Persistence;
@@ -18,6 +19,8 @@ namespace Umbraco.Tests.Migrations
[TestFixture]
public class FindingMigrationsTest
{
private MigrationResolver _migrationResolver;
[SetUp]
public void Initialize()
{
@@ -45,7 +48,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void Can_Find_Migrations_With_Target_Version_Six()
{
var foundMigrations = MigrationResolver.Current.Migrations;
var foundMigrations = _migrationResolver.Migrations;
var targetVersion = new Version("6.0.0");
var list = new List<IMigration>();
@@ -63,7 +66,7 @@ namespace Umbraco.Tests.Migrations
Assert.That(list.Count, Is.EqualTo(3));
var context = new MigrationContext(DatabaseProviders.SqlServerCE, null, Mock.Of<ILogger>());
var context = new MigrationContext(DatabaseProviders.SqlServerCE, null, Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>());
foreach (var migration1 in list)
{
var migration = (MigrationBase) migration1;
src/Umbraco.Tests/Migrations/MigrationRunnerTests.cs
+6 -3
View File
@@ -20,6 +20,7 @@ namespace Umbraco.Tests.Migrations
public void Executes_Only_One_Migration_For_Spanning_Multiple_Targets()
{
var runner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
Mock.Of<ILogger>(), new SemVersion(4, 0, 0), new SemVersion(6, 0, 0), "Test");
@@ -29,7 +30,7 @@ namespace Umbraco.Tests.Migrations
//new List<IMigration> {new DoRunMigration(), new DoNotRunMigration()},
migrations.ToList(),
new Database("umbracoDbDSN")
, DatabaseProviders.SqlServerCE, true);
, DatabaseProviders.SqlServerCE, Mock.Of<ISqlSyntaxProvider>(), true);
Assert.AreEqual(1, ctx.Expressions.Count());
}
@@ -38,6 +39,7 @@ namespace Umbraco.Tests.Migrations
public void Executes_Migration_For_Spanning_One_Target_1()
{
var runner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
Mock.Of<ILogger>(), new SemVersion(4, 0, 0), new SemVersion(5, 0, 0), "Test");
@@ -47,7 +49,7 @@ namespace Umbraco.Tests.Migrations
//new List<IMigration> {new DoRunMigration(), new DoNotRunMigration()},
migrations.ToList(),
new Database("umbracoDbDSN")
, DatabaseProviders.SqlServerCE, true);
, DatabaseProviders.SqlServerCE, Mock.Of<ISqlSyntaxProvider>(), true);
Assert.AreEqual(1, ctx.Expressions.Count());
}
@@ -56,6 +58,7 @@ namespace Umbraco.Tests.Migrations
public void Executes_Migration_For_Spanning_One_Target_2()
{
var runner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
Mock.Of<ILogger>(), new SemVersion(5, 0, 1), new SemVersion(6, 0, 0), "Test");
@@ -65,7 +68,7 @@ namespace Umbraco.Tests.Migrations
//new List<IMigration> {new DoRunMigration(), new DoNotRunMigration()},
migrations.ToList(),
new Database("umbracoDbDSN")
, DatabaseProviders.SqlServerCE, true);
, DatabaseProviders.SqlServerCE, Mock.Of<ISqlSyntaxProvider>(), true);
Assert.AreEqual(1, ctx.Expressions.Count());
}
src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
+2
View File
@@ -28,6 +28,7 @@ namespace Umbraco.Tests.Migrations
/// <summary>Regular expression that finds multiline block comments.</summary>
private static readonly Regex FindComments = new Regex(@"\/\*.*?\*\/", RegexOptions.Singleline | RegexOptions.Compiled);
private MigrationResolver _migrationResolver;
/// <summary>
/// sets up resolvers before resolution is frozen
/// </summary>
@@ -81,6 +82,7 @@ namespace Umbraco.Tests.Migrations
var foundMigrations = _migrationResolver.Migrations;
var migrationRunner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
Logger, configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
src/Umbraco.Tests/Migrations/Upgrades/BaseUpgradeTest.cs
+2
View File
@@ -59,10 +59,12 @@ namespace Umbraco.Tests.Migrations.Upgrades
}
var logger = Mock.Of<ILogger>();
var sqlHelper = Mock.Of<ISqlSyntaxProvider>();
var sql = GetSyntaxProvider();
//Setup the MigrationRunner
var migrationRunner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
logger,
configuredVersion,
src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
+3 -1
View File
@@ -20,6 +20,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
[Test, NUnit.Framework.Ignore]
public override void Can_Upgrade_From_470_To_600()
{
var sqlSyntax = Mock.Of<ISqlSyntaxProvider>();
var configuredVersion = new SemVersion(4, 11, 0);
var targetVersion = new SemVersion(6, 0, 0);
var provider = GetDatabaseProvider();
@@ -29,10 +30,11 @@ namespace Umbraco.Tests.Migrations.Upgrades
//Setup the MigrationRunner
var migrationRunner = new MigrationRunner(
Mock.Of<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
Mock.Of<ILogger>(), configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
bool upgraded = migrationRunner.Execute(db, provider, true);
bool upgraded = migrationRunner.Execute(db, provider, sqlSyntax, true);
Assert.That(upgraded, Is.True);
src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
+4 -4
View File
@@ -185,10 +185,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 contentType = MockedContentTypes.CreateTextpageContentType();
MockedContentTypes.EnsureAllIds(contentType, 8888);
@@ -360,10 +360,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.CreateSimpleContentType();
//not assigned to tab
src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
+4 -1
View File
@@ -63,7 +63,10 @@ namespace Umbraco.Tests.Persistence
//assign the db context
dbContext,
//assign the service context
new ServiceContext(repositoryFactory, new PetaPocoUnitOfWorkProvider(_logger), new FileUnitOfWorkProvider(), new PublishingStrategy(), cacheHelper, _logger, new[] { new DefaultUrlSegmentProvider() }),
new ServiceContext(repositoryFactory, new PetaPocoUnitOfWorkProvider(_logger), new FileUnitOfWorkProvider(),
new PublishingStrategy(Mock.Of<IEventMessagesFactory>(), _logger), cacheHelper, _logger,
Mock.Of<IEventMessagesFactory>(),
new[] { new DefaultUrlSegmentProvider() }),
cacheHelper,
new ProfilingLogger(_logger, Mock.Of<IProfiler>()))
{
src/Umbraco.Tests/Persistence/Mappers/PropertyGroupMapperTest.cs
+6 -6
View File
@@ -11,10 +11,10 @@ namespace Umbraco.Tests.Persistence.Mappers
public void Can_Map_Id_Property()
{
// Arrange
SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
// Act
string column = new PropertyGroupMapper().Map("Id");
string column = new PropertyGroupMapper(sqlSyntaxProvider).Map("Id");
// Assert
Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[id]"));
@@ -24,10 +24,10 @@ namespace Umbraco.Tests.Persistence.Mappers
public void Can_Map_SortOrder_Property()
{
// Arrange
SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
// Act
string column = new PropertyGroupMapper().Map("SortOrder");
string column = new PropertyGroupMapper(sqlSyntaxProvider).Map("SortOrder");
// Assert
Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[sortorder]"));
@@ -37,10 +37,10 @@ namespace Umbraco.Tests.Persistence.Mappers
public void Can_Map_Name_Property()
{
// Arrange
SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
// Act
string column = new PropertyGroupMapper().Map("Name");
string column = new PropertyGroupMapper(sqlSyntaxProvider).Map("Name");
// Assert
Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[text]"));
src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
+36 -30
View File
@@ -3,6 +3,7 @@ using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Tests.TestHelpers;
namespace Umbraco.Tests.Persistence.Querying
@@ -13,7 +14,8 @@ namespace Umbraco.Tests.Persistence.Querying
[Test]
public void Can_Verify_Base_Clause()
{
var NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType);
var nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType);
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
var expected = new Sql();
expected.Select("*")
@@ -27,13 +29,13 @@ namespace Umbraco.Tests.Persistence.Querying
var sql = new Sql();
sql.Select("*")
.From<ContentTypeTemplateDto>()
.RightJoin<ContentTypeDto>()
.On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
.InnerJoin<NodeDto>()
.On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(x => x.NodeObjectType == NodeObjectType)
.Where<ContentTypeTemplateDto>(x => x.IsDefault == true);
.From<ContentTypeTemplateDto>(sqlSyntaxProvider)
.RightJoin<ContentTypeDto>(sqlSyntaxProvider)
.On<ContentTypeDto, ContentTypeTemplateDto>(sqlSyntaxProvider, left => left.NodeId, right => right.ContentTypeNodeId)
.InnerJoin<NodeDto>(sqlSyntaxProvider)
.On<ContentTypeDto, NodeDto>(sqlSyntaxProvider, left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(sqlSyntaxProvider, x => x.NodeObjectType == nodeObjectType)
.Where<ContentTypeTemplateDto>(sqlSyntaxProvider, x => x.IsDefault == true);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
@@ -49,7 +51,8 @@ namespace Umbraco.Tests.Persistence.Querying
[Test]
public void Can_Verify_Base_Where_Clause()
{
var NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType);
var nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType);
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
var expected = new Sql();
expected.Select("*")
@@ -64,14 +67,14 @@ namespace Umbraco.Tests.Persistence.Querying
var sql = new Sql();
sql.Select("*")
.From<ContentTypeTemplateDto>()
.RightJoin<ContentTypeDto>()
.On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
.InnerJoin<NodeDto>()
.On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(x => x.NodeObjectType == NodeObjectType)
.Where<ContentTypeTemplateDto>(x => x.IsDefault)
.Where<NodeDto>(x => x.NodeId == 1050);
.From<ContentTypeTemplateDto>(sqlSyntaxProvider)
.RightJoin<ContentTypeDto>(sqlSyntaxProvider)
.On<ContentTypeDto, ContentTypeTemplateDto>(sqlSyntaxProvider, left => left.NodeId, right => right.ContentTypeNodeId)
.InnerJoin<NodeDto>(sqlSyntaxProvider)
.On<ContentTypeDto, NodeDto>(sqlSyntaxProvider, left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(sqlSyntaxProvider, x => x.NodeObjectType == nodeObjectType)
.Where<ContentTypeTemplateDto>(sqlSyntaxProvider, x => x.IsDefault)
.Where<NodeDto>(sqlSyntaxProvider, x => x.NodeId == 1050);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
@@ -87,6 +90,7 @@ namespace Umbraco.Tests.Persistence.Querying
[Test]
public void Can_Verify_PerformQuery_Clause()
{
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
var expected = new Sql();
expected.Select("*")
.From("[cmsPropertyTypeGroup]")
@@ -95,11 +99,11 @@ namespace Umbraco.Tests.Persistence.Querying
var sql = new Sql();
sql.Select("*")
.From<PropertyTypeGroupDto>()
.RightJoin<PropertyTypeDto>()
.On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
.InnerJoin<DataTypeDto>()
.On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId);
.From<PropertyTypeGroupDto>(sqlSyntaxProvider)
.RightJoin<PropertyTypeDto>(sqlSyntaxProvider)
.On<PropertyTypeGroupDto, PropertyTypeDto>(sqlSyntaxProvider, left => left.Id, right => right.PropertyTypeGroupId)
.InnerJoin<DataTypeDto>(sqlSyntaxProvider)
.On<PropertyTypeDto, DataTypeDto>(sqlSyntaxProvider, left => left.DataTypeId, right => right.DataTypeId);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
@@ -110,14 +114,15 @@ namespace Umbraco.Tests.Persistence.Querying
public void Can_Verify_AllowedContentTypeIds_Clause()
{
var expected = new Sql();
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
expected.Select("*")
.From("[cmsContentTypeAllowedContentType]")
.Where("[cmsContentTypeAllowedContentType].[Id] = @0", 1050);
var sql = new Sql();
sql.Select("*")
.From<ContentTypeAllowedContentTypeDto>()
.Where<ContentTypeAllowedContentTypeDto>(x => x.Id == 1050);
.From<ContentTypeAllowedContentTypeDto>(sqlSyntaxProvider)
.Where<ContentTypeAllowedContentTypeDto>(sqlSyntaxProvider, x => x.Id == 1050);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
@@ -134,6 +139,7 @@ namespace Umbraco.Tests.Persistence.Querying
public void Can_Verify_PropertyGroupCollection_Clause()
{
var expected = new Sql();
var sqlSyntaxProvider = new SqlCeSyntaxProvider();
expected.Select("*")
.From("[cmsPropertyTypeGroup]")
.RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
@@ -142,12 +148,12 @@ namespace Umbraco.Tests.Persistence.Querying
var sql = new Sql();
sql.Select("*")
.From<PropertyTypeGroupDto>()
.RightJoin<PropertyTypeDto>()
.On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
.InnerJoin<DataTypeDto>()
.On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
.Where<PropertyTypeDto>(x => x.ContentTypeId == 1050);
.From<PropertyTypeGroupDto>(sqlSyntaxProvider)
.RightJoin<PropertyTypeDto>(sqlSyntaxProvider)
.On<PropertyTypeGroupDto, PropertyTypeDto>(sqlSyntaxProvider, left => left.Id, right => right.PropertyTypeGroupId)
.InnerJoin<DataTypeDto>(sqlSyntaxProvider)
.On<PropertyTypeDto, DataTypeDto>(sqlSyntaxProvider, left => left.DataTypeId, right => right.DataTypeId)
.Where<PropertyTypeDto>(sqlSyntaxProvider, x => x.ContentTypeId == 1050);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+13 -14
View File
@@ -18,7 +18,6 @@ using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using umbraco.editorControls.tinyMCE3;
using umbraco.interfaces;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -50,10 +49,10 @@ namespace Umbraco.Tests.Persistence.Repositories
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository)
{
templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, templateRepository);
var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), Mock.Of<IMappingResolver>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IMappingResolver>());
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, templateRepository, Mock.Of<IMappingResolver>());
var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), Mock.Of<IMappingResolver>());
return repository;
}
@@ -452,7 +451,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
var result = repository.GetByQuery(query);
// Assert
@@ -501,7 +500,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending);
@@ -522,7 +521,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 1, 1, out totalRecords, "Name", Direction.Ascending);
@@ -543,7 +542,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 0, 2, out totalRecords, "Name", Direction.Ascending);
@@ -564,7 +563,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Descending);
@@ -585,7 +584,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, "Page 2");
@@ -606,7 +605,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Level == 2);
var query = repository.Query.Where(x => x.Level == 2);
long totalRecords;
var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, "Page");
@@ -687,7 +686,7 @@ namespace Umbraco.Tests.Persistence.Repositories
{
// Act
int level = 2;
var query = Query<IContent>.Builder.Where(x => x.Level == level);
var query = repository.Query.Where(x => x.Level == level);
var result = repository.Count(query);
// Assert
@@ -726,7 +725,7 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
// Act
var query = Query<IContent>.Builder.Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
var query = repository.Query.Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
var content = repository.GetByQuery(query).SingleOrDefault();
// Assert
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+10 -10
View File
@@ -12,7 +12,7 @@ using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Tests.TestHelpers;
@@ -42,29 +42,29 @@ namespace Umbraco.Tests.Persistence.Repositories
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
private ContentTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository);
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, templateRepository, MappingResolver);
return contentTypeRepository;
}
private MediaTypeRepository CreateMediaTypeRepository(IDatabaseUnitOfWork unitOfWork)
{
var contentTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
var contentTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver);
return contentTypeRepository;
}
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver);
}
//TODO Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id).
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// Arrange
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>()))
using (var templateRepo = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var repository = CreateRepository(unitOfWork))
{
var templates = new[]
src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
+3 -2
View File
@@ -13,6 +13,7 @@ using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
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;
@@ -47,7 +48,7 @@ namespace Umbraco.Tests.Persistence.Repositories
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IMappingResolver>());
}
[TestCase("UmbracoPreVal87-21,3,48", 3, true)]
@@ -221,7 +222,7 @@ namespace Umbraco.Tests.Persistence.Repositories
int id;
using (var repository = CreateRepository(unitOfWork))
{
var dataTypeDefinition = new DataTypeDefinition(-1, new Guid(Constants.PropertyEditors.RadioButtonList)) {Name = "test"};
var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) {Name = "test"};
repository.AddOrUpdate(dataTypeDefinition);
src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+6 -6
View File
@@ -22,12 +22,12 @@ namespace Umbraco.Tests.Persistence.Repositories
{
private DomainRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out ContentRepository contentRepository, out LanguageRepository languageRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, templateRepository, MappingResolver);
contentRepository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
languageRepository = new LanguageRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver);
var domainRepository = new DomainRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax);
var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, templateRepository, MappingResolver);
contentRepository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
languageRepository = new LanguageRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
var domainRepository = new DomainRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
return domainRepository;
}
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+3 -3
View File
@@ -35,9 +35,9 @@ namespace Umbraco.Tests.Persistence.Repositories
private MediaRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
{
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>());
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, MappingResolver);
var repository = new MediaRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
+2 -2
View File
@@ -28,12 +28,12 @@ namespace Umbraco.Tests.Persistence.Repositories
private MediaTypeRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
{
return new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
return new MediaTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
}
private EntityContainerRepository CreateContainerRepository(IDatabaseUnitOfWork unitOfWork)
{
return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax);
return new EntityContainerRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
}
[Test]
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+4 -4
View File
@@ -36,10 +36,10 @@ namespace Umbraco.Tests.Persistence.Repositories
private MemberRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MemberTypeRepository memberTypeRepository, out MemberGroupRepository memberGroupRepository)
{
memberTypeRepository = new MemberTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
memberGroupRepository = new MemberGroupRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, CacheHelper.CreateDisabledCacheHelper(), MappingResolver);
var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var repository = new MemberRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, memberTypeRepository, memberGroupRepository, tagRepo, Mock.Of<IContentSection>());
memberTypeRepository = new MemberTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
memberGroupRepository = new MemberGroupRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, DisabledCache, MappingResolver);
var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
var repository = new MemberRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, memberTypeRepository, memberGroupRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
+1 -1
View File
@@ -230,7 +230,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
private ServerRegistrationRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
{
return new ServerRegistrationRepository(unitOfWork, _staticCache, Mock.Of<ILogger>(), SqlSyntax);
return new ServerRegistrationRepository(unitOfWork, _staticCache, Logger, SqlSyntax, MappingResolver);
}
[Test]
src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+8 -8
View File
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Persistence.Repositories
private TagRepository CreateRepository(IDatabaseUnitOfWork unitOfWork)
{
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
return tagRepository;
}
@@ -1034,18 +1034,18 @@ namespace Umbraco.Tests.Persistence.Repositories
private ContentRepository CreateContentRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
private MediaRepository CreateMediaRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
{
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var repository = new MediaRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>());
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
mediaTypeRepository = new MediaTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
var repository = new MediaRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, mediaTypeRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
}
src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+4 -4
View File
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
private ITemplateRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, ITemplatesSection templatesSection = null)
{
return new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, _masterPageFileSystem, _viewsFileSystem,
return new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, _masterPageFileSystem, _viewsFileSystem,
templatesSection ?? Mock.Of<ITemplatesSection>(t => t.DefaultRenderingEngine == RenderingEngine.Mvc), MappingResolver);
}
@@ -405,9 +405,9 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var templateRepository = CreateRepository(unitOfWork))
{
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
var contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository, MappingResolver);
var contentRepo = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
var contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, templateRepository, MappingResolver);
var contentRepo = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
using (contentRepo)
{
src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+16 -16
View File
@@ -148,10 +148,10 @@ namespace Umbraco.Tests.Services
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>()))
using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
{
// Act
Stopwatch watch = Stopwatch.StartNew();
@@ -179,10 +179,10 @@ namespace Umbraco.Tests.Services
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>()))
using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
{
// Act
Stopwatch watch = Stopwatch.StartNew();
@@ -209,10 +209,10 @@ namespace Umbraco.Tests.Services
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>()))
using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
{
// Act
@@ -242,10 +242,10 @@ namespace Umbraco.Tests.Services
var provider = new PetaPocoUnitOfWorkProvider(Logger);
var unitOfWork = provider.GetUnitOfWork();
using (var tRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>()))
using (var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver))
using (var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver))
using (var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, tRepository, MappingResolver))
using (var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>(), MappingResolver))
{
// Act
src/Umbraco.Tests/Services/ContentServiceTests.cs
+5 -5
View File
@@ -1332,7 +1332,7 @@ namespace Umbraco.Tests.Services
[Test]
public void Can_Save_Lazy_Content()
{
var unitOfWork = PetaPocoUnitOfWorkProvider.CreateUnitOfWork(Mock.Of<ILogger>());
var unitOfWork = PetaPocoUnitOfWorkProvider.CreateUnitOfWork(Logger);
var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
var root = ServiceContext.ContentService.GetById(NodeDto.NodeIdSeed + 1);
@@ -1608,10 +1608,10 @@ namespace Umbraco.Tests.Services
private ContentRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
{
var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>(), MappingResolver);
var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, MappingResolver);
contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, templateRepository, MappingResolver);
var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, SqlSyntax, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>(), MappingResolver);
return repository;
}
}
src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+2 -1
View File
@@ -56,7 +56,8 @@ namespace Umbraco.Tests.Services
new PublishingStrategy(evtMsgs, Logger),
cacheHelper,
Logger,
evtMsgs);
evtMsgs,
Enumerable.Empty<IUrlSegmentProvider>());
CreateTestData();
}
src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs
+2 -1
View File
@@ -10,6 +10,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Persistence.UnitOfWork;
@@ -31,7 +32,7 @@ namespace Umbraco.Tests.Templates
{
var loggerMock = new Mock<ILogger>();
var sqlSyntaxMock = new Mock<ISqlSyntaxProvider>();
_templateRepository = new TemplateRepository(_unitOfWorkMock.Object, _cacheMock.Object, loggerMock.Object, sqlSyntaxMock.Object, _masterpageFileSystemMock.Object, _viewFileSystemMock.Object, _templateConfigMock.Object);
_templateRepository = new TemplateRepository(_unitOfWorkMock.Object, _cacheMock.Object, loggerMock.Object, sqlSyntaxMock.Object, _masterpageFileSystemMock.Object, _viewFileSystemMock.Object, _templateConfigMock.Object, Mock.Of<IMappingResolver>());
}
src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+18 -14
View File
@@ -55,7 +55,7 @@ namespace Umbraco.Tests.TestHelpers
//Used to flag if its the first test in the current fixture
private bool _isFirstTestInFixture = false;
//private ApplicationContext _appContext;
private ApplicationContext _appContext;
private string _dbPath;
//used to store (globally) the pre-built db with schema and initial data
@@ -70,16 +70,6 @@ namespace Umbraco.Tests.TestHelpers
AppDomain.CurrentDomain.SetData("DataDirectory", path);
base.Initialize();
}
protected override void ConfigureContainer()
@@ -89,6 +79,12 @@ namespace Umbraco.Tests.TestHelpers
Container.Register<ISqlSyntaxProvider, SqlCeSyntaxProvider>();
}
private CacheHelper _disabledCacheHelper;
protected CacheHelper DisabledCache
{
get { return _disabledCacheHelper ?? (_disabledCacheHelper = CacheHelper.CreateDisabledCacheHelper()); }
}
private MappingResolver _mappingResolver;
protected IMappingResolver MappingResolver
{
@@ -121,7 +117,15 @@ namespace Umbraco.Tests.TestHelpers
//assign the db context
new DatabaseContext(dbFactory, Logger, SqlSyntax, "System.Data.SqlServerCe.4.0"),
//assign the service context
new ServiceContext(repositoryFactory, new PetaPocoUnitOfWorkProvider(dbFactory), new FileUnitOfWorkProvider(), new PublishingStrategy(evtMsgs, Logger), cacheHelper, Logger, evtMsgs),
new ServiceContext(
repositoryFactory,
new PetaPocoUnitOfWorkProvider(dbFactory),
new FileUnitOfWorkProvider(),
new PublishingStrategy(evtMsgs, Logger),
cacheHelper,
Logger,
evtMsgs,
Enumerable.Empty<IUrlSegmentProvider>()),
cacheHelper,
ProfilingLogger)
{
@@ -134,7 +138,7 @@ namespace Umbraco.Tests.TestHelpers
{
//TODO: Somehow make this faster - takes 5s +
appContext.DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
_appContext.DatabaseContext.Initialize(dbFactory.ProviderName, dbFactory.ConnectionString);
CreateSqlCeDatabase();
InitializeDatabase();
@@ -270,7 +274,7 @@ namespace Umbraco.Tests.TestHelpers
var schemaHelper = new DatabaseSchemaHelper(DatabaseContext.Database, Logger, SqlSyntax);
//Create the umbraco database and its base data
schemaHelper.CreateDatabaseSchema();
schemaHelper.CreateDatabaseSchema(_appContext);
//close the connections, we're gonna read this baby in as a byte array so we don't have to re-initialize the
// damn db for each test
src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+10 -1
View File
@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using AutoMapper;
using Moq;
@@ -188,7 +189,15 @@ namespace Umbraco.Tests.TestHelpers
new DatabaseContext(new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Logger),
Logger, sqlSyntax, "System.Data.SqlServerCe.4.0"),
//assign the service context
new ServiceContext(repoFactory, new PetaPocoUnitOfWorkProvider(Logger), new FileUnitOfWorkProvider(), new PublishingStrategy(evtMsgs, Logger), CacheHelper, Logger, evtMsgs),
new ServiceContext(
repoFactory,
new PetaPocoUnitOfWorkProvider(Logger),
new FileUnitOfWorkProvider(),
new PublishingStrategy(evtMsgs, Logger),
CacheHelper,
Logger,
evtMsgs,
Enumerable.Empty<IUrlSegmentProvider>()),
CacheHelper,
ProfilingLogger)
{