From: Michael D. <mik...@us...> - 2004-07-12 21:18:56
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/UtilityTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/UtilityTest Modified Files: IdentityMapFixture.cs Added Files: IdentityMapSequencedFixture.cs Log Message: Added another test fixture to test the Sequenced version of the IdentityMap. Index: IdentityMapFixture.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IdentityMapFixture.cs 28 Jun 2004 03:40:34 -0000 1.5 --- IdentityMapFixture.cs 12 Jul 2004 21:18:17 -0000 1.6 *************** *** 42,45 **** --- 42,49 ---- } + protected virtual IDictionary GetIdentityMap() + { + return IdentityMap.Instantiate(); + } /// <summary> *************** *** 50,55 **** public void AddNoHashCode() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(noHashCode1, value1); --- 54,58 ---- public void AddNoHashCode() { ! IDictionary map = GetIdentityMap(); map.Add(noHashCode1, value1); *************** *** 64,69 **** public void ConcurrentEntries() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(noHashCode1, value1); --- 67,71 ---- public void ConcurrentEntries() { ! IDictionary map = GetIdentityMap(); map.Add(noHashCode1, value1); *************** *** 99,104 **** object value4 = new object(); ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(noHashCode1, value1); map.Add(noHashCode2, value2); --- 101,105 ---- object value4 = new object(); ! IDictionary map = GetIdentityMap(); map.Add(noHashCode1, value1); map.Add(noHashCode2, value2); *************** *** 128,133 **** public void AddValueTypeException() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); int intKey = 3; object objectValue = new object(); --- 129,133 ---- public void AddValueTypeException() { ! IDictionary map = GetIdentityMap(); int intKey = 3; object objectValue = new object(); *************** *** 139,144 **** public void Count() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(new object(), new object()); map.Add(new object(), new object()); --- 139,143 ---- public void Count() { ! IDictionary map = GetIdentityMap(); map.Add(new object(), new object()); map.Add(new object(), new object()); *************** *** 155,160 **** public void ContainsSameObjectByRef() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); MutableHashCode item1Copy = item1; --- 154,158 ---- public void ContainsSameObjectByRef() { ! IDictionary map = GetIdentityMap(); MutableHashCode item1Copy = item1; *************** *** 174,179 **** public void ContainsSameObjectWithDiffEquals() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(item1, new object()); --- 172,176 ---- public void ContainsSameObjectWithDiffEquals() { ! IDictionary map = GetIdentityMap(); map.Add(item1, new object()); *************** *** 192,197 **** public void ContainsDiffObjectWithEquals() { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); item1.HashCodeField = 4; item2.HashCodeField = 4; --- 189,193 ---- public void ContainsDiffObjectWithEquals() { ! IDictionary map = GetIdentityMap(); item1.HashCodeField = 4; item2.HashCodeField = 4; *************** *** 212,217 **** public void SetItemChangedHashCodeTwice() { ! //IDictionary actualMap = IdentityMap.Instantiate(); ! IDictionary actualMap = IdentityMap.InstantiateSequenced(); actualMap[item1] = value1; --- 208,212 ---- public void SetItemChangedHashCodeTwice() { ! IDictionary actualMap = GetIdentityMap(); actualMap[item1] = value1; *************** *** 230,235 **** public void SetItemsEqualHashCodeDiffIdentity() { ! //IDictionary actualMap = IdentityMap.Instantiate(); ! IDictionary actualMap = IdentityMap.InstantiateSequenced(); IDictionary normalMap = new Hashtable(); --- 225,229 ---- public void SetItemsEqualHashCodeDiffIdentity() { ! IDictionary actualMap = GetIdentityMap(); IDictionary normalMap = new Hashtable(); *************** *** 260,265 **** { ! //IDictionary map = IdentityMap.Instantiate(); ! IDictionary map = IdentityMap.InstantiateSequenced(); map.Add(item1, value1); map.Add(item2, value2); --- 254,258 ---- { ! IDictionary map = GetIdentityMap(); map.Add(item1, value1); map.Add(item2, value2); --- NEW FILE: IdentityMapSequencedFixture.cs --- using System; using System.Collections; using NHibernate.Util; using NUnit.Framework; namespace NHibernate.Test.UtilityTest { /// <summary> /// Tests a Sequenced Identity Map. /// </summary> [TestFixture] public class IdentityMapSequencedFixture : IdentityMapFixture { protected override IDictionary GetIdentityMap() { return IdentityMap.InstantiateSequenced(); } } } |