lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-08 18:54:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing unit tests

Browse Source
This commit is contained in:
Sebastien Ros
2013-11-27 11:45:11 -08:00
parent 654c432365
commit 48479f3d69
4 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Tests/DataMigration/DataMigrationTests.cs
View File

@@ -34,7 +34,7 @@ namespace Orchard.Tests.DataMigration {
private ISession _session;
private ITransactionManager _transactionManager;
[TestFixtureSetUp]
[SetUp]
public void CreateDb() {
var databaseFileName = System.IO.Path.GetTempFileName();
_sessionFactory = DataUtility.CreateSessionFactory(
@@ -45,6 +45,7 @@ namespace Orchard.Tests.DataMigration {
typeof(ContentTypeRecord));
}
[TearDown]
public void InitDb() {
foreach ( var record in _repository.Fetch(m => m != null) ) {
_repository.Delete(record);

15
src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
View File

@@ -25,7 +25,7 @@ namespace Orchard.Tests.Environment.State {
builder.RegisterType<DefaultProcessingEngine>().As<IProcessingEngine>();
builder.RegisterModule(new WorkContextModule());
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterAutoMocking();
builder.RegisterAutoMocking(MockBehavior.Loose);
_container = builder.Build();
_shellContext = new ShellContext {
@@ -43,6 +43,19 @@ namespace Orchard.Tests.Environment.State {
}
[TearDown]
public void CleanTasks() {
// clear the previous values
try {
var engine = _container.Resolve<IProcessingEngine>();
if (engine != null)
while (engine.AreTasksPending()) engine.ExecuteNextTask();
}
catch {
}
}
[Test]
public void NoTasksPendingByDefault() {
var engine = _container.Resolve<IProcessingEngine>();

16
src/Orchard.Tests/Mvc/RouteCollectionPublisherTests.cs
View File

@@ -33,22 +33,6 @@ namespace Orchard.Tests.Mvc {
_container = builder.Build();
}
[Test]
public void PublisherShouldAddRoutesThenReplaceTheOnesWhichWereAdded() {
_routes.MapRoute("foo", "{controller}");
var publisher = _container.Resolve<IRoutePublisher>();
publisher.Publish(new[] { Desc("barname", "bar"), Desc("quuxname", "quux") });
Assert.That(_routes.Count(), Is.EqualTo(3));
publisher.Publish(new[] { Desc("baazname", "baaz")});
Assert.That(_routes.Count(), Is.EqualTo(2));
}
[Test]
public void RoutesCanHaveNullOrEmptyNames() {
_routes.MapRoute("foo", "{controller}");

28
src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs
View File

@@ -102,12 +102,13 @@ namespace Orchard.Tests.Mvc.Routes {
_containerB.Resolve<IRoutePublisher>().Publish(
new[] { new RouteDescriptor { Priority = 0, Route = routeB } });
Assert.That(_routes.Count(), Is.EqualTo(2));
// routes are grouped by name/priority/area
Assert.That(_routes.Count(), Is.EqualTo(1));
_containerA.Resolve<IRoutePublisher>().Publish(
new[] { new RouteDescriptor { Priority = 0, Route = routeC } });
Assert.That(_routes.Count(), Is.EqualTo(2));
Assert.That(_routes.Count(), Is.EqualTo(1));
_containerB.Resolve<IRoutePublisher>().Publish(
new[] {
@@ -115,7 +116,28 @@ namespace Orchard.Tests.Mvc.Routes {
new RouteDescriptor {Priority = 0, Route = routeB},
});
Assert.That(_routes.Count(), Is.EqualTo(3));
Assert.That(_routes.Count(), Is.EqualTo(1));
}
[Test]
public void RoutePublisherGroupsShellRoutesByName() {
var routeA = new Route("foo", new MvcRouteHandler());
var routeB = new Route("bar", new MvcRouteHandler());
var routeC = new Route("quux", new MvcRouteHandler());
_containerA.Resolve<IRoutePublisher>().Publish(
new[] { new RouteDescriptor { Name = "1", Priority = 0, Route = routeA } });
_containerA.Resolve<IRoutePublisher>().Publish(
new[] { new RouteDescriptor { Name = "2", Priority = 0, Route = routeB } });
Assert.That(_routes.Count(), Is.EqualTo(2));
_containerB.Resolve<IRoutePublisher>().Publish(
new[] { new RouteDescriptor { Name = "2", Priority = 0, Route = routeC } });
Assert.That(_routes.Count(), Is.EqualTo(2));
}
[Test]