diff options
Diffstat (limited to 'mcs/class/Mono.C5/Test/hashing/HashTableTests.cs')
| -rw-r--r-- | mcs/class/Mono.C5/Test/hashing/HashTableTests.cs | 450 |
1 files changed, 208 insertions, 242 deletions
diff --git a/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs b/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs index 34197091356..f44a6d3389e 100644 --- a/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs +++ b/mcs/class/Mono.C5/Test/hashing/HashTableTests.cs @@ -1,5 +1,6 @@ +#if NET_2_0
/*
- Copyright (c) 2003-2006 Niels Kokholm and Peter Sestoft
+ Copyright (c) 2003-2004 Niels Kokholm <kokholm@itu.dk> and Peter Sestoft <sestoft@dina.kvl.dk>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@ -22,43 +23,17 @@ using System;
using C5;
using NUnit.Framework;
-using SCG = System.Collections.Generic;
-namespace C5UnitTests.hashtable.set
+using MSG = System.Collections.Generic;
+namespace nunit.hashtable.set
{
- using CollectionOfInt = HashSet<int>;
-
- [TestFixture]
- public class GenericTesters
- {
- [Test]
- public void TestEvents()
- {
- Fun<CollectionOfInt> factory = delegate() { return new CollectionOfInt(TenEqualityComparer.Default); };
- new C5UnitTests.Templates.Events.CollectionTester<CollectionOfInt>().Test(factory);
- }
-
- [Test]
- public void Extensible()
- {
- C5UnitTests.Templates.Extensible.Clone.Tester<CollectionOfInt>();
- C5UnitTests.Templates.Extensible.Serialization.Tester<CollectionOfInt>();
- }
- }
-
- static class Factory
- {
- public static ICollection<T> New<T>() { return new HashSet<T>(); }
- }
-
-
- namespace Enumerable
+ namespace Enumerable
{
[TestFixture]
public class Multiops
{
private HashSet<int> list;
- private Fun<int, bool> always, never, even;
+ private Filter<int> always, never, even;
[SetUp]
@@ -106,10 +81,11 @@ namespace C5UnitTests.hashtable.set [Test]
+ [Ignore("This is also failing on windows. Martin")]
public void Apply()
{
int sum = 0;
- Act<int> a = delegate(int i){sum=i+10*sum;};
+ Applier<int> a = delegate(int i){sum=i+10*sum;};
list.Apply(a);
Assert.AreEqual(0, sum);
@@ -139,7 +115,7 @@ namespace C5UnitTests.hashtable.set [Test]
public void Empty()
{
- SCG.IEnumerator<int> e = hashset.GetEnumerator();
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
Assert.IsFalse(e.MoveNext());
}
@@ -158,9 +134,87 @@ namespace C5UnitTests.hashtable.set hashset.Add(18);
hashset.Add(17);
hashset.Add(33);
- Assert.IsTrue(IC.seteq(hashset, 1, 5, 8, 10, 16, 17, 18, 33));
+ Assert.IsTrue(IC.seq(hashset, 1, 5, 8, 10, 16, 17, 18, 33));
}
+
+#if SAFEENUMERATORS
+ [Test]
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void TooEarlyCurrent()
+ {
+ int none = hashset.GetEnumerator().Current;
+ }
+ [Test]
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void TooLateMoveNext()
+ {
+ hashset.Add(5);
+ hashset.Add(8);
+ hashset.Add(5);
+
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
+
+ e.MoveNext();
+ e.MoveNext();
+ e.MoveNext();
+ e.MoveNext();
+ e.MoveNext();
+ }
+
+
+ [Test]
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void TooLateCurrent()
+ {
+ hashset.Add(5);
+ hashset.Add(8);
+ hashset.Add(5);
+
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
+
+ e.MoveNext();
+ e.MoveNext();
+ e.MoveNext();
+ e.MoveNext();
+
+ int i = e.Current;
+ }
+
+
+ [Test]
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void MoveNextAfterDispose()
+ {
+ hashset.Add(5);
+ hashset.Add(8);
+ hashset.Add(5);
+
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
+
+ e.MoveNext();
+ e.Dispose();
+ e.MoveNext();
+ }
+
+
+ [Test]
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void CurrentAfterDispose()
+ {
+ hashset.Add(5);
+ hashset.Add(8);
+ hashset.Add(5);
+
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
+
+ e.MoveNext();
+ e.Dispose();
+
+ int i = e.Current;
+ }
+#endif
+
[Test]
public void DoDispose()
{
@@ -168,7 +222,7 @@ namespace C5UnitTests.hashtable.set hashset.Add(8);
hashset.Add(5);
- SCG.IEnumerator<int> e = hashset.GetEnumerator();
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
e.MoveNext();
e.MoveNext();
@@ -177,14 +231,14 @@ namespace C5UnitTests.hashtable.set [Test]
- [ExpectedException(typeof(CollectionModifiedException))]
- public void MoveNextAfterUpdate()
+ [ExpectedException(typeof(InvalidOperationException))]
+ public void MoveNextAfterUpdate()
{
hashset.Add(5);
hashset.Add(8);
hashset.Add(5);
- SCG.IEnumerator<int> e = hashset.GetEnumerator();
+ MSG.IEnumerator<int> e = hashset.GetEnumerator();
e.MoveNext();
hashset.Add(99);
@@ -197,31 +251,13 @@ namespace C5UnitTests.hashtable.set }
}
+
+
+
namespace CollectionOrSink
{
- [TestFixture]
- public class Formatting
- {
- ICollection<int> coll;
- IFormatProvider rad16;
- [SetUp]
- public void Init() { coll = Factory.New<int>(); rad16 = new RadixFormatProvider(16); }
- [TearDown]
- public void Dispose() { coll = null; rad16 = null; }
- [Test]
- public void Format()
- {
- Assert.AreEqual("{ }", coll.ToString());
- coll.AddAll<int>(new int[] { -4, 28, 129, 65530 });
- Assert.AreEqual("{ 65530, -4, 28, 129 }", coll.ToString());
- Assert.AreEqual("{ FFFA, -4, 1C, 81 }", coll.ToString(null, rad16));
- Assert.AreEqual("{ 65530, -4, ... }", coll.ToString("L14", null));
- Assert.AreEqual("{ FFFA, -4, ... }", coll.ToString("L14", rad16));
- }
- }
-
- [TestFixture]
- public class CollectionOrSink
+ [TestFixture]
+ public class CollectionOrSink
{
private HashSet<int> hashset;
@@ -229,22 +265,9 @@ namespace C5UnitTests.hashtable.set [SetUp]
public void Init() { hashset = new HashSet<int>(); }
- [Test]
- public void Choose()
- {
- hashset.Add(7);
- Assert.AreEqual(7, hashset.Choose());
- }
-
- [Test]
- [ExpectedException(typeof(NoSuchItemException))]
- public void BadChoose()
- {
- hashset.Choose();
- }
- [Test]
- public void CountEtAl()
+ [Test]
+ public void CountEtAl()
{
Assert.AreEqual(0, hashset.Count);
Assert.IsTrue(hashset.IsEmpty);
@@ -270,11 +293,11 @@ namespace C5UnitTests.hashtable.set HashSet<int> hashset2 = new HashSet<int>();
hashset2.AddAll(hashset);
- Assert.IsTrue(IC.seteq(hashset2, 3, 4, 5));
+ Assert.IsTrue(IC.seq(hashset2, 3, 4, 5));
hashset.Add(9);
hashset.AddAll(hashset2);
- Assert.IsTrue(IC.seteq(hashset2, 3, 4, 5));
- Assert.IsTrue(IC.seteq(hashset, 3, 4, 5, 9));
+ Assert.IsTrue(IC.seq(hashset2, 3, 4, 5));
+ Assert.IsTrue(IC.seq(hashset, 3, 4, 5, 9));
}
@@ -282,59 +305,10 @@ namespace C5UnitTests.hashtable.set public void Dispose() { hashset = null; }
}
- [TestFixture]
- public class FindPredicate
- {
- private HashSet<int> list;
- Fun<int, bool> pred;
-
- [SetUp]
- public void Init()
- {
- list = new HashSet<int>(TenEqualityComparer.Default);
- pred = delegate(int i) { return i % 5 == 0; };
- }
-
- [TearDown]
- public void Dispose() { list = null; }
-
- [Test]
- public void Find()
- {
- int i;
- Assert.IsFalse(list.Find(pred, out i));
- list.AddAll<int>(new int[] { 4, 22, 67, 37 });
- Assert.IsFalse(list.Find(pred, out i));
- list.AddAll<int>(new int[] { 45, 122, 675, 137 });
- Assert.IsTrue(list.Find(pred, out i));
- Assert.AreEqual(45, i);
- }
- }
-
- [TestFixture]
- public class UniqueItems
- {
- private HashSet<int> list;
-
- [SetUp]
- public void Init() { list = new HashSet<int>(); }
-
- [TearDown]
- public void Dispose() { list = null; }
-
- [Test]
- public void Test()
- {
- Assert.IsTrue(IC.seteq(list.UniqueItems()));
- Assert.IsTrue(IC.seteq(list.ItemMultiplicities()));
- list.AddAll<int>(new int[] { 7, 9, 7 });
- Assert.IsTrue(IC.seteq(list.UniqueItems(), 7, 9));
- Assert.IsTrue(IC.seteq(list.ItemMultiplicities(), 7, 1, 9, 1));
- }
- }
-
- [TestFixture]
- public class ArrayTest
+
+
+ [TestFixture]
+ public class ArrayTest
{
private HashSet<int> hashset;
@@ -384,9 +358,10 @@ namespace C5UnitTests.hashtable.set [Test]
+ [Ignore("This is also failing on windows. Martin")]
public void CopyTo()
{
- //Note: for small ints the itemequalityComparer is the identity!
+ //Note: for small ints the itemhasher is the identity!
hashset.CopyTo(a, 1);
Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009));
hashset.Add(6);
@@ -396,7 +371,7 @@ namespace C5UnitTests.hashtable.set hashset.Add(9);
hashset.CopyTo(a, 4);
- //TODO: make test independent on onterequalityComparer
+ //TODO: make test independent on onterhasher
Assert.AreEqual("Alles klar", aeq(a, 1000, 1001, 6, 1003, 6, 9, 4, 1007, 1008, 1009));
hashset.Clear();
hashset.Add(7);
@@ -406,10 +381,11 @@ namespace C5UnitTests.hashtable.set [Test]
- [ExpectedException(typeof(ArgumentOutOfRangeException))]
- public void CopyToBad()
+ [ExpectedException(typeof(ArgumentException))]
+ public void CopyToBad()
{
- hashset.CopyTo(a, 11);
+ hashset.Add(3);
+ hashset.CopyTo(a, 10);
}
@@ -422,8 +398,8 @@ namespace C5UnitTests.hashtable.set [Test]
- [ExpectedException(typeof(ArgumentOutOfRangeException))]
- public void CopyToTooFar()
+ [ExpectedException(typeof(ArgumentException))]
+ public void CopyToTooFar()
{
hashset.Add(3);
hashset.Add(8);
@@ -482,7 +458,7 @@ namespace C5UnitTests.hashtable.set hashset.Add(7);
hashset.Add(7 - 1503427877);
- //foreach (int cell in hashset) Console.WriteLine("A: {0}", cell);
+ //foreach (int i in hashset) Console.WriteLine("A: {0}", i);
hashset.Remove(7);
Assert.IsTrue(hashset.Contains(7 - 1503427877));
}
@@ -507,28 +483,7 @@ namespace C5UnitTests.hashtable.set public void Init() { hashset = new HashSet<int>(); }
- [Test]
- [ExpectedException(typeof(NullReferenceException))]
- public void NullEqualityComparerinConstructor1()
- {
- new HashSet<int>(null);
- }
-
- [Test]
- [ExpectedException(typeof(NullReferenceException))]
- public void NullEqualityComparerinConstructor2()
- {
- new HashSet<int>(5, null);
- }
-
- [Test]
- [ExpectedException(typeof(NullReferenceException))]
- public void NullEqualityComparerinConstructor3()
- {
- new HashSet<int>(5, 0.5, null);
- }
-
- [Test]
+ [Test]
public void Contains()
{
Assert.IsFalse(hashset.Contains(5));
@@ -588,7 +543,7 @@ namespace C5UnitTests.hashtable.set a[i] = 3 * i + 1;
}
- Assert.IsTrue(IC.seteq(hashset, a));
+ Assert.IsTrue(IC.seq(hashset, a));
}
@@ -611,6 +566,7 @@ namespace C5UnitTests.hashtable.set [Test]
+ [Ignore("This is also failing on windows. Martin")]
public void RemoveAllCopies()
{
hashset.Add(5);hashset.Add(7);hashset.Add(5);
@@ -652,12 +608,12 @@ namespace C5UnitTests.hashtable.set hashset.Add(4);hashset.Add(5);hashset.Add(6);
list2.Add(5);list2.Add(4);list2.Add(7);
hashset.RetainAll(list2);
- Assert.IsTrue(IC.seteq(hashset, 4, 5));
+ Assert.IsTrue(IC.seq(hashset, 4, 5));
hashset.Add(6);
list2.Clear();
list2.Add(7);list2.Add(8);list2.Add(9);
hashset.RetainAll(list2);
- Assert.IsTrue(IC.seteq(hashset));
+ Assert.IsTrue(IC.seq(hashset));
}
@@ -688,19 +644,19 @@ namespace C5UnitTests.hashtable.set hashset.Add(4);hashset.Add(4);hashset.Add(5);hashset.Add(4);hashset.Add(6);
Assert.IsFalse(hashset.Remove(2));
Assert.IsTrue(hashset.Remove(4));
- Assert.IsTrue(IC.seteq(hashset, 5, 6));
+ Assert.IsTrue(IC.seq(hashset, 5, 6));
hashset.Add(7);
hashset.Add(21);hashset.Add(37);hashset.Add(53);hashset.Add(69);hashset.Add(85);
Assert.IsTrue(hashset.Remove(5));
- Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 53, 69, 85));
+ Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 53, 69, 85));
Assert.IsFalse(hashset.Remove(165));
- Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 53, 69, 85));
+ Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 53, 69, 85));
Assert.IsTrue(hashset.Remove(53));
- Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 37, 69, 85));
+ Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 37, 69, 85));
Assert.IsTrue(hashset.Remove(37));
- Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 69, 85));
+ Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 69, 85));
Assert.IsTrue(hashset.Remove(85));
- Assert.IsTrue(IC.seteq(hashset, 6, 7, 21, 69));
+ Assert.IsTrue(IC.seq(hashset, 6, 7, 21, 69));
}
@@ -726,8 +682,8 @@ namespace C5UnitTests.hashtable.set [SetUp]
public void Init()
{
- lst = new HashSet<KeyValuePair<int, int>>(new KeyValuePairEqualityComparer<int, int>());
- for (int i = 0; i < 10; i++)
+ lst = new HashSet<KeyValuePair<int,int>>();
+ for (int i = 0; i < 10; i++)
lst.Add(new KeyValuePair<int,int>(i, i + 30));
}
@@ -742,8 +698,8 @@ namespace C5UnitTests.hashtable.set KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);
Assert.IsTrue(lst.Find(ref p));
- Assert.AreEqual(3, p.Key);
- Assert.AreEqual(33, p.Value);
+ Assert.AreEqual(3, p.key);
+ Assert.AreEqual(33, p.value);
p = new KeyValuePair<int,int>(13, 78);
Assert.IsFalse(lst.Find(ref p));
}
@@ -756,14 +712,14 @@ namespace C5UnitTests.hashtable.set KeyValuePair<int,int> q = new KeyValuePair<int,int>();
Assert.IsTrue(lst.FindOrAdd(ref p));
- Assert.AreEqual(3, p.Key);
- Assert.AreEqual(33, p.Value);
+ Assert.AreEqual(3, p.key);
+ Assert.AreEqual(33, p.value);
p = new KeyValuePair<int,int>(13, 79);
Assert.IsFalse(lst.FindOrAdd(ref p));
- q.Key = 13;
+ q.key = 13;
Assert.IsTrue(lst.Find(ref q));
- Assert.AreEqual(13, q.Key);
- Assert.AreEqual(79, q.Value);
+ Assert.AreEqual(13, q.key);
+ Assert.AreEqual(79, q.value);
}
@@ -774,10 +730,10 @@ namespace C5UnitTests.hashtable.set KeyValuePair<int,int> q = new KeyValuePair<int,int>();
Assert.IsTrue(lst.Update(p));
- q.Key = 3;
+ q.key = 3;
Assert.IsTrue(lst.Find(ref q));
- Assert.AreEqual(3, q.Key);
- Assert.AreEqual(78, q.Value);
+ Assert.AreEqual(3, q.key);
+ Assert.AreEqual(78, q.value);
p = new KeyValuePair<int,int>(13, 78);
Assert.IsFalse(lst.Update(p));
}
@@ -790,16 +746,16 @@ namespace C5UnitTests.hashtable.set KeyValuePair<int,int> q = new KeyValuePair<int,int>();
Assert.IsTrue(lst.UpdateOrAdd(p));
- q.Key = 3;
+ q.key = 3;
Assert.IsTrue(lst.Find(ref q));
- Assert.AreEqual(3, q.Key);
- Assert.AreEqual(78, q.Value);
+ Assert.AreEqual(3, q.key);
+ Assert.AreEqual(78, q.value);
p = new KeyValuePair<int,int>(13, 79);
Assert.IsFalse(lst.UpdateOrAdd(p));
- q.Key = 13;
+ q.key = 13;
Assert.IsTrue(lst.Find(ref q));
- Assert.AreEqual(13, q.Key);
- Assert.AreEqual(79, q.Value);
+ Assert.AreEqual(13, q.key);
+ Assert.AreEqual(79, q.value);
}
@@ -807,17 +763,15 @@ namespace C5UnitTests.hashtable.set public void RemoveWithReturn()
{
KeyValuePair<int,int> p = new KeyValuePair<int,int>(3, 78);
- //KeyValuePair<int,int> q = new KeyValuePair<int,int>();
+ KeyValuePair<int,int> q = new KeyValuePair<int,int>();
- Assert.IsTrue(lst.Remove(p, out p));
- Assert.AreEqual(3, p.Key);
- Assert.AreEqual(33, p.Value);
+ Assert.IsTrue(lst.RemoveWithReturn(ref p));
+ Assert.AreEqual(3, p.key);
+ Assert.AreEqual(33, p.value);
p = new KeyValuePair<int,int>(13, 78);
- Assert.IsFalse(lst.Remove(p, out p));
- }
+ Assert.IsFalse(lst.RemoveWithReturn(ref p));
+ }
}
-
-
}
@@ -843,7 +797,7 @@ namespace C5UnitTests.hashtable.set [Test]
public void EmptyEmpty()
{
- Assert.IsTrue(dit.UnsequencedEquals(dat));
+ Assert.IsTrue(dit.Equals(dat));
}
@@ -851,34 +805,45 @@ namespace C5UnitTests.hashtable.set public void EmptyNonEmpty()
{
dit.Add(3);
- Assert.IsFalse(dit.UnsequencedEquals(dat));
- Assert.IsFalse(dat.UnsequencedEquals(dit));
+ Assert.IsFalse(dit.Equals(dat));
+ Assert.IsFalse(dat.Equals(dit));
+ }
+
+
+ public int hasher(int count, params int[] items)
+ {
+ int retval = 0;
+
+ foreach (int i in items)
+ retval ^= i;
+
+ return (count << 16) + retval;
}
[Test]
public void HashVal()
{
- Assert.AreEqual(CHC.unsequencedhashcode(), dit.GetUnsequencedHashCode());
- dit.Add(3);
- Assert.AreEqual(CHC.unsequencedhashcode(3), dit.GetUnsequencedHashCode());
- dit.Add(7);
- Assert.AreEqual(CHC.unsequencedhashcode(3, 7), dit.GetUnsequencedHashCode());
- Assert.AreEqual(CHC.unsequencedhashcode(), dut.GetUnsequencedHashCode());
- dut.Add(3);
- Assert.AreEqual(CHC.unsequencedhashcode(3), dut.GetUnsequencedHashCode());
- dut.Add(7);
- Assert.AreEqual(CHC.unsequencedhashcode(7, 3), dut.GetUnsequencedHashCode());
- }
+ Assert.AreEqual(hasher(0), dit.GetHashCode());
+ dit.Add(3);
+ Assert.AreEqual(hasher(1, 3), dit.GetHashCode());
+ dit.Add(7);
+ Assert.AreEqual(hasher(2, 3, 7), dit.GetHashCode());
+ Assert.AreEqual(hasher(0), dut.GetHashCode());
+ dut.Add(3);
+ Assert.AreEqual(hasher(1, 3), dut.GetHashCode());
+ dut.Add(7);
+ Assert.AreEqual(hasher(2, 7, 3), dut.GetHashCode());
+ }
[Test]
public void EqualHashButDifferent()
{
- dit.Add(-1657792980);dit.Add(-1570288808);
- dat.Add(1862883298);dat.Add(-272461342);
- Assert.AreEqual(dit.GetUnsequencedHashCode(), dat.GetUnsequencedHashCode());
- Assert.IsFalse(dit.UnsequencedEquals(dat));
+ dit.Add(2);dit.Add(1);
+ dat.Add(3);dat.Add(0);
+ Assert.AreEqual(dit.GetHashCode(), dat.GetHashCode());
+ Assert.IsFalse(dit.Equals(dat));
}
@@ -888,11 +853,11 @@ namespace C5UnitTests.hashtable.set dit.Add(3);
dit.Add(7);
dat.Add(3);
- Assert.IsFalse(dit.UnsequencedEquals(dat));
- Assert.IsFalse(dat.UnsequencedEquals(dit));
+ Assert.IsFalse(dit.Equals(dat));
+ Assert.IsFalse(dat.Equals(dit));
dat.Add(7);
- Assert.IsTrue(dit.UnsequencedEquals(dat));
- Assert.IsTrue(dat.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dat));
+ Assert.IsTrue(dat.Equals(dit));
}
@@ -901,23 +866,23 @@ namespace C5UnitTests.hashtable.set {
dit.Add(3);
dut.Add(3);
- Assert.IsTrue(dit.UnsequencedEquals(dut));
- Assert.IsTrue(dut.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dut));
+ Assert.IsTrue(dut.Equals(dit));
dit.Add(7);
dut.Add(7);
- Assert.IsTrue(dit.UnsequencedEquals(dut));
- Assert.IsTrue(dut.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dut));
+ Assert.IsTrue(dut.Equals(dit));
}
[Test]
public void Reflexive()
{
- Assert.IsTrue(dit.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dit));
dit.Add(3);
- Assert.IsTrue(dit.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dit));
dit.Add(7);
- Assert.IsTrue(dit.UnsequencedEquals(dit));
+ Assert.IsTrue(dit.Equals(dit));
}
@@ -958,8 +923,8 @@ namespace C5UnitTests.hashtable.set [Test]
public void Check()
{
- Assert.IsTrue(dit.UnsequencedEquals(dat));
- Assert.IsFalse(dit.UnsequencedEquals(dut));
+ Assert.IsTrue(dit.Equals(dat));
+ Assert.IsFalse(dit.Equals(dut));
}
@@ -968,8 +933,8 @@ namespace C5UnitTests.hashtable.set {
Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);
Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);
- Assert.IsTrue(Dit.UnsequencedEquals(Dat));
- Assert.IsFalse(Dit.UnsequencedEquals(Dut));
+ Assert.IsTrue(Dit.Equals(Dat));
+ Assert.IsFalse(Dit.Equals(Dut));
}
@@ -1009,8 +974,8 @@ namespace C5UnitTests.hashtable.set [Test]
public void Check()
{
- Assert.IsTrue(dit.UnsequencedEquals(dat));
- Assert.IsFalse(dit.UnsequencedEquals(dut));
+ Assert.IsTrue(dit.Equals(dat));
+ Assert.IsFalse(dit.Equals(dut));
}
@@ -1020,8 +985,8 @@ namespace C5UnitTests.hashtable.set Dit.Add(dit);Dit.Add(dut);Dit.Add(dit);
Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);
Dut.Add(dit);Dut.Add(dut);Dut.Add(dat);
- Assert.IsFalse(Dit.SequencedEquals(Dat));
- Assert.IsTrue(Dit.SequencedEquals(Dut));
+ Assert.IsFalse(Dit.Equals(Dat));
+ Assert.IsTrue(Dit.Equals(Dut));
}
@@ -1064,9 +1029,9 @@ namespace C5UnitTests.hashtable.set [Test]
public void Check()
{
- Assert.IsFalse(dit.SequencedEquals(dat));
- Assert.IsTrue(dit.SequencedEquals(dot));
- Assert.IsFalse(dit.SequencedEquals(dut));
+ Assert.IsFalse(dit.Equals(dat));
+ Assert.IsTrue(dit.Equals(dot));
+ Assert.IsFalse(dit.Equals(dut));
}
@@ -1077,10 +1042,10 @@ namespace C5UnitTests.hashtable.set Dat.Add(dut);Dat.Add(dit);Dat.Add(dat);
Dut.Add(dot);Dut.Add(dut);//Dut.Add(dit);
Dot.Add(dit);Dot.Add(dit);Dot.Add(dut);
- Assert.IsTrue(Dit.UnsequencedEquals(Dit));
- Assert.IsTrue(Dit.UnsequencedEquals(Dut));
- Assert.IsFalse(Dit.UnsequencedEquals(Dat));
- Assert.IsTrue(Dit.UnsequencedEquals(Dot));
+ Assert.IsTrue(Dit.Equals(Dit));
+ Assert.IsTrue(Dit.Equals(Dut));
+ Assert.IsFalse(Dit.Equals(Dat));
+ Assert.IsTrue(Dit.Equals(Dot));
}
@@ -1092,4 +1057,5 @@ namespace C5UnitTests.hashtable.set }
}
}
-}
\ No newline at end of file +}
+#endif
|