Fixed some dodgy code in the node sorter.. It was trying to remove all the xml nodes so it could re add them (in the correct order), but it only removed half of them.

Author: paulbatum

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

@@ -463,6 +463,7 @@
     <Compile Include="FluentInterfaceTests\NaturalIdPartTests.cs" />
     <Compile Include="MappingModel\Identity\CompositeIdMappingTester.cs" />
     <Compile Include="MappingModel\Output\XmlNaturalIdWriterTester.cs" />
+    <Compile Include="MappingModel\SortingTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\tools\NHibernate\NHibernate.ByteCode.Castle.dll">

src/FluentNHibernate.Testing/MappingModel/SortingTests.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using FluentNHibernate.MappingModel.Output.Sorting;
+using NUnit.Framework;
+using System.Xml;
+
+namespace FluentNHibernate.Testing.MappingModel
+{
+    [TestFixture]
+    public class SortingTests
+    {
+
+        [Test]
+        public void ShouldSortNodes()
+        {
+            var sorter = new XmlClasslikeNodeSorter();
+
+            var xml = @"<class><property /><joined-subclass /><many-to-one /><union-subclass /><cache /><key /><one-to-one /></class>";
+            var expected = @"<class><cache /><key /><one-to-one /><property /><many-to-one /><joined-subclass /><union-subclass /></class>";
+            
+            var doc = new XmlDocument();
+            doc.LoadXml(xml);
+
+            var node = doc.ChildNodes[0];
+            sorter.Sort(node);
+
+            node.OuterXml.ShouldEqual(expected);
+        }
+
+        [Test]
+        public void ShouldPreserveOrderingOfNodesThatAreAlreadySorted()
+        {
+            var sorter = new XmlClasslikeNodeSorter();
+
+            var xml = @"<class><cache /><key /><one-to-one /><property /><many-to-one /><joined-subclass /><union-subclass /></class>";
+            var doc = new XmlDocument();
+            doc.LoadXml(xml);
+
+            var node = doc.ChildNodes[0];
+            sorter.Sort(node);
+
+            node.OuterXml.ShouldEqual(xml);            
+        }
+
+    }
+}

src/FluentNHibernate/MappingModel/Output/Sorting/BaseXmlNodeSorter.cs

@@ -41,10 +41,8 @@ public XmlNode Sort(XmlNode node)
                 return Array.IndexOf(originalSortOrder, x).CompareTo(Array.IndexOf(originalSortOrder, y));
             });
 
-            for (var i = 0; i < node.ChildNodes.Count; i++)
-            {
-                node.RemoveChild(node.ChildNodes[i]);
-            }
+            while (node.ChildNodes.Count > 0)
+                node.RemoveChild(node.ChildNodes[0]);            
 
             foreach (var child in children)
             {