[Nhibernate-commit] SF.net SVN: nhibernate:[5657] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5657
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5657&view=rev
Author:   fabiomaulo
Date:     2011-04-10 20:43:13 +0000 (Sun, 10 Apr 2011)

Log Message:
-----------
SimpleModelInspector with default pattern to discover Dictionaries properties

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/DictionaryCollectionTests.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 20:35:45 UTC (rev 5656)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 20:43:13 UTC (rev 5657)
@@ -49,10 +49,24 @@
 			isSet = (m, declared) => declared || MatchCollection(m, MatchSetMember);
 			isArray = (m, declared) => declared;
 			isBag = (m, declared) => declared || MatchCollection(m, MatchBagMember);
-			isDictionary = (m, declared) => declared;
+			isDictionary = (m, declared) => declared || MatchCollection(m, MatchDictionaryMember);
 			isList = (m, declared) => declared;
 		}
 
+		protected bool MatchDictionaryMember(MemberInfo subject)
+		{
+			System.Type memberType = subject.GetPropertyOrFieldType();
+			if (typeof(System.Collections.IDictionary).IsAssignableFrom(memberType))
+			{
+				return true;
+			}
+			if (memberType.IsGenericType)
+			{
+				return memberType.GetGenericIntercafesTypeDefinitions().Contains(typeof(IDictionary<,>));
+			}
+			return false;
+		}
+
 		protected bool MatchBagMember(MemberInfo subject)
 		{
 			System.Type memberType = subject.GetPropertyOrFieldType();

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/DictionaryCollectionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/DictionaryCollectionTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/DictionaryCollectionTests.cs	2011-04-10 20:43:13 UTC (rev 5657)
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Reflection;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MixAutomapping
+{
+	public class DictionaryCollectionTests
+	{
+		private class Entity
+		{
+			private ICollection<string> others;
+			private IDictionary<string, string> emails;
+			public IDictionary<string, string> NickNames { get; set; }
+
+			public ICollection<KeyValuePair<string, string>> Emails
+			{
+				get { return emails; }
+			}
+
+			public ICollection<string> Others
+			{
+				get { return others; }
+			}
+		}
+
+		[Test]
+		public void MatchWithDictionaryProperty()
+		{
+			var mi = typeof(Entity).GetProperty("NickNames");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsDictionary(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void MatchWithDictionaryField()
+		{
+			var mi = typeof(Entity).GetField("emails", BindingFlags.NonPublic | BindingFlags.Instance);
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsDictionary(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void MatchWithCollectionPropertyAndDictionaryField()
+		{
+			var mi = typeof(Entity).GetProperty("Emails");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsDictionary(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void NotMatchWithCollectionField()
+		{
+			var mi = typeof(Entity).GetField("others", BindingFlags.NonPublic | BindingFlags.Instance);
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsDictionary(mi).Should().Be.False();
+		}
+
+		[Test]
+		public void NotMatchWithCollectionProperty()
+		{
+			var mi = typeof(Entity).GetProperty("Others");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsDictionary(mi).Should().Be.False();
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-10 20:35:45 UTC (rev 5656)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-10 20:43:13 UTC (rev 5657)
@@ -543,6 +543,7 @@
     <Compile Include="MappingByCode\MappersTests\SubclassMapperWithJoinPropertiesTest.cs" />
     <Compile Include="MappingByCode\MixAutomapping\BagCollectionTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\ComponentsTests.cs" />
+    <Compile Include="MappingByCode\MixAutomapping\DictionaryCollectionTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\PoidTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\PropertiesExclusionTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\SetCollectionTests.cs" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.