Merge pull request #87 from jbatte47/release/3.9.2

binaryberserker · binaryberserker · commit af2193ebdac9 · 2013-08-14T08:31:34.000-07:00
Release/3.9.2
diff --git a/.gitignore b/.gitignore
@@ -55,7 +55,7 @@ ipch/
 
 # ReSharper is a .NET coding add-in
 _ReSharper*
-*.dotsettings
+*.dotsettings.user
 
 # NCrunch
 *.ncrunch*
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Welcome!
 Here are the highlights:
 
 * This is the official codebase used for [NuGet distributions of Patterns](https://nuget.org/packages?q=id%3A+Patterns%3B+author%3A+%22John+Batte%22).
-* Check the [official code patterns site](http://jbatte47.github.io/code-patterns/) for API documenation and additional information.
+* Check the [official code patterns site](http://jbatte47.github.io/code-patterns/) for API documentation and additional information.
 * Head over to [the wiki](https://github.com/jbatte47/code-patterns/wiki) for user-contributed content.
 * You can also check out [the license file](https://github.com/jbatte47/code-patterns/blob/master/license.txt "FreeBSD (2-Clause)") if you're wondering about that.
 
diff --git a/src/Patterns.Testing.Autofac/Moq/AutofacMoqContainer.cs b/src/Patterns.Testing.Autofac/Moq/AutofacMoqContainer.cs
@@ -29,6 +29,7 @@
 using Moq;
 
 using Patterns.Autofac;
+using Patterns.ExceptionHandling;
 using Patterns.Testing.Moq;
 
 namespace Patterns.Testing.Autofac.Moq
@@ -70,7 +71,7 @@ public AutofacMoqContainer() : this(new ContainerBuilder().Build()) {}
 		/// </returns>
 		public Mock<TService> Mock<TService>() where TService : class
 		{
-			var service = Create<TService>();
+			var service = Try.Get(() => Create<TService>());
 			var existingMock = service as IMocked<TService>;
 			if (existingMock != null) return existingMock.Mock;
 
diff --git a/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.csproj b/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.csproj
@@ -99,6 +99,10 @@
       <Project>{367EAA3A-FABB-4CFB-AF01-AD0A4F0499FD}</Project>
       <Name>Patterns.Testing</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Patterns\Patterns.csproj">
+      <Project>{2BC41806-D0BF-4993-B342-CC7A3EDDF313}</Project>
+      <Name>Patterns</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
diff --git a/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.nuspec b/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.nuspec
@@ -6,6 +6,7 @@
 		<owners>$author$</owners>
 		<projectUrl>https://github.com/jbatte47/code-patterns</projectUrl>
 		<dependencies>
+			<dependency id="Patterns" version="$version$" />
 			<dependency id="Patterns.Autofac" version="$version$" />
 			<dependency id="Patterns.Testing" version="$version$" />
 		</dependencies>
diff --git a/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.tt b/src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.tt
@@ -8,6 +8,7 @@ output extension=".nuspec" #><?xml version="1.0"?>
 		<owners>$author$</owners>
 		<projectUrl>https://github.com/jbatte47/code-patterns</projectUrl>
 		<dependencies>
+			<dependency id="Patterns" version="$version$" />
 			<dependency id="Patterns.Autofac" version="$version$" />
 			<dependency id="Patterns.Testing" version="$version$" />
 		</dependencies>
diff --git a/src/Patterns/SolutionAssemblyInfo.cs b/src/Patterns/SolutionAssemblyInfo.cs
@@ -31,4 +31,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyVersion("3.9.1")]
+[assembly: AssemblyVersion("3.9.2")]
diff --git a/src/Patterns/SolutionAssemblyInfo.settings.tt b/src/Patterns/SolutionAssemblyInfo.settings.tt
@@ -2,7 +2,7 @@
 Settings.Initialize(
 	majorNumber: 3,
 	minorNumber: 9,
-	patchNumber: 1,
+	patchNumber: 2,
 	buildNumber: null,
 	buildLevel: BuildLevels.None
 );
diff --git a/src/_specs/Features/Testing/Moq/Autofac/AutofacMoqContainer.feature b/src/_specs/Features/Testing/Moq/Autofac/AutofacMoqContainer.feature
@@ -0,0 +1,30 @@
+﻿Feature: Autofac Moq Container
+	In order to be able to easily get a mixture of mocked and registered objects
+	As a unit or integration test developer
+	I want to have a container that seamlessly blends Autofac with Moq
+
+Background: 
+	Given I have an Autofac/Moq test container
+
+Scenario: Create an unregistered object
+	When I create an object using the test container
+	Then the test container should have given me an object
+	And the object retrieved by the test container should be a mock-based type
+
+Scenario: Create a registered object
+	When I register an object with the test container
+	And I create an object using the test container
+	Then the test container should have given me an object
+	And the object retrieved by the test container should not be a mock-based type
+
+Scenario: Override a registered object
+	When I register an object with the test container
+	And I create an object using the test container
+	Then the test container should have given me an object
+	And the object retrieved by the test container should not be a mock-based type
+
+	When I create a mock of the object using the test container
+	And I create an object using the test container
+	Then the test container should have given me an object
+	And the test container should have given me a mock of the object
+	And the object retrieved by the test container should be a mock-based type
diff --git a/src/_specs/Features/Testing/Moq/Autofac/AutofacMoqContainer.feature.cs b/src/_specs/Features/Testing/Moq/Autofac/AutofacMoqContainer.feature.cs
diff --git a/src/_specs/Models/Testing/Moq/TestContainerContext.cs b/src/_specs/Models/Testing/Moq/TestContainerContext.cs
@@ -0,0 +1,11 @@
+﻿using Moq;
+
+namespace Patterns.Specifications.Models.Testing.Moq
+{
+	public class TestContainerContext
+	{
+		public TestContainerTarget Target { get; set; }
+
+		public Mock<TestContainerTarget> TargetMock { get; set; }
+	}
+}
diff --git a/src/_specs/Models/Testing/Moq/TestContainerTarget.cs b/src/_specs/Models/Testing/Moq/TestContainerTarget.cs
@@ -0,0 +1,4 @@
+﻿namespace Patterns.Specifications.Models.Testing.Moq
+{
+	public class TestContainerTarget {}
+}
diff --git a/src/_specs/Steps/Testing/Moq/Autofac/AutofacTestContainerSteps.cs b/src/_specs/Steps/Testing/Moq/Autofac/AutofacTestContainerSteps.cs
@@ -0,0 +1,26 @@
+﻿using FluentAssertions;
+
+using Patterns.Specifications.Models.Mocking;
+using Patterns.Testing.Autofac.Moq;
+
+using TechTalk.SpecFlow;
+
+namespace Patterns.Specifications.Steps.Testing.Moq.Autofac
+{
+	[Binding]
+	public class AutofacTestContainerSteps
+	{
+		private readonly MoqContext _moq;
+
+		public AutofacTestContainerSteps(MoqContext moq)
+		{
+			_moq = moq;
+		}
+
+		[Given(@"I have an Autofac/Moq test container")]
+		public void AssertMoqContainerIsAutofac()
+		{
+			_moq.Container.Should().NotBeNull().And.BeOfType<AutofacMoqContainer>();
+		}
+	}
+}
diff --git a/src/_specs/Steps/Testing/Moq/TestContainerSteps.cs b/src/_specs/Steps/Testing/Moq/TestContainerSteps.cs
@@ -0,0 +1,60 @@
+﻿using FluentAssertions;
+
+using Moq;
+
+using Patterns.Specifications.Models.Mocking;
+using Patterns.Specifications.Models.Testing.Moq;
+
+using TechTalk.SpecFlow;
+
+namespace Patterns.Specifications.Steps.Testing.Moq
+{
+	[Binding]
+	public class TestContainerSteps
+	{
+		private readonly TestContainerContext _context;
+		private readonly MoqContext _moq;
+
+		public TestContainerSteps(TestContainerContext context, MoqContext moq)
+		{
+			_context = context;
+			_moq = moq;
+		}
+
+		[When(@"I create an object using the test container")]
+		public void CreateTestContainerObject()
+		{
+			_context.Target = _moq.Container.Create<TestContainerTarget>();
+		}
+
+		[Then(@"the test container should have given me an object")]
+		public void AssertTestContainerObjectExists()
+		{
+			_context.Target.Should().NotBeNull();
+		}
+
+		[Then(@"the object retrieved by the test container should (.+)?be a mock-based type")]
+		public void AssertTestContainerObjectMockness(string notModifier)
+		{
+			_context.Target.GetType().Implements(typeof (IMocked)).Should().Be(string.IsNullOrEmpty(notModifier));
+		}
+
+		[When(@"I register an object with the test container")]
+		public void RegisterTestContainerObject()
+		{
+			_moq.Container.Update(new TestContainerTarget());
+		}
+
+		[When(@"I create a mock of the object using the test container")]
+		public void MockTestContainerObject()
+		{
+			_context.TargetMock = _moq.Container.Mock<TestContainerTarget>();
+		}
+
+		[Then(@"the test container should have given me a mock of the object")]
+		public void ThenTheTestContainerShouldHaveGivenMeAMockOfTheObject()
+		{
+			_context.TargetMock.Should().NotBeNull();
+		}
+	}
+}
diff --git a/src/_specs/_specs.csproj b/src/_specs/_specs.csproj
diff --git a/src/code-patterns-master.sln.DotSettings b/src/code-patterns-master.sln.DotSettings
