some simple tests for generic implementation of <list>

SVN: trunk@1890

Author: Mike Doerfler

src/NHibernate.Test/ListGeneric/A.cs

@@ -0,0 +1,38 @@
+#if NET_2_0
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.ListGeneric
+{
+	public class A
+	{
+		private int? _id;
+		private string _name;
+		private IList<B> _items;
+
+		public A() { }
+
+		public int? Id
+		{
+			get { return _id; }
+			set { _id = value; }
+		}
+
+		public string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
+
+		public IList<B> Items
+		{
+			get { return _items; }
+			set { _items = value; }
+		}
+
+	}
+}
+
+#endif

src/NHibernate.Test/ListGeneric/B.cs

@@ -0,0 +1,30 @@
+#if NET_2_0
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.ListGeneric
+{
+	public class B
+	{
+		private int? _id;
+		private string _name;
+
+		public B() { }
+
+		public int? Id
+		{
+			get { return _id; }
+			set { _id = value; }
+		}
+
+		public string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
+	}
+}
+
+#endif

src/NHibernate.Test/ListGeneric/ListGenericFixture.cs

@@ -0,0 +1,74 @@
+#if NET_2_0
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.ListGeneric
+{
+	[TestFixture]
+	public class ListGenericFixture : TestCase
+	{
+
+		protected override System.Collections.IList Mappings
+		{
+			get { return new string[] { "ListGeneric.ListGenericFixture.hbm.xml" }; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession s = sessions.OpenSession())
+			{
+				s.Delete("from A");
+				s.Flush();
+			}
+		}
+
+		[Test]
+		public void Simple()
+		{
+			int? newId;
+			A a = new A();
+			a.Name = "first generic type";
+			a.Items = new List<B>();
+			B firstB = new B();
+			firstB.Name = "first b";
+			B secondB = new B();
+			secondB.Name = "second b";
+
+			a.Items.Add(firstB);
+			a.Items.Add(secondB);
+
+			ISession s = OpenSession();
+			s.SaveOrUpdate(a);
+			// this flush should test how NH wraps a generic collection with its
+			// own persistent collection
+			s.Flush();
+			s.Close();
+			Assert.IsNotNull(a.Id);
+			// should have cascaded down to B
+			Assert.IsNotNull(firstB.Id);
+			Assert.IsNotNull(secondB.Id);
+
+			s = OpenSession();
+			a = s.Load<A>(a.Id);
+			Assert.AreEqual("first b", a.Items[0].Name, "first item should be 'first b'");
+			Assert.AreEqual("second b", a.Items[1].Name, "second item should be 'second b'");
+			B thirdB = new B();
+			thirdB.Name = "third B";
+			// ensuring the correct generic type was constructed
+			a.Items.Add(thirdB);
+			Assert.AreEqual(3, a.Items.Count, "3 items in the bag now");
+			s.Flush();
+			s.Close();
+		}
+	}
+}
+#endif

src/NHibernate.Test/ListGeneric/ListGenericFixture.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" assembly="NHibernate.Test" namespace="NHibernate.Test.ListGeneric">
+	<class name="A" table="a" lazy="false">
+		<id name="Id" column="id" unsaved-value="null">
+			<generator class="native" />
+		</id>
+		<property name="Name" column="aname" />
+		<list name="Items" cascade="all-delete-orphan" generic="true">
+			<key column="a_id" />
+			<index column="a_idx" />
+			<one-to-many class="B" />
+		</list>
+	</class>
+	<class name="B" table="b" lazy="false">
+		<id name="Id" column="id" unsaved-value="null">
+			<generator class="native" />
+		</id>
+		<property name="Name" column="aname" />
+	</class>
+</hibernate-mapping>

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

@@ -106,6 +106,9 @@
     <Compile Include="Legacy\SimpleTest.cs" />
     <Compile Include="Legacy\SQLFunctionsTest.cs" />
     <Compile Include="Legacy\SQLLoaderTest.cs" />
+    <Compile Include="ListGeneric\A.cs" />
+    <Compile Include="ListGeneric\B.cs" />
+    <Compile Include="ListGeneric\ListGenericFixture.cs" />
     <Compile Include="Log4netConfiguration.cs" />
     <Compile Include="MappingExceptions\A.cs" />
     <Compile Include="MappingExceptions\AddClassFixture.cs" />
@@ -383,6 +386,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="BagGeneric\BagGenericFixture.hbm.xml" />
+    <EmbeddedResource Include="ListGeneric\ListGenericFixture.hbm.xml" />
     <Content Include="NHSpecificTest\NH386\Mappings.hbm.xml" />
     <Content Include="NHSpecificTest\NH392\Mappings.hbm.xml" />
     <Content Include="NHSpecificTest\NH401\Mappings.hbm.xml" />

src/NHibernate/Collection/Generic/PersistentGenericList.cs

@@ -195,7 +195,7 @@ public override object ReadFrom(IDataReader reader, ICollectionPersister persist
 			int index = (int)persister.ReadIndex(reader, this.Session);
 
 			// pad with null from the current last element up to the new index
-			for (int i = list.Count; i < index; i++)
+			for (int i = list.Count; i <= index; i++)
 			{
 				list.Insert(i, default(T));
 			}

src/NHibernate/Mapping/List.cs

@@ -26,16 +26,14 @@ public override PersistentCollectionType CollectionType
 			get 
 			{
 #if NET_2_0
-				// TODO: uncomment this once PersistentGenricList is actually
-				// implemented
-				//if (this.IsGeneric)
-				//{
-				//    return TypeFactory.GenericList( Role, this.Element.Type.ReturnedClass );
-				//}
-				//else
-				//{
+				if (this.IsGeneric)
+				{
+					return TypeFactory.GenericList( Role, this.Element.Type.ReturnedClass );
+				}
+				else
+				{
 					return TypeFactory.List( Role );
-				//}
+				}
 #else
 				return TypeFactory.List( Role );
 #endif

src/NHibernate/Type/BagType.cs

@@ -26,8 +26,8 @@ public BagType( string role ) : base( role )
 		/// </summary>
 		/// <param name="session">The current <see cref="ISessionImplementor"/> for the bag.</param>
 		/// <param name="persister"></param>
-		/// <returns></returns>
-		public override IPersistentCollection Instantiate( ISessionImplementor session, ICollectionPersister persister )
+		/// <returns>A new <see cref="NHibernate.Collections.Bag"/>.</returns>
+		public override IPersistentCollection Instantiate(ISessionImplementor session, ICollectionPersister persister)
 		{
 			return new Bag( session );
 		}
@@ -39,7 +39,7 @@ public override System.Type ReturnedClass
 		}
 
 		/// <summary>
-		/// Wraps an <see cref="IList"/> in a <see cref="Bag"/>.
+		/// Wraps an <see cref="IList"/> in a NHibernate <see cref="Bag"/>.
 		/// </summary>
 		/// <param name="session">The <see cref="ISessionImplementor"/> for the collection to be a part of.</param>
 		/// <param name="collection">The unwrapped <see cref="IList"/>.</param>

src/NHibernate/Type/GenericListType.cs

@@ -13,7 +13,7 @@ namespace NHibernate.Type
 {
 	/// <summary>
 	/// An <see cref="IType"/> that maps an <see cref="IList&lt;T&gt;"/> collection
-	/// to the database using bag semantics.
+	/// to the database using list semantics.
 	/// </summary>
 	public class GenericListType : ListType
 	{

src/NHibernate/Type/ListType.cs

@@ -4,24 +4,29 @@
 
 namespace NHibernate.Type
 {
-	/// <summary></summary>
+	/// <summary>
+	/// An <see cref="IType"/> that maps an <see cref="IList"/> collection
+	/// using list semantics to the database.
+	/// </summary>
 	public class ListType : PersistentCollectionType
 	{
 		/// <summary>
-		/// 
+		/// Initializes a new instance of a <see cref="ListType"/> class for
+		/// a specific role.
 		/// </summary>
-		/// <param name="role"></param>
-		public ListType( string role ) : base( role )
+		/// <param name="role">The role the persistent collection is in.</param>
+		public ListType(string role)
+			: base(role)
 		{
 		}
 
 		/// <summary>
-		/// 
+		/// Instantiates a new <see cref="IPersistentCollection"/> for the bag.
 		/// </summary>
-		/// <param name="session"></param>
+		/// <param name="session">The current <see cref="ISessionImplementor"/> for the bag.</param>
 		/// <param name="persister"></param>
-		/// <returns></returns>
-		public override IPersistentCollection Instantiate( ISessionImplementor session, ICollectionPersister persister )
+		/// <returns>A new <see cref="NHibernate.Collections.List"/>.</returns>
+		public override IPersistentCollection Instantiate(ISessionImplementor session, ICollectionPersister persister)
 		{
 			return new List( session );
 		}
@@ -33,12 +38,14 @@ public override System.Type ReturnedClass
 		}
 
 		/// <summary>
-		/// 
+		/// Wraps an exist <see cref="IList"/> in a NHibernate <see cref="List"/>.
 		/// </summary>
-		/// <param name="session"></param>
-		/// <param name="collection"></param>
-		/// <returns></returns>
-		public override IPersistentCollection Wrap( ISessionImplementor session, object collection )
+		/// <param name="session">The <see cref="ISessionImplementor"/> for the collection to be a part of.</param>
+		/// <param name="collection">The unwrapped <see cref="IList"/>.</param>
+		/// <returns>
+		/// An <see cref="List"/> that wraps the non NHibernate <see cref="IList"/>.
+		/// </returns>
+		public override IPersistentCollection Wrap(ISessionImplementor session, object collection)
 		{
 			return new List( session, ( IList ) collection );
 		}