Port more tests to avoid use of non-generic collections.

oskarb · oskarb · commit f44f84bf3e21 · 2013-03-08T13:56:29.000+01:00
diff --git a/src/NHibernate.DomainModel/Single.cs b/src/NHibernate.DomainModel/Single.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.DomainModel
 {
@@ -13,7 +13,7 @@ public class Single
 		private string _prop;
 		private string _string;
 		//<bag>
-		private IList _several = new ArrayList();
+		private IList<Several> _several = new List<Several>();
 
 		public string Id
 		{
@@ -33,7 +33,7 @@ public string String
 			set { _string = value; }
 		}
 
-		public IList Several
+		public IList<Several> Several
 		{
 			get { return _several; }
 			set { _several = value; }
diff --git a/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs b/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace NHibernate.Test.ExpressionTest.SubQueries
@@ -104,7 +103,7 @@ public class Post
 		private int post_id;
 		private Blog _blog;
 		private string post_title;
-		private IList _comments;
+		private IList<Comment> _comments;
 		private ISet<Category> categories = new HashSet<Category>();
 
 		public ISet<Category> Categories
@@ -113,7 +112,7 @@ public ISet<Category> Categories
 			set { categories = value; }
 		}
 
-		public virtual IList Comments
+		public virtual IList<Comment> Comments
 		{
 			get { return _comments; }
 			set { _comments = value; }
@@ -140,7 +139,7 @@ public virtual Blog Blog
 
 		public Post()
 		{
-			_comments = new ArrayList();
+			_comments = new List<Comment>();
 		}
 
 		public Post(string title)
diff --git a/src/NHibernate.Test/Interceptor/StatefulInterceptor.cs b/src/NHibernate.Test/Interceptor/StatefulInterceptor.cs
@@ -1,12 +1,13 @@
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Type;
 
 namespace NHibernate.Test.Interceptor
 {
 	public class StatefulInterceptor : EmptyInterceptor
 	{
 		private ISession session;
-		private readonly IList list = new ArrayList();
+		private readonly IList<Log> list = new List<Log>();
 
 		public override bool OnSave(object entity, object id, object[] state, string[] propertyNames, IType[] types)
 		{
@@ -17,19 +18,21 @@ public override bool OnSave(object entity, object id, object[] state, string[] p
 			return false;
 		}
 
-		public override bool OnFlushDirty(object entity, object id, object[] currentState, object[] previousState, string[] propertyNames, IType[] types)
+		public override bool OnFlushDirty(object entity, object id, object[] currentState, object[] previousState,
+		                                  string[] propertyNames, IType[] types)
 		{
-		if ( !(entity is Log) ) {
-			list.Add( new Log( "update", (string) id, entity.GetType().FullName ) );
-		}
-		return false;
+			if (!(entity is Log))
+			{
+				list.Add(new Log("update", (string) id, entity.GetType().FullName));
+			}
+			return false;
 		}
 
 		public override void PostFlush(ICollection entities)
 		{
 			if (list.Count > 0)
 			{
-				foreach (object iter in list)
+				foreach (Log iter in list)
 				{
 					session.Persist(iter);
 				}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/Fixture.cs
@@ -85,16 +85,12 @@ public void Can_discriminate_subclass_on_list_with_lazy_loading_when_used_get()
 				var personWithSivasKangals = session.Get<PersonWithSivasKangals>(4);
 
 				Assert.That(personWithAnimals.AnimalsGeneric,Has.Count.EqualTo(4));
-				Assert.That(personWithAnimals.AnimalsNonGeneric, Has.Count.EqualTo(4));
 
 				Assert.That(personWithCats.CatsGeneric, Has.Count.EqualTo(1));
-				Assert.That(personWithCats.CatsNonGeneric, Has.Count.EqualTo(1));
 
 				Assert.That(personWithDogs.DogsGeneric, Has.Count.EqualTo(2));
-				Assert.That(personWithDogs.DogsNonGeneric, Has.Count.EqualTo(2));
 
 				Assert.That(personWithSivasKangals.SivasKangalsGeneric, Has.Count.EqualTo(1));
-				Assert.That(personWithSivasKangals.SivasKangalsNonGeneric, Has.Count.EqualTo(1));
 			}
 		}
 	}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/Fixture2.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/Fixture2.cs
@@ -48,13 +48,9 @@ public void Can_discriminate_subclass_on_list_with_lazy_loading_when_used_and_pe
 			using (var tran = session.BeginTransaction())
 			{
 				var personWithAnimals = session.Get<PersonWithAllTypes>(1);
-				Assert.That(personWithAnimals.AnimalsNonGeneric, Has.Count.EqualTo(4));
 				Assert.That(personWithAnimals.AnimalsGeneric, Has.Count.EqualTo(4));
-				Assert.That(personWithAnimals.CatsNonGeneric, Has.Count.EqualTo(1));
 				Assert.That(personWithAnimals.CatsGeneric,Has.Count.EqualTo(1));
-				Assert.That(personWithAnimals.DogsNonGeneric, Has.Count.EqualTo(2));
 				Assert.That(personWithAnimals.DogsGeneric,Has.Count.EqualTo(2));
-				Assert.That(personWithAnimals.SivasKangalsNonGeneric, Has.Count.EqualTo(1));
 				Assert.That(personWithAnimals.SivasKangalsGeneric, Has.Count.EqualTo(1));
 			}
 		}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/NH1391/Mappings.hbm.xml
@@ -25,10 +25,6 @@
 		
 		<discriminator column="PersonType" type="int"/>
 		<property name="Name"/>
-		<bag name="AnimalsNonGeneric" lazy="true" inverse="true" cascade="save-update">
-			<key column="OwnerId" />
-			<one-to-many class="Animal"/>
-		</bag>
 		<bag name="AnimalsGeneric" lazy="true" inverse="true" cascade="save-update">
 			<key column="OwnerId" />
 			<one-to-many class="Animal"/>
@@ -41,56 +37,33 @@
 				<key column="OwnerId" />
 				<one-to-many class="Cat"/>
 			</bag>
-			<bag name="CatsNonGeneric" lazy="true" inverse="true" cascade="save-update">
-				<key column="OwnerId" />
-				<one-to-many class="Cat"/>
-			</bag>
 		</subclass>
 		<subclass name="PersonWithDogs" discriminator-value="3">
 			<bag name="DogsGeneric" lazy="true" inverse="true" cascade="save-update">
 				<key column="OwnerId" />
 				<one-to-many class="Dog"/>
 			</bag>
-			<bag name="DogsNonGeneric" lazy="true" inverse="true">
-				<key column="OwnerId" />
-				<one-to-many class="Dog"/>
-			</bag>
 		</subclass>
 		<subclass name="PersonWithSivasKangals" discriminator-value="4">
 			<bag name="SivasKangalsGeneric" lazy="true" inverse="true" cascade="save-update">
 				<key column="OwnerId" />
 				<one-to-many class="SivasKangal"/>
 			</bag>
-			<bag name="SivasKangalsNonGeneric" lazy="true" inverse="true">
-				<key column="OwnerId" />
-				<one-to-many class="SivasKangal"/>
-			</bag>
+
 		</subclass>
 		<subclass name="PersonWithAllTypes" discriminator-value="5">
 			<bag name="DogsGeneric" lazy="true" inverse="true">
 				<key column="OwnerId" />
 				<one-to-many class="Dog"/>
 			</bag>
-			<bag name="DogsNonGeneric" lazy="true" inverse="true">
-				<key column="OwnerId" />
-				<one-to-many class="Dog"/>
-			</bag>
 			<bag name="CatsGeneric" lazy="true" inverse="true">
 				<key column="OwnerId" />
 				<one-to-many class="Cat"/>
 			</bag>
-			<bag name="CatsNonGeneric" lazy="true" inverse="true">
-				<key column="OwnerId" />
-				<one-to-many class="Cat"/>
-			</bag>
 			<bag name="SivasKangalsGeneric" lazy="true" inverse="true">
 				<key column="OwnerId" />
 				<one-to-many class="SivasKangal"/>
 			</bag>
-			<bag name="SivasKangalsNonGeneric" lazy="true" inverse="true">
-				<key column="OwnerId" />
-				<one-to-many class="SivasKangal"/>
-			</bag>
 		</subclass>
 	</class>
 </hibernate-mapping>
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/Person.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
@@ -10,11 +9,9 @@ public class Person
 		public Person()
 		{
 			this.AnimalsGeneric = new List<Animal>();
-			this.AnimalsNonGeneric = new ArrayList();
 		}
 		public virtual int Id { get; set; }
 		public virtual string Name { get; set; }
 		public virtual IList<Animal> AnimalsGeneric { get; set; }
-		public virtual IList AnimalsNonGeneric { get; set; }
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAllTypes.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAllTypes.cs
@@ -6,11 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1391
 {
 	public class PersonWithAllTypes:Person
 	{
-		public virtual IList<Dog> DogsNonGeneric { get; set; }
-		public virtual IList<SivasKangal> SivasKangalsNonGeneric { get; set; }
-		public virtual IList<Cat> CatsNonGeneric { get; set; }
-
-
 		public virtual IList<Dog> DogsGeneric { get; set; }
 		public virtual IList<SivasKangal> SivasKangalsGeneric { get; set; }
 		public virtual IList<Cat> CatsGeneric { get; set; }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithCats.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithCats.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
@@ -10,9 +9,7 @@ public class PersonWithCats : Person
 		public PersonWithCats()
 		{
 			this.CatsGeneric = new List<Cat>();
-			this.CatsNonGeneric = new ArrayList();
 		}
-		public virtual IList CatsNonGeneric { get; set; }
 		public virtual IList<Cat> CatsGeneric { get; set; }
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithDogs.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithDogs.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
@@ -10,9 +9,7 @@ public class PersonWithDogs : Person
 		public PersonWithDogs()
 		{
 			this.DogsGeneric = new List<Dog>();
-			this.DogsNonGeneric = new ArrayList();
 		}
-		public virtual IList DogsNonGeneric { get; set; }
 		public virtual IList<Dog> DogsGeneric { get; set; }
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithSivasKangals.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithSivasKangals.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
@@ -10,9 +9,7 @@ public class PersonWithSivasKangals:Person
 		public PersonWithSivasKangals()
 		{
 			this.SivasKangalsGeneric = new List<SivasKangal>();
-			this.SivasKangalsNonGeneric = new ArrayList();
 		}
-		public virtual IList SivasKangalsNonGeneric { get; set; }
 		public virtual IList<SivasKangal> SivasKangalsGeneric { get; set; }
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1789/ProxyEqualityProblemTest.cs b/src/NHibernate.Test/NHSpecificTest/NH1789/ProxyEqualityProblemTest.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Proxy;
 using NUnit.Framework;
 
@@ -110,8 +111,7 @@ public void TestTheProblemWithCollection()
 				Assert.AreEqual(mauriceProxy.ID, mauriceNonProxy.ID, "The two objects should have the same ID");
 
 				//Ok now we add the proxy version into a collection:
-				var collection = new ArrayList();
-				collection.Add(mauriceProxy);
+				var collection = new List<ICat> {mauriceProxy};
 
 				//The proxy should be able to find itself:
 				Assert.IsTrue(collection.Contains(mauriceProxy), "The proxy should be present in the collection");
diff --git a/src/NHibernate.Test/NHSpecificTest/NH350/SecurityDomain.cs b/src/NHibernate.Test/NHSpecificTest/NH350/SecurityDomain.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.NHSpecificTest.NH350
 {
@@ -9,7 +9,7 @@ public class SecurityDomain
 		private string m_Name;
 
 		private SecurityDomain m_ParentDomain;
-		private IList m_ChildDomains;
+		private IList<SecurityDomain> m_ChildDomains;
 
 		public SecurityDomain()
 		{
@@ -33,13 +33,13 @@ public SecurityDomain ParentDomain
 			set { m_ParentDomain = value; }
 		}
 
-		public IList ChildDomains
+		public IList<SecurityDomain> ChildDomains
 		{
 			get
 			{
 				if (m_ChildDomains == null)
 				{
-					m_ChildDomains = new ArrayList();
+					m_ChildDomains = new List<SecurityDomain>();
 				}
 				return m_ChildDomains;
 			}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH464/PromotionWindow.cs b/src/NHibernate.Test/NHSpecificTest/NH464/PromotionWindow.cs
@@ -1,18 +1,18 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.NHSpecificTest.NH464
 {
 	public class PromotionWindow
 	{
-		private IList dates;
+		private IList<DateRange> dates;
 
 		public PromotionWindow()
 		{
-			this.dates = new ArrayList();
+			this.dates = new List<DateRange>();
 		}
 
-		public IList Dates
+		public IList<DateRange> Dates
 		{
 			get { return dates; }
 			set { dates = value; }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH508/User.cs b/src/NHibernate.Test/NHSpecificTest/NH508/User.cs
@@ -1,20 +1,20 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.NHSpecificTest.NH508
 {
 	public class User
 	{
 		private int userId;
 		private string login;
-		private IList friendList;
-		private IList friendOfList;
+		private IList<User> friendList;
+		private IList<User> friendOfList;
 
 		public User()
 		{
 			login = string.Empty;
-			friendList = new ArrayList();
-			friendOfList = new ArrayList();
+			friendList = new List<User>();
+			friendOfList = new List<User>();
 		}
 
 		public User(string login) : this()
@@ -34,13 +34,13 @@ public virtual string Login
 			set { login = value; }
 		}
 
-		public virtual IList FriendList
+		public virtual IList<User> FriendList
 		{
 			get { return friendList; }
 			set { friendList = value; }
 		}
 
-		public virtual IList FriendOfList
+		public virtual IList<User> FriendOfList
 		{
 			get { return friendOfList; }
 			set { friendOfList = value; }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH958/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH958/Person.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
	`2`	`+using System.Collections.Generic;`
`3`	`3`
`4`	`4`	`namespace NHibernate.DomainModel`
`5`	`5`	`{`
`@@ -13,7 +13,7 @@ public class Single`
`13`	`13`	`private string _prop;`
`14`	`14`	`private string _string;`
`15`	`15`	`//<bag>`
`16`		`- private IList _several = new ArrayList();`
	`16`	`+ private IList<Several> _several = new List<Several>();`
`17`	`17`
`18`	`18`	`public string Id`
`19`	`19`	`{`
`@@ -33,7 +33,7 @@ public string String`
`33`	`33`	`set { _string = value; }`
`34`	`34`	`}`
`35`	`35`
`36`		`- public IList Several`
	`36`	`+ public IList<Several> Several`
`37`	`37`	`{`
`38`	`38`	`get { return _several; }`
`39`	`39`	`set { _several = value; }`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`using System.Collections;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using NHibernate.Type;`
`3`	`4`
`4`	`5`	`namespace NHibernate.Test.Interceptor`
`5`	`6`	`{`
`6`	`7`	`public class StatefulInterceptor : EmptyInterceptor`
`7`	`8`	`{`
`8`	`9`	`private ISession session;`
`9`		`- private readonly IList list = new ArrayList();`
	`10`	`+ private readonly IList<Log> list = new List<Log>();`
`10`	`11`
`11`	`12`	`public override bool OnSave(object entity, object id, object[] state, string[] propertyNames, IType[] types)`
`12`	`13`	`{`
`@@ -17,19 +18,21 @@ public override bool OnSave(object entity, object id, object[] state, string[] p`
`17`	`18`	`return false;`
`18`	`19`	`}`
`19`	`20`
`20`		`- public override bool OnFlushDirty(object entity, object id, object[] currentState, object[] previousState, string[] propertyNames, IType[] types)`
	`21`	`+ public override bool OnFlushDirty(object entity, object id, object[] currentState, object[] previousState,`
	`22`	`+ string[] propertyNames, IType[] types)`
`21`	`23`	`{`
`22`		`- if ( !(entity is Log) ) {`
`23`		`- list.Add( new Log( "update", (string) id, entity.GetType().FullName ) );`
`24`		`- }`
`25`		`- return false;`
	`24`	`+ if (!(entity is Log))`
	`25`	`+ {`
	`26`	`+ list.Add(new Log("update", (string) id, entity.GetType().FullName));`
	`27`	`+ }`
	`28`	`+ return false;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`public override void PostFlush(ICollection entities)`
`29`	`32`	`{`
`30`	`33`	`if (list.Count > 0)`
`31`	`34`	`{`
`32`		`- foreach (object iter in list)`
	`35`	`+ foreach (Log iter in list)`
`33`	`36`	`{`
`34`	`37`	`session.Persist(iter);`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,12 @@ public void Can_discriminate_subclass_on_list_with_lazy_loading_when_used_get()`
`85`	`85`	`var personWithSivasKangals = session.Get<PersonWithSivasKangals>(4);`
`86`	`86`
`87`	`87`	`Assert.That(personWithAnimals.AnimalsGeneric,Has.Count.EqualTo(4));`
`88`		`- Assert.That(personWithAnimals.AnimalsNonGeneric, Has.Count.EqualTo(4));`
`89`	`88`
`90`	`89`	`Assert.That(personWithCats.CatsGeneric, Has.Count.EqualTo(1));`
`91`		`- Assert.That(personWithCats.CatsNonGeneric, Has.Count.EqualTo(1));`
`92`	`90`
`93`	`91`	`Assert.That(personWithDogs.DogsGeneric, Has.Count.EqualTo(2));`
`94`		`- Assert.That(personWithDogs.DogsNonGeneric, Has.Count.EqualTo(2));`
`95`	`92`
`96`	`93`	`Assert.That(personWithSivasKangals.SivasKangalsGeneric, Has.Count.EqualTo(1));`
`97`		`- Assert.That(personWithSivasKangals.SivasKangalsNonGeneric, Has.Count.EqualTo(1));`
`98`	`94`	`}`
`99`	`95`	`}`
`100`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,9 @@ public void Can_discriminate_subclass_on_list_with_lazy_loading_when_used_and_pe`
`48`	`48`	`using (var tran = session.BeginTransaction())`
`49`	`49`	`{`
`50`	`50`	`var personWithAnimals = session.Get<PersonWithAllTypes>(1);`
`51`		`- Assert.That(personWithAnimals.AnimalsNonGeneric, Has.Count.EqualTo(4));`
`52`	`51`	`Assert.That(personWithAnimals.AnimalsGeneric, Has.Count.EqualTo(4));`
`53`		`- Assert.That(personWithAnimals.CatsNonGeneric, Has.Count.EqualTo(1));`
`54`	`52`	`Assert.That(personWithAnimals.CatsGeneric,Has.Count.EqualTo(1));`
`55`		`- Assert.That(personWithAnimals.DogsNonGeneric, Has.Count.EqualTo(2));`
`56`	`53`	`Assert.That(personWithAnimals.DogsGeneric,Has.Count.EqualTo(2));`
`57`		`- Assert.That(personWithAnimals.SivasKangalsNonGeneric, Has.Count.EqualTo(1));`
`58`	`54`	`Assert.That(personWithAnimals.SivasKangalsGeneric, Has.Count.EqualTo(1));`
`59`	`55`	`}`
`60`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Text;`
`5`	`4`
`@@ -10,11 +9,9 @@ public class Person`
`10`	`9`	`public Person()`
`11`	`10`	`{`
`12`	`11`	`this.AnimalsGeneric = new List<Animal>();`
`13`		`- this.AnimalsNonGeneric = new ArrayList();`
`14`	`12`	`}`
`15`	`13`	`public virtual int Id { get; set; }`
`16`	`14`	`public virtual string Name { get; set; }`
`17`	`15`	`public virtual IList<Animal> AnimalsGeneric { get; set; }`
`18`		`- public virtual IList AnimalsNonGeneric { get; set; }`
`19`	`16`	`}`
`20`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1391`
`6`	`6`	`{`
`7`	`7`	`public class PersonWithAllTypes:Person`
`8`	`8`	`{`
`9`		`- public virtual IList<Dog> DogsNonGeneric { get; set; }`
`10`		`- public virtual IList<SivasKangal> SivasKangalsNonGeneric { get; set; }`
`11`		`- public virtual IList<Cat> CatsNonGeneric { get; set; }`
`12`		`-`
`13`		`-`
`14`	`9`	`public virtual IList<Dog> DogsGeneric { get; set; }`
`15`	`10`	`public virtual IList<SivasKangal> SivasKangalsGeneric { get; set; }`
`16`	`11`	`public virtual IList<Cat> CatsGeneric { get; set; }`