BasicLoader: Fix warning regarding fetching multiple bags to also apply for generic bags.

MultipleCollectionFetchTest: Port to use generic collections.

Author: oskarb

src/NHibernate.Test/MultipleCollectionFetchTest/AbstractMultipleCollectionFetchFixture.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections;
-
+using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace NHibernate.Test.MultipleCollectionFetchTest
@@ -12,9 +12,9 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
-		protected abstract void AddToCollection(ICollection collection, Person person);
+		protected abstract void AddToCollection(ICollection<Person> collection, Person person);
 
-		protected abstract ICollection CreateCollection();
+		protected abstract ICollection<Person> CreateCollection();
 
 		protected override void OnTearDown()
 		{

src/NHibernate.Test/MultipleCollectionFetchTest/MultipleBagFetchFixture.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections;
-
+using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace NHibernate.Test.MultipleCollectionFetchTest
@@ -13,14 +13,14 @@ protected override IList Mappings
 			get { return new string[] {"MultipleCollectionFetchTest.PersonBag.hbm.xml"}; }
 		}
 
-		protected override void AddToCollection(ICollection collection, Person person)
+		protected override void AddToCollection(ICollection<Person> collection, Person person)
 		{
-			((ArrayList) collection).Add(person);
+			((List<Person>) collection).Add(person);
 		}
 
-		protected override ICollection CreateCollection()
+		protected override ICollection<Person> CreateCollection()
 		{
-			return new ArrayList();
+			return new List<Person>();
 		}
 
 		protected override void RunLinearJoinFetchTest(Person parent)

src/NHibernate.Test/MultipleCollectionFetchTest/MultipleListFetchFixture.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections;
-
+using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace NHibernate.Test.MultipleCollectionFetchTest
@@ -13,14 +13,14 @@ protected override IList Mappings
 			get { return new string[] { "MultipleCollectionFetchTest.PersonList.hbm.xml" }; }
 		}
 
-		protected override void AddToCollection(ICollection collection, Person person)
+		protected override void AddToCollection(ICollection<Person> persons, Person person)
 		{
-			((ArrayList) collection).Add(person);
+			((List<Person>) persons).Add(person);
 		}
 
-		protected override ICollection CreateCollection()
+		protected override ICollection<Person> CreateCollection()
 		{
-			return new ArrayList();
+			return new List<Person>();
 		}
 	}
 }

src/NHibernate.Test/MultipleCollectionFetchTest/MultipleSetFetchFixture.cs

@@ -1,29 +1,26 @@
 using System;
 using System.Collections;
-using System.Net.NetworkInformation;
+using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace NHibernate.Test.MultipleCollectionFetchTest
 {
 	[TestFixture]
-	[Ignore("Support for non-generic sets removed. To test generic set instead, need to duplicate or port the sister test fixtures too.")]
 	public class MultipleSetFetchFixture : AbstractMultipleCollectionFetchFixture
 	{
 		protected override IList Mappings
 		{
 			get { return new string[] {"MultipleCollectionFetchTest.PersonSet.hbm.xml"}; }
 		}
 
-		protected override void AddToCollection(ICollection collection, Person person)
+		protected override void AddToCollection(ICollection<Person> persons, Person person)
 		{
-			//((ISet) collection).Add(person);
-			throw new NotImplementedException();
+			((ISet<Person>) persons).Add(person);
 		}
 
-		protected override ICollection CreateCollection()
+		protected override ICollection<Person> CreateCollection()
 		{
-			throw new NotImplementedException();
-			//return new HashSet();
+			return new HashSet<Person>();
 		}
 	}
 }

src/NHibernate.Test/MultipleCollectionFetchTest/Person.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.MultipleCollectionFetchTest
 {
 	public class Person
 	{
 		private int id;
-		private ICollection children;
-		private ICollection friends;
+		private ICollection<Person> children;
+		private ICollection<Person> friends;
 		private Person parent;
 
 		public virtual int Id
@@ -16,13 +16,13 @@ public virtual int Id
 			set { id = value; }
 		}
 
-		public virtual ICollection Children
+		public virtual ICollection<Person> Children
 		{
 			get { return children; }
 			set { children = value; }
 		}
 
-		public virtual ICollection Friends
+		public virtual ICollection<Person> Friends
 		{
 			get { return friends; }
 			set { friends = value; }

src/NHibernate/Loader/BasicLoader.cs

@@ -68,7 +68,7 @@ protected override void PostInstantiate()
 
 		private static bool IsBag(ICollectionPersister collectionPersister)
 		{
-			return collectionPersister.CollectionType.GetType().IsAssignableFrom(typeof (BagType));
+			return collectionPersister.CollectionType is BagType;
 		}
 
 		/// <summary>