diff --git a/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs index 9a5000ceb..d56638e13 100644 --- a/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs +++ b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs @@ -46,6 +46,7 @@ namespace Orchard.Tests.Modules.CodeGeneration.Commands { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs b/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs index 5e62bac6f..ba6df1dda 100644 --- a/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs +++ b/src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs @@ -81,6 +81,7 @@ namespace Orchard.Tests.Modules.Migrations { builder.RegisterInstance(manager).As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterInstance(_folders).As(); builder.RegisterType().As(); diff --git a/src/Orchard.Tests/Data/RepositoryTests.cs b/src/Orchard.Tests/Data/RepositoryTests.cs index 5c92b5021..ed6ca0db5 100644 --- a/src/Orchard.Tests/Data/RepositoryTests.cs +++ b/src/Orchard.Tests/Data/RepositoryTests.cs @@ -116,25 +116,6 @@ namespace Orchard.Tests.Data { Assert.That(foos.Skip(1).First().Name, Is.EqualTo("two")); } - [Test] - public void LinqOrderByCanBeUsedToControlResultsBug() { - CreateThreeFoos(); - - // If look at the "LinqOrderByCanBeUsedToControlResults", you will see this query - // works fine is the static type of "foos" is "IEnumerable"... - IOrderedQueryable foos = - from f in _fooRepos.Table - where f.Name == "two" || f.Name == "three" - orderby f.Name, f.Id ascending - select f; - - Assert.That(foos.Count(), Is.EqualTo(2)); - Assert.That(foos.First().Name, Is.EqualTo("three")); - - // Looks like a bug in NHib implementation of IOrderedQueryable - Assert.Throws(() => Assert.That(foos.Skip(1).First().Name, Is.EqualTo("two"))); - } - [Test] public void LinqOrderByCanBeUsedToControlResults() { CreateThreeFoos(); diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs index d54d02dd1..9cb33357c 100644 --- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs +++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs @@ -49,6 +49,7 @@ namespace Orchard.Tests.DataMigration { builder.RegisterType().As(); 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(); diff --git a/src/Orchard.Tests/DataUtility.cs b/src/Orchard.Tests/DataUtility.cs index 6b61a46b2..0288fcf85 100644 --- a/src/Orchard.Tests/DataUtility.cs +++ b/src/Orchard.Tests/DataUtility.cs @@ -12,7 +12,7 @@ using NHibernate.Tool.hbm2ddl; using Orchard.Data; using Orchard.Data.Providers; using Orchard.Environment.ShellBuilders.Models; -using MsSqlCeConfiguration = FluentNHibernate.Cfg.Db.MsSqlCeConfiguration; +using MsSqlCeConfiguration = Orchard.Data.Providers.MsSqlCeConfiguration; namespace Orchard.Tests { public static class DataUtility { diff --git a/src/Orchard.Tests/FluentDbTests.cs b/src/Orchard.Tests/FluentDbTests.cs index 7697be8f8..4a516b8f9 100644 --- a/src/Orchard.Tests/FluentDbTests.cs +++ b/src/Orchard.Tests/FluentDbTests.cs @@ -11,7 +11,7 @@ using NHibernate.Tool.hbm2ddl; using NUnit.Framework; using Orchard.Data.Providers; using Orchard.Tests.Records; -using MsSqlCeConfiguration = FluentNHibernate.Cfg.Db.MsSqlCeConfiguration; +using MsSqlCeConfiguration = Orchard.Data.Providers.MsSqlCeConfiguration; namespace Orchard.Tests { [TestFixture]