moved test classes around

Author: chester89

.gitignore

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

src/FluentNHibernate.Testing/AutoMapping/InheritanceTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using FluentNHibernate.Automapping.TestFixtures.SuperTypes;
 using FluentNHibernate.Testing.Automapping;
 using NUnit.Framework;
 
@@ -23,33 +24,4 @@ public void AutoMapSimpleProperties()
             });
         }
     }
-
-    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; }
-    }
 }

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;
         }