Skip to content

Commit 0a364ec

Browse files
committed
fixed tests
1 parent 411cd04 commit 0a364ec

File tree

1 file changed

+37
-30
lines changed

1 file changed

+37
-30
lines changed

src/NHibernate.Test/NHSpecificTest/NH3957/ResultTransformerEqualityFixture.cs

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ public void AliasToEntityMapEquality()
1818
{
1919
var transf1 = new AliasToEntityMapResultTransformer();
2020
var transf2 = new AliasToEntityMapResultTransformer();
21-
var custom = new CustomAliasToEntityMapResultTransformer();
22-
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, custom, };
21+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
2322

24-
Assert.That(set.Count, Is.EqualTo(2));
23+
Assert.That(set.Count, Is.EqualTo(1));
2524
Assert.IsTrue(transf1.Equals(transf2));
2625
Assert.IsTrue(transf2.Equals(transf1));
27-
Assert.False(custom.Equals(transf1));
28-
Assert.False(transf1.Equals(custom));
2926
}
3027

3128
[Test]
3229
public void AliasToEntityMapAndDistinctRootEntityInequality()
3330
{
3431
var transf1 = new AliasToEntityMapResultTransformer();
35-
var transf2 = new DistinctRootEntityResultTransformer();
32+
var transf2 = new CustomAliasToEntityMapResultTransformer();
33+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
3634

35+
Assert.That(transf1.GetHashCode(), Is.EqualTo(transf2.GetHashCode()), "prerequisite");
36+
Assert.That(set.Count, Is.EqualTo(2));
3737
Assert.IsFalse(transf1.Equals(transf2));
3838
Assert.IsFalse(transf2.Equals(transf1));
3939
}
@@ -44,14 +44,24 @@ public void DistinctRootEntityEquality()
4444
{
4545
var transf1 = new DistinctRootEntityResultTransformer();
4646
var transf2 = new DistinctRootEntityResultTransformer();
47-
var custom = new CustomDistinctRootEntityResultTransformer();
48-
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, custom, };
47+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
4948

50-
Assert.That(set.Count, Is.EqualTo(2));
49+
Assert.That(set.Count, Is.EqualTo(1));
5150
Assert.IsTrue(transf1.Equals(transf2));
5251
Assert.IsTrue(transf2.Equals(transf1));
53-
Assert.False(custom.Equals(transf1));
54-
Assert.False(transf1.Equals(custom));
52+
}
53+
54+
[Test]
55+
public void DistinctRootEntityEqualityInequality()
56+
{
57+
var transf1 = new DistinctRootEntityResultTransformer();
58+
var transf2 = new CustomDistinctRootEntityResultTransformer();
59+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
60+
61+
Assert.That(transf1.GetHashCode(), Is.EqualTo(transf2.GetHashCode()), "prerequisite");
62+
Assert.That(set.Count, Is.EqualTo(2));
63+
Assert.IsFalse(transf1.Equals(transf2));
64+
Assert.IsFalse(transf2.Equals(transf1));
5565
}
5666

5767
// Non reg test case
@@ -60,22 +70,22 @@ public void PassThroughEquality()
6070
{
6171
var transf1 = new PassThroughResultTransformer();
6272
var transf2 = new PassThroughResultTransformer();
63-
var custom = new CustomPassThroughResultTransformer();
64-
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, custom, };
73+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
6574

66-
Assert.That(set.Count, Is.EqualTo(2));
75+
Assert.That(set.Count, Is.EqualTo(1));
6776
Assert.IsTrue(transf1.Equals(transf2));
6877
Assert.IsTrue(transf2.Equals(transf1));
69-
Assert.False(custom.Equals(transf1));
70-
Assert.False(transf1.Equals(custom));
7178
}
7279

7380
[Test]
7481
public void PassThroughAndRootEntityInequality()
7582
{
7683
var transf1 = new PassThroughResultTransformer();
77-
var transf2 = new RootEntityResultTransformer();
78-
84+
var transf2 = new CustomPassThroughResultTransformer();
85+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
86+
87+
Assert.That(transf1.GetHashCode(), Is.EqualTo(transf2.GetHashCode()), "prerequisite");
88+
Assert.That(set.Count, Is.EqualTo(2));
7989
Assert.IsFalse(transf1.Equals(transf2));
8090
Assert.IsFalse(transf2.Equals(transf1));
8191
}
@@ -86,22 +96,22 @@ public void RootEntityEquality()
8696
{
8797
var transf1 = new RootEntityResultTransformer();
8898
var transf2 = new RootEntityResultTransformer();
89-
var custom = new CustomRootEntityResultTransformer();
90-
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, custom, };
99+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
91100

92-
Assert.That(set.Count, Is.EqualTo(2));
101+
Assert.That(set.Count, Is.EqualTo(1));
93102
Assert.IsTrue(transf1.Equals(transf2));
94103
Assert.IsTrue(transf2.Equals(transf1));
95-
Assert.False(custom.Equals(transf1));
96-
Assert.False(transf1.Equals(custom));
97104
}
98105

99106
[Test]
100107
public void RootEntityAndToListInequality()
101108
{
102109
var transf1 = new RootEntityResultTransformer();
103-
var transf2 = new ToListResultTransformer();
104-
110+
var transf2 = new CustomRootEntityResultTransformer();
111+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, };
112+
113+
Assert.That(transf1.GetHashCode(), Is.EqualTo(transf2.GetHashCode()), "prerequisite");
114+
Assert.That(set.Count, Is.EqualTo(2));
105115
Assert.IsFalse(transf1.Equals(transf2));
106116
Assert.IsFalse(transf2.Equals(transf1));
107117
}
@@ -112,14 +122,11 @@ public void ToListEquality()
112122
{
113123
var transf1 = new ToListResultTransformer();
114124
var transf2 = new ToListResultTransformer();
115-
var custom = new CustomRootEntityResultTransformer();
116-
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2, custom, };
125+
HashSet<IResultTransformer> set = new HashSet<IResultTransformer>() { transf1, transf2 };
117126

118-
Assert.That(set.Count, Is.EqualTo(2));
127+
Assert.That(set.Count, Is.EqualTo(1));
119128
Assert.IsTrue(transf1.Equals(transf2));
120129
Assert.IsTrue(transf2.Equals(transf1));
121-
Assert.False(custom.Equals(transf1));
122-
Assert.False(transf1.Equals(custom));
123130
}
124131
}
125132
}

0 commit comments

Comments
 (0)