Integrated two more tests from H2.1, fixed uncovered bugs.

SVN: trunk@1399

Author: Sergey Koshcheyev

src/NHibernate.DomainModel/Bar.cs

@@ -4,7 +4,7 @@
 namespace NHibernate.DomainModel
 {
 	[Serializable]
-	public class Bar : Abstract, BarProxy
+	public class Bar : Abstract, BarProxy, INamed
 	{
 		private int _x;
 		private string _barString;

src/NHibernate.DomainModel/Baz.cs

@@ -12,7 +12,7 @@ namespace NHibernate.DomainModel
  /// This class is autogenerated
  /// </remark>
  [Serializable]
- public class Baz : IComparable
+ public class Baz : INamed, IComparable
  {
 
 	#region Fields
@@ -38,6 +38,7 @@ public class Baz : IComparable
 	private System.Collections.IDictionary _cachedMap;
 	private System.Collections.IDictionary _stringGlarchMap;
 	private System.Collections.IDictionary _anyToAny;
+	private System.Collections.IList       _manyToAny;
 	private Iesi.Collections.ISet _fooSet;
 	private Iesi.Collections.ISet _stringSet;
 	private Iesi.Collections.ISet _topFoos;
@@ -46,9 +47,9 @@ public class Baz : IComparable
 	private Iesi.Collections.ISet _sortablez;
 	private System.Collections.IList _bag;
 	private System.Collections.IList _fooBag;
-	private System.Collections.IList _bazez;
 	private System.Collections.IList _idFooBag;
 	private System.Collections.IList _byteBag;
+    private System.Collections.IList _bazez;
 
 	#endregion
 
@@ -314,7 +315,22 @@ public System.Collections.IDictionary AnyToAny
 		}
 	}
 
-	/// <summary>
+	 /// <summary>
+	 /// Get/set for manyToAny
+	 /// </summary>
+	 public System.Collections.IList ManyToAny
+	 {
+		 get
+		 {
+			 return this._manyToAny;
+		 }
+		 set
+		 {
+			 this._manyToAny = value;
+		 }
+	 }
+
+	 /// <summary>
 	/// Gets or sets the intArray
 	/// </summary> 
 	public int[] IntArray
@@ -556,8 +572,8 @@ public void SetDefaults()
 		 StringDateMap = new SortedList();
 		 StringDateMap.Add( "now", DateTime.Now );
 		 StringDateMap.Add( "never", null );
-		 StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) );
-		 //StringDateMap.Add( "big bang", new DateTime(0) );
+		 StringDateMap.Add( "big bang", new DateTime(0L) );
+		 //StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) );
 		 ArrayList list = new ArrayList();
 		 list.AddRange( StringSet ); 
 		 StringList = list;

src/NHibernate.DomainModel/Baz.hbm.xml

@@ -313,7 +313,16 @@
 				<column name="el_id_"/>
 			</many-to-any>
 		</map>
-		
+
+		<list name="ManyToAny" lazy="true">
+			<key column="baz"/>
+			<index column="ind"/>
+			<many-to-any id-type="string">
+				<column name="el_clazz_"/>
+				<column name="el_id_"/>
+			</many-to-any>
+		</list>
+
 		<bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all">
 			<key column="`baz id`"/>
 			<one-to-many class="NHibernate.DomainModel.Baz, NHibernate.DomainModel"/>

src/NHibernate.DomainModel/Foo.cs

@@ -64,6 +64,11 @@ public class Foo : FooProxy, ILifecycle
 		public Foo()
 		{
 		}
+
+		public Foo( int x )
+		{
+			_x = x;
+		}
 
 		#endregion
 

src/NHibernate.DomainModel/FooBar.hbm.xml

@@ -2,7 +2,7 @@
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
 	<import class="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel" />
 	<import class="NHibernate.DomainModel.Result, NHibernate.DomainModel" />
-	<import class="NHibernate.DomainModel.Named, NHibernate.DomainModel" />
+	<import class="NHibernate.DomainModel.INamed, NHibernate.DomainModel" />
 
 	<class 
   		name="NHibernate.DomainModel.Foo, NHibernate.DomainModel"

src/NHibernate.DomainModel/Glarch.cs

@@ -4,7 +4,7 @@
 namespace NHibernate.DomainModel
 {
 	[Serializable]
-	public class Glarch : Super, GlarchProxy, ILifecycle
+	public class Glarch : Super, GlarchProxy, ILifecycle, INamed
 	{
 
 		private int _version;

src/NHibernate.DomainModel/Holder.cs

@@ -15,6 +15,14 @@ public class Holder : INamed
 		private string _name;
 		private Holder _otherHolder;
 
+		public Holder()
+		{
+		}
+
+		public Holder( string name )
+		{
+			_name = name;
+		}
 
 		public string Id
 		{

src/NHibernate.DomainModel/Master.cs

@@ -7,7 +7,7 @@ namespace NHibernate.DomainModel
 	/// Summary description for Master.
 	/// </summary>
 	[Serializable]
-	public class Master
+	public class Master : INamed
 	{
 		private static object _emptyObject = new object();