diff --git a/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs index d66df6694..7d9a43948 100644 --- a/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs +++ b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs @@ -9,12 +9,14 @@ using Orchard.Commands; using Orchard.Data; using Orchard.Data.Migration.Generator; using Orchard.Data.Providers; +using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.Environment.ShellBuilders; using Orchard.Environment.ShellBuilders.Models; using Orchard.FileSystems.AppData; using Orchard.Localization; +using Orchard.Tests.Environment; using Orchard.Tests.FileSystems.AppData; using Orchard.Tests.Stubs; @@ -49,6 +51,7 @@ namespace Orchard.Tests.Modules.CodeGeneration.Commands { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); _container = builder.Build(); _extensionManager = _container.Resolve(); diff --git a/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs b/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs index 0bc220b34..0477f9cd1 100644 --- a/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs +++ b/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs @@ -32,6 +32,8 @@ using Orchard.Tests.FileSystems.AppData; using Orchard.Tests.Modules.Migrations.Orchard.Tests.DataMigration.Records; using Path = Bleroy.FluentPath.Path; using Orchard.Tests.Stubs; +using Orchard.Tests.Environment; +using Orchard.Environment; namespace Orchard.Tests.Modules.Migrations { [TestFixture] @@ -85,6 +87,7 @@ namespace Orchard.Tests.Modules.Migrations { builder.RegisterType().As(); builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); builder.RegisterType().As(); + builder.RegisterType().As(); _session = _sessionFactory.OpenSession(); builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As(); diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs index bc9e28ff7..cde43e1f3 100644 --- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs +++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs @@ -8,12 +8,14 @@ using Orchard.Data; using Orchard.Data.Migration.Interpreters; using Orchard.Data.Migration.Schema; using Orchard.Data.Providers; +using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders.Models; using Orchard.FileSystems.AppData; using Orchard.Reports.Services; using Orchard.Tests.ContentManagement; using System.IO; +using Orchard.Tests.Environment; using Orchard.Tests.FileSystems.AppData; using Orchard.Tests.Stubs; @@ -47,6 +49,7 @@ namespace Orchard.Tests.DataMigration { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As(); builder.RegisterInstance(new ShellBlueprint { Records = Enumerable.Empty() }).As(); builder.RegisterInstance(new ShellSettings { Name = "temp", DataProvider = "SqlCe", DataTablePrefix = "TEST" }).As(); diff --git a/src/Orchard.Tests/Environment/StubHostEnvironment.cs b/src/Orchard.Tests/Environment/StubHostEnvironment.cs new file mode 100644 index 000000000..bfac75427 --- /dev/null +++ b/src/Orchard.Tests/Environment/StubHostEnvironment.cs @@ -0,0 +1,9 @@ +using Orchard.Environment; + +namespace Orchard.Tests.Environment { + public class StubHostEnvironment : HostEnvironment { + public override void ResetSiteCompilation() { + + } + } +} diff --git a/src/Orchard.Tests/Logging/LoggingModuleTests.cs b/src/Orchard.Tests/Logging/LoggingModuleTests.cs index 733df6f09..810a27cdc 100644 --- a/src/Orchard.Tests/Logging/LoggingModuleTests.cs +++ b/src/Orchard.Tests/Logging/LoggingModuleTests.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Diagnostics; using Autofac; using NUnit.Framework; +using Orchard.Environment; using Orchard.Logging; +using Orchard.Tests.Environment; namespace Orchard.Tests.Logging { [TestFixture] @@ -13,6 +15,7 @@ namespace Orchard.Tests.Logging { var builder = new ContainerBuilder(); builder.RegisterModule(new LoggingModule()); builder.RegisterType(); + builder.RegisterType().As(); var container = builder.Build(); var thing = container.Resolve(); Assert.That(thing.Logger, Is.Not.Null); @@ -46,6 +49,7 @@ namespace Orchard.Tests.Logging { var builder = new ContainerBuilder(); builder.RegisterModule(new LoggingModule()); builder.RegisterType(); + builder.RegisterType().As(); var container = builder.Build(); var thing = container.Resolve(); Assert.That(thing.Logger, Is.Not.Null); diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 934b2c6e9..208366c7d 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -226,6 +226,7 @@ +