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

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

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

Log Message:
-----------
SimpleModelInspector with default pattern to discover Bags 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/BagCollectionTests.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 20:04:25 UTC (rev 5655)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 20:35:45 UTC (rev 5656)
@@ -48,13 +48,19 @@
 			isPersistentProperty = (m, declared) => declared || MatchNoReadOnlyPropertyPattern(m);
 			isSet = (m, declared) => declared || MatchCollection(m, MatchSetMember);
 			isArray = (m, declared) => declared;
-			isBag = (m, declared) => declared;
+			isBag = (m, declared) => declared || MatchCollection(m, MatchBagMember);
 			isDictionary = (m, declared) => declared;
 			isList = (m, declared) => declared;
 		}
 
-		public bool MatchCollection(MemberInfo subject, Predicate<MemberInfo> specificCollectionPredicate)
+		protected bool MatchBagMember(MemberInfo subject)
 		{
+			System.Type memberType = subject.GetPropertyOrFieldType();
+			return typeof(System.Collections.IEnumerable).IsAssignableFrom(memberType) && !(memberType == typeof(string) || memberType == typeof(byte[]));
+		}
+
+		protected bool MatchCollection(MemberInfo subject, Predicate<MemberInfo> specificCollectionPredicate)
+		{
 			const BindingFlags defaultBinding = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
 
 			if (specificCollectionPredicate(subject)) return true;

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/BagCollectionTests.cs	2011-04-10 20:35:45 UTC (rev 5656)
@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using System.Reflection;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MixAutomapping
+{
+	public class BagCollectionTests
+	{
+		// match any IEnumerable
+		private class Entity
+		{
+			private ICollection<string> emails;
+			public IEnumerable<string> NickNames { get; set; }
+			public byte[] Bytes { get; set; }
+			public object Emails
+			{
+				get { return emails; }
+			}
+
+			public string Simple { get; set; }
+		}
+
+		[Test]
+		public void MatchWithEnumerableProperty()
+		{
+			var mi = typeof(Entity).GetProperty("NickNames");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsBag(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void MatchWithEnumerableField()
+		{
+			var mi = typeof(Entity).GetField("emails", BindingFlags.NonPublic | BindingFlags.Instance);
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsBag(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void MatchWithObjectPropertyAndEnumerableField()
+		{
+			var mi = typeof(Entity).GetProperty("Emails");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsBag(mi).Should().Be.True();
+		}
+
+		[Test]
+		public void NotMatchWithStringProperty()
+		{
+			var mi = typeof(Entity).GetProperty("Simple");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsBag(mi).Should().Be.False();
+		}
+
+		[Test]
+		public void NotMatchWithByteArrayProperty()
+		{
+			var mi = typeof(Entity).GetProperty("Bytes");
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+
+			inspector.IsBag(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:04:25 UTC (rev 5655)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-10 20:35:45 UTC (rev 5656)
@@ -541,6 +541,7 @@
     <Compile Include="MappingByCode\MappersTests\IdBagMapperTest.cs" />
     <Compile Include="MappingByCode\MappersTests\JoinMapperTests.cs" />
     <Compile Include="MappingByCode\MappersTests\SubclassMapperWithJoinPropertiesTest.cs" />
+    <Compile Include="MappingByCode\MixAutomapping\BagCollectionTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\ComponentsTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\PoidTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\PropertiesExclusionTests.cs" />


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