Merge pull request #216 from chester89/testsFor113

Tests for #113

Author: chester89

.gitignore

@@ -24,3 +24,6 @@ build
 
 *.swp
 TestResult.xml
+*.ncrunchsolution
+*.ncrunchproject
+packages/

src/FluentNHibernate.Testing/AutoMapping/InheritanceTests.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentNHibernate.Automapping.TestFixtures.SuperTypes;
+using FluentNHibernate.Testing.Automapping;
+using NUnit.Framework;
+
+namespace FluentNHibernate.Testing.AutoMapping
+{
+    [TestFixture]
+    public class InheritanceTests: BaseAutoMapFixture
+    {
+        [Test]
+        public void AutoMapSimpleProperties()
+        {
+            Model<ThirdLevel>();
+
+            Test<ThirdLevel>(mapping =>
+            {
+                mapping.Element("//property[@name='Rate']/column").HasAttribute("name", "Rate");
+                mapping.Element("//property[@name='SecondRate']/column").HasAttribute("name", "SecondRate");
+            });
+        }
+
+        [Test]
+        public void AutoMapInheritedIdProperty()
+        {
+            Model<SecondLevel>();
+
+            Test<SecondLevel>(mapping => mapping.Element("//id").HasAttribute("name", "Id"));
+        }
+
+        [Test]
+        public void AutoMapManyToOne()
+        {
+            Model<FourthLevel>();
+
+            Test<FourthLevel>(mapping => mapping.Element("//many-to-one").HasAttribute("name", "One").
+                Element("//many-to-one/column").HasAttribute("name", "One_id"));
+        }
+
+        [Test]
+        public void AutoMapManyToMany()
+        {
+            Model<FourthLevel>();
+
+            Test<FourthLevel>(mapping => 
+            { 
+                mapping.Element("//many-to-many/column").HasAttribute("name", "ManyToMany_id");
+            });
+        }
+
+        [Test]
+        public void AutoMapEnum()
+        {
+            Model<FourthLevel>(model => model.Override<FourthLevel>(map => map.Map(x => x.publisherType)));
+
+            Test<FourthLevel > (mapping => mapping.Element("//property[@name='publisherType']").Exists());
+        }
+
+        [Test]
+        public void AutoMapVersion()
+        {
+            Model<ThirdLevel>();
+
+            Test<ThirdLevel>(mapping =>
+            {
+                mapping.Element("//version").HasAttribute("name", "Version");
+                mapping.Element("//version/column").HasAttribute("name", "Version");
+            });
+        }
+    }
+}

src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs

@@ -470,5 +470,60 @@ public class ExampleParentClass : SuperType
         public virtual IList<ExampleClass> Examples {get; set;}
     }
 
+    public abstract class Base1
+    {
+        public virtual int Id { get; protected set; }
+        public abstract void Foo(int x);
+    }
+
+    public class Derived1 : Base1
+    {
+        public virtual Decimal Rate { get; set; }
+        public override void Foo(int x)
+        {
+        }
+
+        public string GetSomething()
+        {
+            return Environment.NewLine;
+        }
+    }
+
+    public class SecondLevel : Derived1
+    {
+        public virtual Double SecondRate { get; set; }
+    }
+
+    public class ThirdLevel : SecondLevel
+    {
+        public virtual Boolean Flag { get; set; }
+        public virtual TimeSpan Version { get; set; }
+    }
+
+    public class FourthLevel: ThirdLevel
+    {
+        public PublisherType publisherType { get; set; }
+        public ToOne One { get; set; }
+        public IList<ManyToMany> Many { get; set; }
+    }
+
+    public class ToOne
+    {
+        public virtual int Id { get; protected set; }
+        public virtual string Name { get; set; }
+    }
 
+    public class ManyToMany
+    {
+        public virtual int Id { get; protected set; }
+        public virtual Decimal Value { get; set; }
+        public IList<FourthLevel> Levels { get; set; }
+    }
+
+    public enum PublisherType
+    {
+        Online, 
+        Offline,
+        Mixed
+    }
 }

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

@@ -101,9 +101,10 @@
     <Compile Include="AutoMapping\Apm\AlterationCollectionTests.cs" />
     <Compile Include="AutoMapping\Apm\AlterationTests.cs" />
     <Compile Include="AutoMapping\Apm\ConcreteBaseClassTests.cs" />
-    <Compile Include="AutoMapping\Apm\Conventions\VersionConventionTests.cs" />
-    <Compile Include="AutoMapping\DefaultAutoMappingConfigurationTests.cs" />
-    <Compile Include="AutoMapping\Apm\IdentityTests.cs" />
+    <Compile Include="AutoMapping\Apm\Conventions\VersionConventionTests.cs" />
+    <Compile Include="AutoMapping\DefaultAutoMappingConfigurationTests.cs" />
+    <Compile Include="AutoMapping\Apm\IdentityTests.cs" />
+    <Compile Include="AutoMapping\InheritanceTests.cs" />
     <Compile Include="AutoMapping\Overrides\ReferenceComponentOverrides.cs" />
     <Compile Include="AutoMapping\Overrides\AutoMappingOverrideAlterationTests.cs" />
     <Compile Include="AutoMapping\Apm\CacheOverrideTests.cs" />

src/FluentNHibernate/Automapping/AutoPersistenceModel.cs

@@ -207,9 +207,6 @@ private void AddMapping(Type type)
         {
             Type typeToMap = GetTypeToMap(type);
 
-            // Fixes https://github.com/jagregory/fluent-nhibernate/issues/113,
-            // where 'type' would not be mapped if 'GetTypeToMap' returned the
-            // base type
             if (typeToMap != type)
             {
                 log.BeginAutomappingType(type);
@@ -264,7 +261,7 @@ private bool ShouldMap(Type type)
                 return false; // skipped because we don't want to map components as entities
             }
             if (type == typeof(object))
-                return false; // object!
+                return false;
 
             return true;
         }