NH-952 - AddAssembly doesn't order subclasses correctly in some cases.

SVN: branches/1.2.x@2728

src/NHibernate.Test/NHSpecificTest/NH845/Fixture.cs

@@ -16,6 +16,7 @@ public void HbmOrdererForgetsMappingFilesWithoutClassesIfExtendsIsUsed()
 			Assembly domain = typeof(Master).Assembly;
 			AssemblyHbmOrderer orderer = new AssemblyHbmOrderer(domain);
 			orderer.AddResource("NHibernate.DomainModel.MultiExtends.hbm.xml");
+			orderer.AddResource("NHibernate.DomainModel.Multi.hbm.xml");
 			orderer.AddResource("NHibernate.DomainModel.Query.hbm.xml");
 
 			IList files = orderer.GetHbmFiles();

src/NHibernate.Test/NHSpecificTest/NH952/Asset.cs

@@ -0,0 +1,6 @@
+namespace NHibernate.Test.NHSpecificTest.NH952
+{
+	public class Asset : PhysicalItem
+	{
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH952/Asset.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+					namespace="NHibernate.Test.NHSpecificTest.NH952"
+					assembly="NHibernate.Test"
+					default-cascade="save-update">
+
+	<joined-subclass name="Asset"
+						extends="PhysicalItem"
+						table="ASSET">
+
+		<key column="UNIQUE_ID" /> 
+
+	</joined-subclass>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH952/Item.cs

@@ -0,0 +1,13 @@
+namespace NHibernate.Test.NHSpecificTest.NH952
+{
+	public class Item
+	{
+		private int uniqueId;
+
+		public virtual int UniqueId
+		{
+			get { return uniqueId; }
+			set { uniqueId = value; }
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH952/Item.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+					namespace="NHibernate.Test.NHSpecificTest.NH952"
+					assembly="NHibernate.Test"
+					default-cascade="save-update">
+
+    <class name="Item" table="ITEM">
+
+        <id name="UniqueId" column="UNIQUE_ID">
+            <generator class="increment"/>
+        </id>
+
+    </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH952/NH952Fixture.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections;
+using System.Reflection;
+
+using NHibernate.Cfg;
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH952
+{
+	[TestFixture]
+	public class NH952Fixture
+	{
+		private static readonly Assembly MyAssembly = typeof(NH952Fixture).Assembly;
+		private static readonly string MyNamespace = typeof(NH952Fixture).Namespace;
+
+		private static readonly string[] Resources = new string[]
+			{
+				// Order is important!
+				MyNamespace + ".Asset.hbm.xml",
+				MyNamespace + ".SellableItem.hbm.xml",
+				MyNamespace + ".PhysicalItem.hbm.xml",
+				MyNamespace + ".Item.hbm.xml"
+			};
+
+		[Test]
+		public void OrderingAssemblyOrderer()
+		{
+			AssemblyHbmOrderer orderer = AssemblyHbmOrderer.CreateWithResources(MyAssembly, Resources);
+			IList orderedResources = orderer.GetHbmFiles();
+			Assert.AreEqual(Resources.Length, orderedResources.Count);
+			Assert.AreEqual(Resources[3], orderedResources[0]);
+			Assert.AreEqual(Resources[1], orderedResources[1]);
+			Assert.AreEqual(Resources[2], orderedResources[2]);
+			Assert.AreEqual(Resources[0], orderedResources[3]);
+		}
+
+		[Test]
+		public void OrderingAddResources()
+		{
+			Configuration cfg = new Configuration();
+			cfg.AddResources(MyAssembly, Resources, false);
+			cfg.BuildSessionFactory().Close();
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH952/PhysicalItem.cs

@@ -0,0 +1,6 @@
+namespace NHibernate.Test.NHSpecificTest.NH952
+{
+	public class PhysicalItem : SellableItem
+	{
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH952/PhysicalItem.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+					namespace="NHibernate.Test.NHSpecificTest.NH952"
+					assembly="NHibernate.Test"
+					default-cascade="save-update">
+
+	<joined-subclass name="PhysicalItem"
+						extends="SellableItem"
+						table="PHYSICALITEM">
+
+		<key column="UNIQUE_ID" /> 
+
+	</joined-subclass>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH952/SellableItem.cs

@@ -0,0 +1,6 @@
+namespace NHibernate.Test.NHSpecificTest.NH952
+{
+	public class SellableItem : Item
+	{
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH952/SellableItem.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+					namespace="NHibernate.Test.NHSpecificTest.NH952"
+					assembly="NHibernate.Test"
+					default-cascade="save-update">
+
+	<joined-subclass name="SellableItem"
+						extends="Item"
+						table="SELLABLEITEM">
+
+		<key column="UNIQUE_ID" /> 
+
+	</joined-subclass>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test-2.0.csproj

@@ -403,6 +403,11 @@
     <Compile Include="NHSpecificTest\NH940\B.cs" />
     <Compile Include="NHSpecificTest\NH940\MyException.cs" />
     <Compile Include="NHSpecificTest\NH940\NH940Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH952\Asset.cs" />
+    <Compile Include="NHSpecificTest\NH952\Item.cs" />
+    <Compile Include="NHSpecificTest\NH952\NH952Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH952\PhysicalItem.cs" />
+    <Compile Include="NHSpecificTest\NH952\SellableItem.cs" />
     <Compile Include="NHSpecificTest\NH958\Female.cs" />
     <Compile Include="NHSpecificTest\NH958\Hobby.cs" />
     <Compile Include="NHSpecificTest\NH958\Male.cs" />
@@ -872,6 +877,12 @@
   <ItemGroup>
     <EmbeddedResource Include="NHSpecificTest\NH940\Mappings.hbm.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH952\Asset.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH952\Item.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH952\PhysicalItem.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH952\SellableItem.hbm.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>