Skip to content

Commit 778d257

Browse files
committed
Fix NUnit2021: The EqualTo constraint always fails as the actual and the expected value cannot be equal
1 parent 06d0695 commit 778d257

File tree

1 file changed

+22
-21
lines changed
  • src/NHibernate.Test/NHSpecificTest/GH1754

1 file changed

+22
-21
lines changed

src/NHibernate.Test/NHSpecificTest/GH1754/Fixture.cs

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using NUnit.Framework;
45

@@ -74,7 +75,7 @@ public void CanAddChildAfterFlush()
7475

7576
Assert.That(parent.Children, Has.Count.EqualTo(1));
7677
Assert.That(parent.Children, Does.Contain(child));
77-
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(0));
78+
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
7879
}
7980
}
8081

@@ -92,7 +93,7 @@ public void CanAddChildAfterFlushWithoutTransaction()
9293

9394
Assert.That(parent.Children, Has.Count.EqualTo(1));
9495
Assert.That(parent.Children, Does.Contain(child));
95-
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(0));
96+
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
9697
}
9798
}
9899

@@ -120,7 +121,7 @@ public void CanMergeWithTransientChild()
120121
Assert.That(parent.Children, Has.Count.EqualTo(1));
121122
// Merge should duplicate child and leave original instance un-associated with the session.
122123
Assert.That(parent.Children, Does.Not.Contain(child));
123-
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(0));
124+
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
124125
}
125126
}
126127

@@ -141,7 +142,7 @@ public void CanMergeWithTransientChildWithoutTransaction()
141142
Assert.That(parent.Children, Has.Count.EqualTo(1));
142143
// Merge should duplicate child and leave original instance un-associated with the session.
143144
Assert.That(parent.Children, Does.Not.Contain(child));
144-
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(0));
145+
Assert.That(parent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
145146
}
146147
}
147148

@@ -167,7 +168,7 @@ public void CanChangeOwnershipOnFlushedParents()
167168
Assert.That(parent.Children, Has.Count.EqualTo(0));
168169
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
169170
Assert.That(nextParent.Children, Does.Contain(child));
170-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
171+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
171172
}
172173

173174
using (var session = OpenSession())
@@ -180,7 +181,7 @@ public void CanChangeOwnershipOnFlushedParents()
180181
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
181182
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
182183
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
183-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
184+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
184185
}
185186
}
186187

@@ -203,7 +204,7 @@ public void CanChangeOwnershipOnFlushedParentsWithoutTransaction()
203204
Assert.That(parent.Children, Has.Count.EqualTo(0));
204205
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
205206
Assert.That(nextParent.Children, Does.Contain(child));
206-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
207+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
207208
}
208209

209210
using (var session = OpenSession())
@@ -216,7 +217,7 @@ public void CanChangeOwnershipOnFlushedParentsWithoutTransaction()
216217
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
217218
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
218219
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
219-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
220+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
220221
}
221222
}
222223

@@ -242,7 +243,7 @@ public void CanChangeOwnershipFromFlushedParentToNonFlushed()
242243
Assert.That(parent.Children, Has.Count.EqualTo(0));
243244
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
244245
Assert.That(nextParent.Children, Does.Contain(child));
245-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
246+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
246247
}
247248

248249
using (var session = OpenSession())
@@ -255,7 +256,7 @@ public void CanChangeOwnershipFromFlushedParentToNonFlushed()
255256
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
256257
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
257258
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
258-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
259+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
259260
}
260261
}
261262

@@ -278,7 +279,7 @@ public void CanChangeOwnershipFromFlushedParentToNonFlushedWithoutTransaction()
278279
Assert.That(parent.Children, Has.Count.EqualTo(0));
279280
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
280281
Assert.That(nextParent.Children, Does.Contain(child));
281-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
282+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
282283
}
283284

284285
using (var session = OpenSession())
@@ -291,7 +292,7 @@ public void CanChangeOwnershipFromFlushedParentToNonFlushedWithoutTransaction()
291292
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
292293
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
293294
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
294-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
295+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
295296
}
296297
}
297298

@@ -317,7 +318,7 @@ public void CanChangeOwnershipFromNonFlushedParentToFlushed()
317318
Assert.That(parent.Children, Has.Count.EqualTo(0));
318319
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
319320
Assert.That(nextParent.Children, Does.Contain(child));
320-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
321+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
321322
}
322323

323324
using (var session = OpenSession())
@@ -330,7 +331,7 @@ public void CanChangeOwnershipFromNonFlushedParentToFlushed()
330331
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
331332
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
332333
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
333-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
334+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
334335
}
335336
}
336337

@@ -353,7 +354,7 @@ public void CanChangeOwnershipFromNonFlushedParentToFlushedWithoutTransaction()
353354
Assert.That(parent.Children, Has.Count.EqualTo(0));
354355
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
355356
Assert.That(nextParent.Children, Does.Contain(child));
356-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
357+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
357358
}
358359

359360
using (var session = OpenSession())
@@ -366,7 +367,7 @@ public void CanChangeOwnershipFromNonFlushedParentToFlushedWithoutTransaction()
366367
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
367368
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
368369
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
369-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
370+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
370371
}
371372
}
372373

@@ -392,7 +393,7 @@ public void CanChangeOwnershipOnNonFlushedParents()
392393
Assert.That(parent.Children, Has.Count.EqualTo(0));
393394
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
394395
Assert.That(nextParent.Children, Does.Contain(child));
395-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
396+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
396397
}
397398

398399
using (var session = OpenSession())
@@ -405,7 +406,7 @@ public void CanChangeOwnershipOnNonFlushedParents()
405406
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
406407
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
407408
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
408-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
409+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
409410
}
410411
}
411412

@@ -428,7 +429,7 @@ public void CanChangeOwnershipOnNonFlushedParentsWithoutTransaction()
428429
Assert.That(parent.Children, Has.Count.EqualTo(0));
429430
Assert.That(nextParent.Children, Has.Count.EqualTo(1));
430431
Assert.That(nextParent.Children, Does.Contain(child));
431-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0));
432+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty));
432433
}
433434

434435
using (var session = OpenSession())
@@ -441,7 +442,7 @@ public void CanChangeOwnershipOnNonFlushedParentsWithoutTransaction()
441442
Assert.That(parent.Children, Has.Count.EqualTo(0), "Reloaded data");
442443
Assert.That(nextParent.Children, Has.Count.EqualTo(1), "Reloaded data");
443444
Assert.That(nextParent.Children, Does.Contain(child), "Reloaded data");
444-
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(0), "Reloaded data");
445+
Assert.That(nextParent.Children.Single().Id, Is.Not.EqualTo(Guid.Empty), "Reloaded data");
445446
}
446447
}
447448
}

0 commit comments

Comments
 (0)