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

Moving Orchard.Framework.Tests back into a runnable state

Browse Source 
See #if REFACTORING in code for blocks that referenced obsolete BaseViewModel
This preprocessor symbol will not be present when this stage is complete

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-09-01 14:33:02 -07:00
parent 7dd863624a
commit b85a6ed122
16 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Orchard.Tests/Data/RepositoryTests.cs
View File

@@ -200,40 +200,6 @@ namespace Orchard.Tests.Data {
Assert.That(two.Name, Is.EqualTo("two"));
}
[Test]
public void TransactionShouldCallActionAndCommitWhenSuccessful() {
CreateThreeFoos();
_fooRepos.Transaction(() => { _fooRepos.Get(f => f.Name == "one").Name = "uno"; });
// need to evict all entities from session - otherwise modified class instances are selected
_session.Clear();
var foos = _fooRepos.Fetch(f => f.Name == "one" || f.Name == "uno");
Assert.That(foos.Count(), Is.EqualTo(1));
Assert.That(foos, Has.Some.Property("Name").EqualTo("uno"));
Assert.That(foos, Has.None.Property("Name").EqualTo("one"));
}
[Test]
public void ExceptionsShouldRollbackTransactionAndRethrowOutOfMethod() {
CreateThreeFoos();
try {
_fooRepos.Transaction(() => {
_fooRepos.Get(f => f.Name == "one").Name = "uno";
throw new ApplicationException("boom");
});
}
catch (Exception ex) {
Assert.That(ex.Message, Is.EqualTo("boom"));
}
// need to evict all entities from session - otherwise modified class instances are selected
_session.Clear();
var foos = _fooRepos.Fetch(f => f.Name == "one" || f.Name == "uno");
Assert.That(foos.Count(), Is.EqualTo(1));
Assert.That(foos, Has.None.Property("Name").EqualTo("uno"));
Assert.That(foos, Has.Some.Property("Name").EqualTo("one"));
}
}
}

5
src/Orchard.Tests/DataMigration/SchemaCommandGeneratorTests.cs
View File

@@ -1,4 +1,6 @@
using System;
#if REFACTORING
#error This must move to the Modules tests to accomodateOrchard.DevTools assembly reference
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Data;
@@ -274,3 +276,4 @@ features:
}
}
}
#endif

2
src/Orchard.Tests/DisplayManagement/Descriptors/ShapeAttributeBindingStrategyTests.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Routing;
using Autofac;
using Moq;
using NUnit.Framework;
@@ -21,6 +22,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
_testFeature = new FeatureDescriptor { Name = "Testing", Extension = new ExtensionDescriptor { Name = "Testing" } };
builder.RegisterType<ShapeAttributeBindingStrategy>().As<IShapeDescriptorBindingStrategy>();
builder.RegisterInstance(new TestProvider()).WithMetadata("Feature", _testFeature);
builder.RegisterInstance(new RouteCollection());
builder.RegisterModule(new ShapeAttributeBindingModule());
}

2
src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
using Moq;
using NUnit.Framework;
@@ -31,6 +32,7 @@ namespace Orchard.Tests.DisplayManagement {
builder.RegisterType<ShapeHelperFactory>().As<IShapeHelperFactory>();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<SimpleShapes>();
builder.RegisterInstance(new RouteCollection());
builder.RegisterAutoMocking(MockBehavior.Loose);
_container = builder.Build();
_container.Resolve<Mock<IOrchardHostContainer>>()

8
src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
View File

@@ -142,14 +142,6 @@ namespace Orchard.Tests.Environment {
}
}
[Test]
public void HostShouldSetControllerFactory() {
var host = _lifetime.Resolve<IOrchardHost>();
Assert.That(_controllerBuilder.GetControllerFactory(), Is.TypeOf<DefaultControllerFactory>());
host.Initialize();
Assert.That(_controllerBuilder.GetControllerFactory(), Is.TypeOf<OrchardControllerFactory>());
}
[Test]

8
src/Orchard.Tests/Orchard.Framework.Tests.csproj
View File

@@ -268,14 +268,6 @@
<Compile Include="Utility\ReflectTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Orchard.Web\Modules\Orchard.DevTools\Orchard.DevTools.csproj">
<Project>{67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890}</Project>
<Name>Orchard.DevTools</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Web\Modules\Orchard.Users\Orchard.Users.csproj">
<Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
<Name>Orchard.Users</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name>

3
src/Orchard.Tests/UI/Navigation/MenuFilterTests.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.Tests.UI.Navigation {
Assert.That(main.Count(), Is.EqualTo(1));
}
#if REFACTORING
[Test]
public void MainMenuShouldBeCalledNormally() {
Mock<INavigationManager> navigationManager = GetNavigationManager();
@@ -83,6 +83,7 @@ namespace Orchard.Tests.UI.Navigation {
Assert.That(viewModel.Menu, Is.Not.Null);
Assert.That(viewModel.Menu.Single().Text, Is.SameAs("The Admin Menu"));
}
#endif
}

3
src/Orchard.Tests/UI/Notify/NotifyFilterTests.cs
View File

@@ -58,6 +58,8 @@ namespace Orchard.Tests.UI.Notify {
Assert.That(executedContext.Controller.TempData["messages"], Is.StringContaining("dont-destroy"));
}
#if REFACTORING
[Test]
public void TempDataBuildsMessagesWhenResultExecutingIsBaseViewModel() {
var sink = new Notifier();
@@ -82,5 +84,6 @@ namespace Orchard.Tests.UI.Notify {
Assert.That(model.Messages, Has.Some.Property("Message").EqualTo(T("dont-destroy")));
Assert.That(model.Messages, Has.Some.Property("Message").EqualTo(T("Working")));
}
#endif
}
}

9
src/Orchard/DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeBindingStrategy.cs
View File

@@ -77,11 +77,11 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeAttributeStrategy {
return Arguments.From(attributes.Values, attributes.Keys);
}
// meh
// meh--
if (parameter.Name == "Html") {
return new HtmlHelper(
displayContext.ViewContext,
new ViewDataContainer { ViewData = displayContext.ViewContext.ViewData },
displayContext.ViewDataContainer,
_routeCollection);
}
@@ -90,11 +90,6 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeAttributeStrategy {
return converter.Invoke((object)result);
}
// ++meh
class ViewDataContainer : IViewDataContainer {
public ViewDataDictionary ViewData { get; set; }
}
static readonly ConcurrentDictionary<Type, Func<object, object>> _converters =
new ConcurrentDictionary<Type, Func<object, object>>();

2
src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
View File

@@ -445,12 +445,14 @@ namespace Orchard.Mvc.Html {
}
private static void AddRenderActionHelper(this HtmlHelper html, string location, string actionName, string controllerName, RouteValueDictionary routeValues) {
#if REFACTORING
// Retrieve the "BaseViewModel" for zones if we have one
var baseViewModel = BaseViewModel.From(html.ViewData);
if (baseViewModel == null)
return;
baseViewModel.Zones.AddRenderAction(location, actionName, controllerName, routeValues);
#endif
}
#endregion

4
src/Orchard/Mvc/ViewEngines/LayoutView.cs
View File

@@ -40,10 +40,14 @@ namespace Orchard.Mvc.ViewEngines {
}
private static ViewDataDictionary CoerceViewData(ViewDataDictionary dictionary) {
#if REFACTORING
if (dictionary.Model is BaseViewModel)
return dictionary;
return new ViewDataDictionary<BaseViewModel>(BaseViewModel.From(dictionary));
#else
return null;
#endif
}

2
src/Orchard/Security/SecurityFilter.cs
View File

@@ -17,12 +17,14 @@ namespace Orchard.Security {
public ILogger Logger { get; set; }
public void OnResultExecuting(ResultExecutingContext filterContext) {
#if REFACTORING
var baseViewModel = BaseViewModel.From(filterContext.Result);
if (baseViewModel == null)
return;
if (baseViewModel.CurrentUser == null)
baseViewModel.CurrentUser = _authenticationService.GetAuthenticatedUser();
#endif
}
public void OnResultExecuted(ResultExecutedContext filterContext) {

2
src/Orchard/Themes/ThemeFilter.cs
View File

@@ -19,6 +19,7 @@ namespace Orchard.Themes {
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
#if REFACTORING
var viewResult = filterContext.Result as ViewResult;
if (viewResult == null)
return;
@@ -28,6 +29,7 @@ namespace Orchard.Themes {
return;
Apply(filterContext.RequestContext);
#endif
}
public void OnResultExecuted(ResultExecutedContext filterContext) {

2
src/Orchard/UI/Navigation/MenuFilter.cs
View File

@@ -14,6 +14,7 @@ namespace Orchard.UI.Navigation {
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
#if REFACTORING
var baseViewModel = BaseViewModel.From(filterContext.Result);
if (baseViewModel == null)
return;
@@ -23,6 +24,7 @@ namespace Orchard.UI.Navigation {
menuName = "admin";
baseViewModel.Menu = _navigationManager.BuildMenu(menuName);
#endif
}
public void OnResultExecuted(ResultExecutedContext filterContext) {

2
src/Orchard/UI/Notify/NotifyFilter.cs
View File

@@ -47,6 +47,7 @@ namespace Orchard.UI.Notify {
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
#if REFACTORING
var viewResult = filterContext.Result as ViewResultBase;
// if it's not a view result, a redirect for example
@@ -82,6 +83,7 @@ namespace Orchard.UI.Notify {
baseViewModel.Messages = baseViewModel.Messages == null ? messageEntries : baseViewModel.Messages.Union(messageEntries).ToList();
baseViewModel.Zones.AddRenderPartial("content:before", "Messages", baseViewModel.Messages);
#endif
}
public void OnResultExecuted(ResultExecutedContext filterContext) {

2
src/Orchard/UI/Resources/ResourceFilter.cs
View File

@@ -5,6 +5,7 @@ using Orchard.Mvc.ViewEngines;
using Orchard.Mvc.ViewModels;
namespace Orchard.UI.Resources {
#if REFACTORING
public class ResourceFilter : FilterProvider, IResultFilter {
private readonly IResourceManager _resourceManager;
@@ -34,4 +35,5 @@ namespace Orchard.UI.Resources {
public void OnResultExecuted(ResultExecutedContext filterContext) {
}
}
#endif
}