From 28cc29c0edeaea3167a0250c19ba6357ed112073 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 22 Apr 2010 15:49:56 -0700 Subject: [PATCH] - Removing some long ignored test cases. --HG-- branch : dev --- .../Providers/CommonAspectProviderTests.cs | 14 --- .../Orchard.Tests.Modules.csproj | 1 - .../Roles/Services/RoleServiceTests.cs | 14 --- .../Setup/SetupControllerTests.cs | 106 ------------------ src/Orchard.Tests/Services/ClockTests.cs | 13 --- 5 files changed, 148 deletions(-) delete mode 100644 src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs index bed6e4d2d..f32b0b9ec 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs @@ -72,20 +72,6 @@ namespace Orchard.Core.Tests.Common.Providers { Assert.That(item.Record.OwnerId, Is.EqualTo(0)); } - [Test,Ignore("This testing is still being worked out")] - public void OwnerShouldBeAuthenticatedUserIfAvailable() { - var contentManager = _container.Resolve(); - - var user = contentManager.New("user"); - _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); - - var item = contentManager.Create("test-item", init => { }); - - ClearSession(); - - Assert.That(item.Record.OwnerId, Is.EqualTo(6655321)); - } - [Test] public void PublishingShouldSetPublishUtc() { var contentManager = _container.Resolve(); diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index cedd3ea91..5e94b8fba 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -87,7 +87,6 @@ - diff --git a/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs b/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs index 8fb1804cf..07b7488ec 100644 --- a/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs +++ b/src/Orchard.Tests.Modules/Roles/Services/RoleServiceTests.cs @@ -34,19 +34,5 @@ namespace Orchard.Tests.Modules.Roles.Services { Assert.That(roles, Has.Some.Property("Name").EqualTo("two")); Assert.That(roles, Has.Some.Property("Name").EqualTo("three")); } - - [Test, Ignore("Permissions should be created first it appears?")] - public void PermissionRecordsShouldBeCreatedOnDemand() { - var service = _container.Resolve(); - service.CreateRole("one"); - service.CreatePermissionForRole("one", "foo"); - service.CreatePermissionForRole("one", "bar"); - ClearSession(); - - var one = service.GetRoles().Single(x => x.Name == "one"); - Assert.That(one.RolesPermissions, Has.Count.EqualTo(2)); - Assert.That(one.RolesPermissions.Select(x => x.Permission.Name), Has.Some.EqualTo("foo")); - Assert.That(one.RolesPermissions.Select(x => x.Permission.Name), Has.Some.EqualTo("bar")); - } } } diff --git a/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs b/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs deleted file mode 100644 index 5dcdf2a16..000000000 --- a/src/Orchard.Tests.Modules/Setup/SetupControllerTests.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System.IO; -using System.Linq; -using System.Web.Mvc; -using System.Web.Routing; -using Autofac; -using NUnit.Framework; -using Orchard.Environment; -using Orchard.Environment.AutofacUtil; -using Orchard.Environment.Configuration; -using Orchard.Setup.Controllers; -using Orchard.Setup.ViewModels; -using Orchard.UI.Notify; - -namespace Orchard.Tests.Modules.Setup { - [TestFixture, Ignore("this can't be made to work")] - public class SetupControllerTests { - private string _tempFolder; - private ILifetimeScope _container; - - [SetUp] - public void Init() { - //_tempFolder = Path.GetTempFileName(); - //File.Delete(_tempFolder); - //Directory.CreateDirectory(_tempFolder); - - //var hostContainer = OrchardStarter.CreateHostContainer(builder => { - // builder.RegisterInstance(new ControllerBuilder()); - // builder.RegisterInstance(new ViewEngineCollection { new WebFormViewEngine() }); - // builder.RegisterInstance(new RouteCollection()); - // builder.RegisterInstance(new ModelBinderDictionary()); - //}); - - //hostContainer.Resolve().SetBasePath(_tempFolder); - - //var host = (DefaultOrchardHost)hostContainer.Resolve(); - //_container = host.CreateShellContainer_Obsolete().BeginLifetimeScope(); - //var updater = new ContainerUpdater(); - //updater.RegisterType(); - //updater.Update(_container); - - //var builder = new ContainerBuilder(); - //builder.Register(); - //builder.Register().As(); - //builder.Register().As(); - //builder.Register().As(); - //builder.Register().As(); - //builder.Register().As(); - //_container = builder.Build(); - } - - private string GetMessages() { - var notifier = _container.Resolve(); - return notifier.List().Aggregate("", (a, b) => a + b.Message.ToString()); - } - - private SetupViewModel GetTestSetupModel() { - return new SetupViewModel { - AdminUsername = "test1", - AdminPassword = "test2", - DatabaseOptions = true, - SiteName = "test3" - }; - } - - [Test] - public void IndexNormallyReturnsWithDefaultAdminUsername() { - var controller = _container.Resolve(); - var result = controller.Index(); - - Assert.That(result, Is.Not.Null); - Assert.That(result, Is.TypeOf()); - - var viewResult = (ViewResult)result; - Assert.That(viewResult.ViewData.Model, Is.TypeOf()); - - var model2 = (SetupViewModel)viewResult.ViewData.Model; - Assert.That(model2.AdminUsername, Is.EqualTo("admin")); - } - - [Test] - public void SetupShouldCreateShellSettingsFile() { - var model = GetTestSetupModel(); - var controller = _container.Resolve(); - var result = controller.IndexPOST(model); - - Assert.That(GetMessages(), Is.StringContaining("Setup succeeded")); - Assert.That(result, Is.Not.Null); - Assert.That(result, Is.TypeOf()); - Assert.That(File.Exists(Path.Combine(_tempFolder, "Sites\\default.txt"))); - } - - [Test] - public void BuiltinDatabaseShouldCreateSQLiteFile() { - var model = GetTestSetupModel(); - var controller = _container.Resolve(); - var result = controller.IndexPOST(model); - - Assert.That(GetMessages(), Is.StringContaining("Setup succeeded")); - Assert.That(result, Is.Not.Null); - Assert.That(result, Is.TypeOf()); - Assert.That(File.Exists(Path.Combine(_tempFolder, "Sites\\default\\orchard.db"))); - } - - - } -} diff --git a/src/Orchard.Tests/Services/ClockTests.cs b/src/Orchard.Tests/Services/ClockTests.cs index ca068b98e..34aa1926b 100644 --- a/src/Orchard.Tests/Services/ClockTests.cs +++ b/src/Orchard.Tests/Services/ClockTests.cs @@ -11,19 +11,6 @@ namespace Orchard.Tests.Services { [TestFixture] public class ClockTests { - [Test, Ignore("At the moment the default clock is using DateTime.Now until a user-time-zone corrected display is in effect.")] - public void DefaultClockShouldComeFromSystemUtc() { - IClock clock = new Clock(); - var before = DateTime.UtcNow; - Thread.Sleep(2); - var mark = clock.UtcNow; - Thread.Sleep(2); - var after = DateTime.UtcNow; - - Assert.That(mark.Kind, Is.EqualTo(DateTimeKind.Utc)); - Assert.That(mark, Is.InRange(before, after)); - } - [Test] public void StubClockShouldComeFromSystemUtcAndDoesNotComeFromSystemTime() { var clock = new StubClock();