Merge branch 'feature/issue-67' into dev

Author: jbatte47

src/Patterns.Testing.Autofac/Moq/AutofacMoqContainer.cs

@@ -34,7 +34,7 @@
 namespace Patterns.Testing.Autofac.Moq
 {
 	/// <summary>
-	///    Provides a default implementation of the <see cref="IMoqContainer" /> interface.
+	///    Provides a default implementation of the <see cref="IAutofacMoqContainer" /> interface.
 	/// </summary>
 	public sealed class AutofacMoqContainer : AccessibleContainer, IAutofacMoqContainer
 	{
@@ -70,8 +70,13 @@ public AutofacMoqContainer() : this(new ContainerBuilder().Build()) {}
 		/// </returns>
 		public Mock<TService> Mock<TService>() where TService : class
 		{
-			var obj = (IMocked<TService>) Create<TService>();
-			return obj.Mock;
+			var service = Create<TService>();
+			var existingMock = service as IMocked<TService>;
+			if (existingMock != null) return existingMock.Mock;
+
+			var mock = MoqRegistrationSource.Repository.Create<TService>();
+			Update(mock.Object);
+			return mock;
 		}
 
 		/// <summary>
@@ -85,13 +90,11 @@ public Mock<TService> Mock<TService>() where TService : class
 		/// </returns>
 		public TService Create<TService>(Func<IMoqContainer, TService> activator = null) where TService : class
 		{
-			Action<ContainerBuilder> defaultRegistration = builder => builder.RegisterType<TService>()
-				.PropertiesAutowired(PropertyWiringOptions.PreserveSetValues);
-
-			Action<ContainerBuilder> activatorRegistration = builder => builder.Register(c => activator(this))
-				.PropertiesAutowired(PropertyWiringOptions.PreserveSetValues);
-
-			return ResolveOrCreate<TService>(activator == null ? defaultRegistration : activatorRegistration);
+			return ResolveOrCreate<TService>(activator == null
+				? (builder => builder.RegisterType<TService>()
+					.PropertiesAutowired(PropertyWiringOptions.PreserveSetValues))
+				: (Action<ContainerBuilder>) (builder => builder.Register(c => activator(this))
+					.PropertiesAutowired(PropertyWiringOptions.PreserveSetValues)));
 		}
 
 		/// <summary>

src/Patterns.Testing.Autofac/Moq/MoqRegistrationSource.cs

@@ -20,6 +20,14 @@ public class MoqRegistrationSource : IRegistrationSource
 			.GetMethod("CreateUsingRepository", BindingFlags.NonPublic | BindingFlags.Instance)
 			.GetGenericMethodDefinition();
 
+		/// <summary>
+		/// Gets the repository.
+		/// </summary>
+		/// <value>
+		/// The repository.
+		/// </value>
+		public static MockRepository Repository { get { return _repository; } }
+
 		/// <summary>
 		/// Retrieve registrations for an unregistered service, to be used
 		/// by the container.

src/Patterns/Patterns.csproj

@@ -85,6 +85,7 @@
     <Compile Include="Reflection\PropertyValue.cs" />
     <Compile Include="Runtime\DefaultDateTimeInfo.cs" />
     <Compile Include="Runtime\IDateTimeInfo.cs" />
+    <Compile Include="Runtime\TemporaryScope.cs" />
     <Compile Include="Runtime\TimeExtensions.cs" />
     <Compile Include="SolutionAssemblyInfo.cs">
       <AutoGen>True</AutoGen>

src/Patterns/Runtime/TemporaryScope.cs

@@ -0,0 +1,67 @@
+#region FreeBSD
+
+// Copyright (c) 2013, John Batte
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 
+//  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 
+//  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
+
+using System;
+
+namespace Patterns.Runtime
+{
+	/// <summary>
+	///    Provides a disposable scope with configurable setup and tear-down actions.
+	/// </summary>
+	public class TemporaryScope : IDisposable
+	{
+		private readonly Action _setup;
+		private readonly Action _tearDown;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TemporaryScope" /> class.
+		/// </summary>
+		/// <param name="setup">The setup.</param>
+		/// <param name="tearDown">The tear down.</param>
+		public TemporaryScope(Action setup = null, Action tearDown = null)
+		{
+			_setup = setup;
+			_tearDown = tearDown;
+
+			if (_setup != null) _setup();
+		}
+
+		/// <summary>
+		///    Disposes this scope; if a tear-down method exists, it is executed.
+		/// </summary>
+		public void Dispose()
+		{
+			if(Disposed) throw new ObjectDisposedException(GetType().Name);
+
+			if (_tearDown != null) _tearDown();
+
+			Disposed = true;
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this <see cref="TemporaryScope"/> is disposed.
+		/// </summary>
+		/// <value>
+		///   <c>true</c> if disposed; otherwise, <c>false</c>.
+		/// </value>
+		public bool Disposed { get; set; }
+	}
+}