Merge branch 'hotfix/3.7.2'

Author: jbatte47

src/Patterns.Testing/Configuration/TestConfigurationSource.cs

@@ -27,6 +27,7 @@
 using System.Xml.Linq;
 
 using Patterns.Configuration;
+using Patterns.Text.RegularExpressions;
 
 namespace Patterns.Testing.Configuration
 {
@@ -37,6 +38,7 @@ namespace Patterns.Testing.Configuration
 	public class TestConfigurationSource : IConfigurationSource
 	{
 		private readonly XContainer _configXml;
+		private readonly CompiledRegex _sectionNamePattern = "[^/]+$";
 
 		/// <summary>
 		///    Initializes a new instance of the <see cref="TestConfigurationSource" /> class.
@@ -149,11 +151,11 @@ public IConfiguration OpenExeConfiguration(ConfigurationUserLevel userLevel)
 			throw new NotSupportedException();
 		}
 
-		private static ConfigurationSection DeserializeSection(XContainer xml, string name)
+		private ConfigurationSection DeserializeSection(XContainer xml, string name)
 		{
 			XElement sectionDefinition = xml.Element("configSections")
-				.Elements("section")
-				.FirstOrDefault(section => section.Attribute("name").Value == name);
+				.Descendants("section")
+				.FirstOrDefault(section => section.Attribute("name").Value == _sectionNamePattern.Match(name).Value);
 
 			if (sectionDefinition == null) return null;
 
@@ -182,7 +184,7 @@ private static ConfigurationSection DeserializeSection(XContainer xml, string na
 			var config = new TSection();
 			const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
 			MethodInfo deserializer = typeof (TSection).GetMethod("DeserializeSection", flags);
-			XElement sectionXml = xml.Element(name);
+			var sectionXml = name.Split('/').Aggregate(xml, (current, part) => current.Element(part));
 			if (sectionXml == null) return null;
 
 			try

src/Patterns/SolutionAssemblyInfo.cs

@@ -31,4 +31,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]

src/Patterns/SolutionAssemblyInfo.settings.tt

@@ -2,7 +2,7 @@
 Settings.Initialize(
 	majorNumber: 3,
 	minorNumber: 7,
-	patchNumber: 1,
+	patchNumber: 2,
 	buildNumber: null,
 	buildLevel: BuildLevels.None
 );

src/_specs/Features/Testing/Configuration/TestConfigSource.feature

@@ -3,7 +3,11 @@
 	I want to be able to inject my dependencies for configuration using test values
 	So that I can test my component logic using various configuration scenarios
 
-Scenario: GetSection (normal)
-	Given I have a new Configuration Source using the canned config called "TestConfig1"
-	When I ask for a Configuration Section named "settings" from the Configuration Source
-	Then the Configuration Section I retrieved from the Configuration Source should be the expected section
+Scenario Outline: GetSection (normal)
+	Given I have a new Configuration Source using the canned config called "<config>"
+	When I ask for a Configuration Section named "<name>" from the Configuration Source
+	Then the Configuration Section I retrieved from the Configuration Source should be the expected section
+Examples: 
+	| config      | name          |
+	| TestConfig1 | settings      |
+	| TestConfig2 | test/settings |

src/_specs/Features/Testing/Configuration/TestConfigSource.feature.cs

@@ -131,6 +131,9 @@
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TestConfig1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TestConfig1.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\TestConfig1.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+  </data>
+  <data name="TestConfig2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TestConfig2.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>

src/_specs/Properties/Resources.Designer.cs

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<configSections>
+		<section name="settings" type="Patterns.Specifications.Models.Configuration.TestConfigurationSection, _specs"/>
+		<sectionGroup name="test">
+			<section name="settings" type="Patterns.Specifications.Models.Configuration.TestConfigurationSection, _specs" />
+		</sectionGroup>
+	</configSections>
+	<settings />
+	<test>
+		<settings />
+	</test>
+</configuration>

src/_specs/Properties/Resources.resx

@@ -64,9 +64,9 @@ public void CreateSourceUsingMockedAbstraction()
 		}
 
 		[Given(@"I have a new Configuration Source using the canned config called ""(.*)""")]
-		public void CreateSourceUsingCannedConfig(string sectionName)
+		public void CreateSourceUsingCannedConfig(string configName)
 		{
-			_context.ConfigSource = new TestConfigurationSource(XElement.Parse(_resources.GetString(sectionName)));
+			_context.ConfigSource = new TestConfigurationSource(XElement.Parse(_resources.GetString(configName)));
 		}
 
 		[When(@"I ask for a Configuration Section named ""(.*)"" from the Configuration Source")]

src/_specs/Resources/TestConfig2.xml

@@ -303,6 +303,9 @@
   <ItemGroup>
     <Folder Include="Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TestConfig2.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.