Rewrite tests for custom collections that use PersistentList to instead be based on PersistentGenericList.

oskarb · oskarb · commit 38164e7aef23 · 2013-03-08T13:36:21.000+01:00
diff --git a/src/NHibernate.Test/UserCollection/MyList.cs b/src/NHibernate.Test/UserCollection/MyList.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.UserCollection
 {
-	public class MyList : ArrayList
+	public class MyList : List<Email>
 	{
 	}
 }
diff --git a/src/NHibernate.Test/UserCollection/MyListType.cs b/src/NHibernate.Test/UserCollection/MyListType.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Collection;
 using NHibernate.Engine;
 using NHibernate.Persister.Collection;
@@ -16,7 +17,7 @@ public IPersistentCollection Instantiate(ISessionImplementor session, ICollectio
 
 		public IPersistentCollection Wrap(ISessionImplementor session, object collection)
 		{
-			return new PersistentMylist(session, (IList) collection);
+			return new PersistentMylist(session, (IList<Email>) collection);
 		}
 
 		public IEnumerable GetElements(object collection)
@@ -26,23 +27,31 @@ public IEnumerable GetElements(object collection)
 
 		public bool Contains(object collection, object entity)
 		{
-			return ((IList) collection).Contains(entity);
+			var email = entity as Email;
+			if (entity != null && email == null)
+				return false;
+
+			return ((IList<Email>) collection).Contains(email);
 		}
 
 		public object IndexOf(object collection, object entity)
 		{
-			return ((IList) collection).IndexOf(entity);
+			var email = entity as Email;
+			if (entity != null && email == null)
+				return -1;
+
+			return ((IList<Email>)collection).IndexOf(email);
 		}
 
 		public object ReplaceElements(object original, object target, ICollectionPersister persister, object owner,
 		                              IDictionary copyCache, ISessionImplementor session)
 		{
-			IList result = (IList) target;
+			IList<Email> result = (IList<Email>) target;
 			result.Clear();
+
 			foreach (object o in ((IEnumerable) original))
-			{
-				result.Add(o);
-			}
+				result.Add((Email) o);
+
 			return result;
 		}
 
@@ -51,4 +60,4 @@ public object Instantiate(int anticipatedSize)
 			return new MyList();
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/DefaultableListImpl.cs b/src/NHibernate.Test/UserCollection/Parameterized/DefaultableListImpl.cs
@@ -1,19 +1,15 @@
-using System.Collections;
+using System.Collections.Generic;
+
 namespace NHibernate.Test.UserCollection.Parameterized
 {
-	public class DefaultableListImpl : ArrayList, IDefaultableList
+	public class DefaultableListImpl : List<string>, IDefaultableList
 	{
-		private string defaultValue;
 		public DefaultableListImpl() {}
 		public DefaultableListImpl(int capacity) : base(capacity) {}
 
 		#region IDefaultableList Members
 
-		public string DefaultValue
-		{
-			get { return defaultValue; }
-			set { defaultValue = value; }
-		}
+		public string DefaultValue { get; set; }
 
 		#endregion
 	}
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/DefaultableListType.cs b/src/NHibernate.Test/UserCollection/Parameterized/DefaultableListType.cs
@@ -27,7 +27,7 @@ public IPersistentCollection Wrap(ISessionImplementor session, object collection
 			}
 			else
 			{
-				return new PersistentDefaultableList(session, (IList)collection);
+				return new PersistentDefaultableList(session, (IList<string>)collection);
 			}
 		}
 
@@ -38,23 +38,31 @@ public IEnumerable GetElements(object collection)
 
 		public bool Contains(object collection, object entity)
 		{
-			return ((IDefaultableList)collection).Contains(entity);
+			var item = entity as string;
+			if (entity != null && item == null)
+				return false;
+
+			return ((IDefaultableList)collection).Contains(item);
 		}
 
 		public object IndexOf(object collection, object entity)
 		{
-			int index = ((IDefaultableList)collection).IndexOf(entity);
+			var item = entity as string;
+			if (entity != null && item == null)
+				return null;
+
+			int index = ((IDefaultableList)collection).IndexOf(item);
 			return index >= 0 ? (object) index : null;
 		}
 
 		public object ReplaceElements(object original, object target, ICollectionPersister persister, object owner, IDictionary copyCache, ISessionImplementor session)
 		{
 			IDefaultableList result = (IDefaultableList)target;
 			result.Clear();
-			foreach (object o in (IDefaultableList)original)
-			{
+
+			foreach (string o in (IDefaultableList) original)
 				result.Add(o);
-			}
+
 			return result;
 		}
 
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/Entity.cs b/src/NHibernate.Test/UserCollection/Parameterized/Entity.cs
@@ -1,11 +1,12 @@
 using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.UserCollection.Parameterized
 {
 	public class Entity
 	{
 		private string name;
-		private IList values = new ArrayList();
+		private IList<string> values = new List<string>();
 
 		public Entity() {}
 
@@ -19,7 +20,7 @@ public virtual string Name
 			get { return name; }
 		}
 
-		public virtual IList Values
+		public virtual IList<string> Values
 		{
 			get { return values; }
 			set { values = value; }
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs b/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs
@@ -1,7 +1,8 @@
-using System.Collections;
+using System.Collections.Generic;
+
 namespace NHibernate.Test.UserCollection.Parameterized
 {
-	public interface IDefaultableList : IList
+	public interface IDefaultableList : IList<string>
 	{
 		string DefaultValue { get;}
 	}
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/ParameterizedUserCollectionTypeFixture.cs b/src/NHibernate.Test/UserCollection/Parameterized/ParameterizedUserCollectionTypeFixture.cs
@@ -19,23 +19,26 @@ protected override IList Mappings
 		[Test]
 		public void BasicOperation()
 		{
-			ISession s = OpenSession();
-			ITransaction t = s.BeginTransaction();
-			Entity entity = new Entity("tester");
-			entity.Values.Add("value-1");
-			s.Persist(entity);
-			t.Commit();
-			s.Close();
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				var entity = new Entity("tester");
+				entity.Values.Add("value-1");
+				s.Persist(entity);
+				t.Commit();
+			}
 
-			s = OpenSession();
-			t = s.BeginTransaction();
-			entity = s.Get<Entity>("tester");
-			Assert.IsTrue(NHibernateUtil.IsInitialized(entity.Values));
-			Assert.AreEqual(1, entity.Values.Count);
-			Assert.AreEqual("Hello", ((IDefaultableList)entity.Values).DefaultValue);
-			s.Delete(entity);
-			t.Commit();
-			s.Close();
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var entity = s.Get<Entity>("tester");
+				Assert.IsTrue(NHibernateUtil.IsInitialized(entity.Values));
+				Assert.AreEqual(1, entity.Values.Count);
+				Assert.AreEqual("Hello", ((IDefaultableList) entity.Values).DefaultValue);
+
+				s.Delete(entity);
+				t.Commit();
+			}
 		}
 	}
 }
diff --git a/src/NHibernate.Test/UserCollection/Parameterized/PersistentDefaultableList.cs b/src/NHibernate.Test/UserCollection/Parameterized/PersistentDefaultableList.cs
@@ -1,16 +1,16 @@
-using System.Collections;
-using NHibernate.Collection;
+using System.Collections.Generic;
+using NHibernate.Collection.Generic;
 using NHibernate.Engine;
 
 namespace NHibernate.Test.UserCollection.Parameterized
 {
-	public class PersistentDefaultableList: PersistentList, IDefaultableList
+	public class PersistentDefaultableList: PersistentGenericList<string>, IDefaultableList
 	{
 		public PersistentDefaultableList() {}
 
 		public PersistentDefaultableList(ISessionImplementor session) : base(session) {}
 
-		public PersistentDefaultableList(ISessionImplementor session, IList list) : base(session, list) {}
+		public PersistentDefaultableList(ISessionImplementor session, IList<string> list) : base(session, list) {}
 
 		public string DefaultValue
 		{
diff --git a/src/NHibernate.Test/UserCollection/PersistentMylist.cs b/src/NHibernate.Test/UserCollection/PersistentMylist.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
-using NHibernate.Collection;
+using System.Collections.Generic;
+using NHibernate.Collection.Generic;
 using NHibernate.Engine;
 
 namespace NHibernate.Test.UserCollection
 {
-	public class PersistentMylist : PersistentList
+	public class PersistentMylist : PersistentGenericList<Email>
 	{
-		public PersistentMylist(ISessionImplementor session, IList list) : base(session, list)
+		public PersistentMylist(ISessionImplementor session, IList<Email> list) : base(session, list)
 		{
 		}
 
diff --git a/src/NHibernate.Test/UserCollection/User.cs b/src/NHibernate.Test/UserCollection/User.cs
@@ -7,7 +7,7 @@ namespace NHibernate.Test.UserCollection
 	public class User
 	{
 		private string userName;
-		private IList emailAddresses = new MyList();
+		private IList<Email> emailAddresses = new MyList();
 		private ISet<object> sessionData = new HashSet<object>();
 
 		public string UserName
@@ -16,7 +16,7 @@ public string UserName
 			set { userName = value; }
 		}
 
-		public IList EmailAddresses
+		public IList<Email> EmailAddresses
 		{
 			get { return emailAddresses; }
 			set { emailAddresses = value; }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
	`2`	`+using System.Collections.Generic;`
`3`	`3`
`4`	`4`	`namespace NHibernate.Test.UserCollection`
`5`	`5`	`{`
`6`		`- public class MyList : ArrayList`
	`6`	`+ public class MyList : List<Email>`
`7`	`7`	`{`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections;`
	`3`	`+using System.Collections.Generic;`
`3`	`4`	`using NHibernate.Collection;`
`4`	`5`	`using NHibernate.Engine;`
`5`	`6`	`using NHibernate.Persister.Collection;`
`@@ -16,7 +17,7 @@ public IPersistentCollection Instantiate(ISessionImplementor session, ICollectio`
`16`	`17`
`17`	`18`	`public IPersistentCollection Wrap(ISessionImplementor session, object collection)`
`18`	`19`	`{`
`19`		`- return new PersistentMylist(session, (IList) collection);`
	`20`	`+ return new PersistentMylist(session, (IList<Email>) collection);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public IEnumerable GetElements(object collection)`
`@@ -26,23 +27,31 @@ public IEnumerable GetElements(object collection)`
`26`	`27`
`27`	`28`	`public bool Contains(object collection, object entity)`
`28`	`29`	`{`
`29`		`- return ((IList) collection).Contains(entity);`
	`30`	`+ var email = entity as Email;`
	`31`	`+ if (entity != null && email == null)`
	`32`	`+ return false;`
	`33`	`+`
	`34`	`+ return ((IList<Email>) collection).Contains(email);`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`public object IndexOf(object collection, object entity)`
`33`	`38`	`{`
`34`		`- return ((IList) collection).IndexOf(entity);`
	`39`	`+ var email = entity as Email;`
	`40`	`+ if (entity != null && email == null)`
	`41`	`+ return -1;`
	`42`	`+`
	`43`	`+ return ((IList<Email>)collection).IndexOf(email);`
`35`	`44`	`}`
`36`	`45`
`37`	`46`	`public object ReplaceElements(object original, object target, ICollectionPersister persister, object owner,`
`38`	`47`	`IDictionary copyCache, ISessionImplementor session)`
`39`	`48`	`{`
`40`		`- IList result = (IList) target;`
	`49`	`+ IList<Email> result = (IList<Email>) target;`
`41`	`50`	`result.Clear();`
	`51`	`+`
`42`	`52`	`foreach (object o in ((IEnumerable) original))`
`43`		`- {`
`44`		`- result.Add(o);`
`45`		`- }`
	`53`	`+ result.Add((Email) o);`
	`54`	`+`
`46`	`55`	`return result;`
`47`	`56`	`}`
`48`	`57`
`@@ -51,4 +60,4 @@ public object Instantiate(int anticipatedSize)`
`51`	`60`	`return new MyList();`
`52`	`61`	`}`
`53`	`62`	`}`
`54`		`-}`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public IPersistentCollection Wrap(ISessionImplementor session, object collection`
`27`	`27`	`}`
`28`	`28`	`else`
`29`	`29`	`{`
`30`		`- return new PersistentDefaultableList(session, (IList)collection);`
	`30`	`+ return new PersistentDefaultableList(session, (IList<string>)collection);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -38,23 +38,31 @@ public IEnumerable GetElements(object collection)`
`38`	`38`
`39`	`39`	`public bool Contains(object collection, object entity)`
`40`	`40`	`{`
`41`		`- return ((IDefaultableList)collection).Contains(entity);`
	`41`	`+ var item = entity as string;`
	`42`	`+ if (entity != null && item == null)`
	`43`	`+ return false;`
	`44`	`+`
	`45`	`+ return ((IDefaultableList)collection).Contains(item);`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`public object IndexOf(object collection, object entity)`
`45`	`49`	`{`
`46`		`- int index = ((IDefaultableList)collection).IndexOf(entity);`
	`50`	`+ var item = entity as string;`
	`51`	`+ if (entity != null && item == null)`
	`52`	`+ return null;`
	`53`	`+`
	`54`	`+ int index = ((IDefaultableList)collection).IndexOf(item);`
`47`	`55`	`return index >= 0 ? (object) index : null;`
`48`	`56`	`}`
`49`	`57`
`50`	`58`	`public object ReplaceElements(object original, object target, ICollectionPersister persister, object owner, IDictionary copyCache, ISessionImplementor session)`
`51`	`59`	`{`
`52`	`60`	`IDefaultableList result = (IDefaultableList)target;`
`53`	`61`	`result.Clear();`
`54`		`- foreach (object o in (IDefaultableList)original)`
`55`		`- {`
	`62`	`+`
	`63`	`+ foreach (string o in (IDefaultableList) original)`
`56`	`64`	`result.Add(o);`
`57`		`- }`
	`65`	`+`
`58`	`66`	`return result;`
`59`	`67`	`}`
`60`	`68`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`using System.Collections;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace NHibernate.Test.UserCollection.Parameterized`
`4`	`5`	`{`
`5`	`6`	`public class Entity`
`6`	`7`	`{`
`7`	`8`	`private string name;`
`8`		`- private IList values = new ArrayList();`
	`9`	`+ private IList<string> values = new List<string>();`
`9`	`10`
`10`	`11`	`public Entity() {}`
`11`	`12`
`@@ -19,7 +20,7 @@ public virtual string Name`
`19`	`20`	`get { return name; }`
`20`	`21`	`}`
`21`	`22`
`22`		`- public virtual IList Values`
	`23`	`+ public virtual IList<string> Values`
`23`	`24`	`{`
`24`	`25`	`get { return values; }`
`25`	`26`	`set { values = value; }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`		`-using System.Collections;`
	`1`	`+using System.Collections.Generic;`
	`2`	`+`
`2`	`3`	`namespace NHibernate.Test.UserCollection.Parameterized`
`3`	`4`	`{`
`4`		`- public interface IDefaultableList : IList`
	`5`	`+ public interface IDefaultableList : IList<string>`
`5`	`6`	`{`
`6`	`7`	`string DefaultValue { get;}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		`-using System.Collections;`
`2`		`-using NHibernate.Collection;`
	`1`	`+using System.Collections.Generic;`
	`2`	`+using NHibernate.Collection.Generic;`
`3`	`3`	`using NHibernate.Engine;`
`4`	`4`
`5`	`5`	`namespace NHibernate.Test.UserCollection.Parameterized`
`6`	`6`	`{`
`7`		`- public class PersistentDefaultableList: PersistentList, IDefaultableList`
	`7`	`+ public class PersistentDefaultableList: PersistentGenericList<string>, IDefaultableList`
`8`	`8`	`{`
`9`	`9`	`public PersistentDefaultableList() {}`
`10`	`10`
`11`	`11`	`public PersistentDefaultableList(ISessionImplementor session) : base(session) {}`
`12`	`12`
`13`		`- public PersistentDefaultableList(ISessionImplementor session, IList list) : base(session, list) {}`
	`13`	`+ public PersistentDefaultableList(ISessionImplementor session, IList<string> list) : base(session, list) {}`
`14`	`14`
`15`	`15`	`public string DefaultValue`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
`3`		`-using NHibernate.Collection;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using NHibernate.Collection.Generic;`
`4`	`4`	`using NHibernate.Engine;`
`5`	`5`
`6`	`6`	`namespace NHibernate.Test.UserCollection`
`7`	`7`	`{`
`8`		`- public class PersistentMylist : PersistentList`
	`8`	`+ public class PersistentMylist : PersistentGenericList<Email>`
`9`	`9`	`{`
`10`		`- public PersistentMylist(ISessionImplementor session, IList list) : base(session, list)`
	`10`	`+ public PersistentMylist(ISessionImplementor session, IList<Email> list) : base(session, list)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace NHibernate.Test.UserCollection`
`7`	`7`	`public class User`
`8`	`8`	`{`
`9`	`9`	`private string userName;`
`10`		`- private IList emailAddresses = new MyList();`
	`10`	`+ private IList<Email> emailAddresses = new MyList();`
`11`	`11`	`private ISet<object> sessionData = new HashSet<object>();`
`12`	`12`
`13`	`13`	`public string UserName`
`@@ -16,7 +16,7 @@ public string UserName`
`16`	`16`	`set { userName = value; }`
`17`	`17`	`}`
`18`	`18`
`19`		`- public IList EmailAddresses`
	`19`	`+ public IList<Email> EmailAddresses`
`20`	`20`	`{`
`21`	`21`	`get { return emailAddresses; }`
`22`	`22`	`set { emailAddresses = value; }`