lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 12:29:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing unit tests

Browse Source
This commit is contained in:
Sebastien Ros
2015-07-31 15:41:38 -07:00
parent 637cea6a02
commit a9a1413331
3 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
View File

@@ -74,7 +74,6 @@ namespace Orchard.Tests.Modules.Users.Controllers {
builder.RegisterType<UserPartHandler>().As<IContentHandler>(); builder.RegisterType<UserPartHandler>().As<IContentHandler>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>(); builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf(); builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>(); builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>(); builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();

23
src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
View File

@@ -30,6 +30,7 @@ using Orchard.UI.PageClass;
using Orchard.Users.Handlers; using Orchard.Users.Handlers;
using Orchard.Users.Models; using Orchard.Users.Models;
using Orchard.Users.Services; using Orchard.Users.Services;
using Orchard.Tests.ContentManagement;
namespace Orchard.Tests.Modules.Users.Services { namespace Orchard.Tests.Modules.Users.Services {
[TestFixture] [TestFixture]
@@ -39,19 +40,6 @@ namespace Orchard.Tests.Modules.Users.Services {
private ISession _session; private ISession _session;
private IContainer _container; private IContainer _container;
public class TestSessionLocator : ISessionLocator {
private readonly ISession _session;
public TestSessionLocator(ISession session) {
_session = session;
}
public ISession For(Type entityType) {
return _session;
}
}
[TestFixtureSetUp] [TestFixtureSetUp]
public void InitFixture() { public void InitFixture() {
var databaseFileName = System.IO.Path.GetTempFileName(); var databaseFileName = System.IO.Path.GetTempFileName();
@@ -94,11 +82,18 @@ namespace Orchard.Tests.Modules.Users.Services {
builder.RegisterType<InfosetHandler>().As<IContentHandler>(); builder.RegisterType<InfosetHandler>().As<IContentHandler>();
_session = _sessionFactory.OpenSession(); _session = _sessionFactory.OpenSession();
builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>(); builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
_container = builder.Build(); _container = builder.Build();
_membershipService = _container.Resolve<IMembershipService>(); _membershipService = _container.Resolve<IMembershipService>();
} }
[TearDown]
public void Cleanup() {
if (_container != null)
_container.Dispose();
}
[Test] [Test]
public void CreateUserShouldAllocateModelAndCreateRecords() { public void CreateUserShouldAllocateModelAndCreateRecords() {
var user = _membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true)); var user = _membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));

21
src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs
View File

@@ -34,6 +34,7 @@ using Orchard.Users.Services;
using Orchard.Services; using Orchard.Services;
using Orchard.Tests.Messaging; using Orchard.Tests.Messaging;
using Orchard.Tests.Modules.Stubs; using Orchard.Tests.Modules.Stubs;
using Orchard.Tests.ContentManagement;
namespace Orchard.Tests.Modules.Users.Services { namespace Orchard.Tests.Modules.Users.Services {
[TestFixture] [TestFixture]
@@ -47,19 +48,6 @@ namespace Orchard.Tests.Modules.Users.Services {
private IContainer _container; private IContainer _container;
private CultureInfo _currentCulture; private CultureInfo _currentCulture;
public class TestSessionLocator : ISessionLocator {
private readonly ISession _session;
public TestSessionLocator(ISession session) {
_session = session;
}
public ISession For(Type entityType) {
return _session;
}
}
[TestFixtureSetUp] [TestFixtureSetUp]
public void InitFixture() { public void InitFixture() {
_currentCulture = Thread.CurrentThread.CurrentCulture; _currentCulture = Thread.CurrentThread.CurrentCulture;
@@ -109,9 +97,8 @@ namespace Orchard.Tests.Modules.Users.Services {
builder.RegisterInstance(ShellSettingsUtility.CreateEncryptionEnabled()); builder.RegisterInstance(ShellSettingsUtility.CreateEncryptionEnabled());
_session = _sessionFactory.OpenSession(); _session = _sessionFactory.OpenSession();
_session.BeginTransaction(); builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
_container = builder.Build(); _container = builder.Build();
_membershipService = _container.Resolve<IMembershipService>(); _membershipService = _container.Resolve<IMembershipService>();
_userService = _container.Resolve<IUserService>(); _userService = _container.Resolve<IUserService>();
@@ -119,8 +106,8 @@ namespace Orchard.Tests.Modules.Users.Services {
[TearDown] [TearDown]
public void TearDown() { public void TearDown() {
_session.Transaction.Commit(); if (_container != null)
_session.Transaction.Dispose(); _container.Dispose();
} }
[Test] [Test]