From ee5c988981560d6d30b91af9d7d434f61fe13097 Mon Sep 17 00:00:00 2001
From: hammett <hammett@73e77b4c-caa6-f847-a29a-24ab75ae54b6>
Date: Tue, 11 Mar 2008 15:02:06 +0000
Subject: [PATCH] Simplified contextualization of a mock implementation

git-svn-id: https://svn.castleproject.org/svn/castle/trunk@4880 73e77b4c-caa6-f847-a29a-24ab75ae54b6
---
 MonoRail/Castle.MonoRail.Framework/Controller.cs   | 16 ++++++-----
 .../Test/MockEngineContext.cs                      | 32 ++++++++++++++++++++--
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/MonoRail/Castle.MonoRail.Framework/Controller.cs b/MonoRail/Castle.MonoRail.Framework/Controller.cs
index 3a669ed93..5d823c581 100644
--- a/MonoRail/Castle.MonoRail.Framework/Controller.cs
+++ b/MonoRail/Castle.MonoRail.Framework/Controller.cs
@@ -76,13 +76,6 @@ namespace Castle.MonoRail.Framework
 		{
 			this.context = context;
 			SetEngineContext(engineContext);
-			ResolveLayout();
-			CreateAndInitializeHelpers();
-			CreateFiltersDescriptors();
-			ProcessScaffoldIfAvailable();
-			ActionProviderUtil.RegisterActions(engineContext, this, context);
-			renderingSupport = new RenderingSupport(context, engineContext);
-			Initialize();
 			isContextualized = true;
 		}
 
@@ -104,6 +97,15 @@ namespace Castle.MonoRail.Framework
 			{
 				Contextualize(engineContext, context);
 			}
+
+			ResolveLayout();
+			CreateAndInitializeHelpers();
+			CreateFiltersDescriptors();
+			ProcessScaffoldIfAvailable();
+			ActionProviderUtil.RegisterActions(engineContext, this, context);
+			renderingSupport = new RenderingSupport(context, engineContext);
+			Initialize();
+
 			RunActionAndRenderView();
 		}
 		
diff --git a/MonoRail/Castle.MonoRail.Framework/Test/MockEngineContext.cs b/MonoRail/Castle.MonoRail.Framework/Test/MockEngineContext.cs
index 9bdcd92ae..5a0749bc4 100644
--- a/MonoRail/Castle.MonoRail.Framework/Test/MockEngineContext.cs
+++ b/MonoRail/Castle.MonoRail.Framework/Test/MockEngineContext.cs
@@ -28,11 +28,11 @@ namespace Castle.MonoRail.Framework.Test
 	/// </summary>
 	public class MockEngineContext : AbstractServiceContainer, IEngineContext
 	{
-		private readonly IMockRequest request;
-		private readonly IMockResponse response;
 		private readonly IDictionary contextItems = new HybridDictionary(true);
 		private readonly List<RenderedEmailTemplate> renderedEmailTemplates = new List<RenderedEmailTemplate>();
 		private readonly List<Message> messagesSent = new List<Message>();
+		private IMockRequest request;
+		private IMockResponse response;
 		private IServerUtility serverUtility = new MockServerUtility();
 		private IPrincipal currentUser;
 		private IDictionary session = new HybridDictionary(true);
@@ -47,6 +47,14 @@ namespace Castle.MonoRail.Framework.Test
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MockEngineContext"/> class.
 		/// </summary>
+		public MockEngineContext()
+			: this(new MockRequest(), new MockResponse(), new MockServices(), new UrlInfo("area", "home", "index"))
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MockEngineContext"/> class.
+		/// </summary>
 		/// <param name="request">The request.</param>
 		/// <param name="response">The response.</param>
 		/// <param name="services">The services.</param>
@@ -66,6 +74,26 @@ namespace Castle.MonoRail.Framework.Test
 		}
 
 		/// <summary>
+		/// Gets or sets the mock request.
+		/// </summary>
+		/// <value>The mock request.</value>
+		public IMockRequest MockRequest
+		{
+			get { return request; }
+			set { request = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the mock response.
+		/// </summary>
+		/// <value>The mock response.</value>
+		public IMockResponse MockResponse
+		{
+			get { return response; }
+			set { response = value; }
+		}
+
+		/// <summary>
 		/// Gets the underlying context of the API being used.
 		/// </summary>
 		/// <value></value>
-- 
2.11.4.GIT