Skip to content

Commit 5ec433e

Browse files
committed
Test improved
1 parent 0337844 commit 5ec433e

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Orm/Xtensive.Orm.Tests/Issues/IssueGithub0048_CoalesceReturnsWrongResults.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ public void CoalesceWithNullObjectEntityTest01()
181181
.Where(a => a.FullName.FirstName != null)
182182
.OrderBy(a => a.FullName.FirstName).Run());
183183
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
184+
Assert.That(ex.InnerException.Message.Contains("Coalesce expressions", StringComparison.Ordinal));
184185
}
185186
}
186187

@@ -203,6 +204,7 @@ public void CoalesceWithNullObjectEntityTest02()
203204
.Where(a => a.FullName.FirstName != null)
204205
.OrderBy(a => a.FullName.FirstName).Run());
205206
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
207+
Assert.That(ex.InnerException.Message.Contains("Coalesce expressions", StringComparison.Ordinal));
206208
}
207209
}
208210

@@ -277,6 +279,7 @@ public void CoalesceWithQueryAsSourceTest()
277279
.Select(b => (b.Reviews.SingleOrDefault().ReviewAuthor ?? nullReviewAuthor))
278280
.Where(e => e != nullReviewAuthor).Run());
279281
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
282+
Assert.That(ex.InnerException.Message.Contains("Coalesce expressions", StringComparison.Ordinal));
280283
}
281284
}
282285

@@ -297,6 +300,7 @@ public void CoalesceWithNullObjectStructureTest01()
297300
.Select(a => a.FullName ?? nullFullNameInstance)
298301
.Where(a => a.FirstName.Length > 0).Run());
299302
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
303+
Assert.That(ex.InnerException.Message.Contains("Coalesce expressions", StringComparison.Ordinal));
300304
}
301305
}
302306

@@ -311,6 +315,7 @@ public void CoalesceWithNullObjectStructureTest02()
311315
.Select(a => nullFullNameInstance ?? a.FullName)
312316
.Where(a => a.FirstName.Length > 0).Run());
313317
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
318+
Assert.That(ex.InnerException.Message.Contains("Coalesce expressions", StringComparison.Ordinal));
314319
}
315320
}
316321

@@ -382,7 +387,7 @@ public void CoalesceWithDateTimeFieldTest()
382387
.OrderBy(d => d)
383388
.ToList(7);
384389

385-
Assert.That(expectedSequence.SequenceEqual(resultSequence), Is.True);//but it's false
390+
Assert.That(expectedSequence.SequenceEqual(resultSequence), Is.True);
386391
}
387392
}
388393

@@ -459,6 +464,7 @@ public void TernaryWithNullObjectEntityTest01()
459464
.OrderBy(a => a.FullName.FirstName)
460465
.Run());
461466
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
467+
Assert.That(ex.InnerException.Message.Contains("Conditional expressions", StringComparison.Ordinal));
462468
}
463469
}
464470

@@ -481,7 +487,7 @@ public void TernaryWithTwoEntityFieldsTest()
481487
.OrderBy(a => a.FullName.FirstName)
482488
.ToList(7);
483489

484-
490+
Assert.That(localResult.SequenceEqual(storageResult), Is.True);
485491
}
486492
}
487493

@@ -506,6 +512,7 @@ public void TernaryWithNullObjectEntityTest02()
506512
.OrderBy(a => a.FullName.FirstName)
507513
.Run());
508514
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
515+
Assert.That(ex.InnerException.Message.Contains("Conditional expressions", StringComparison.Ordinal));
509516
}
510517
}
511518

@@ -528,6 +535,7 @@ public void TernaryWithNullObjectStructureTest01()
528535
.Where(a => a.FirstName.Length > 0)
529536
.Run());
530537
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
538+
Assert.That(ex.InnerException.Message.Contains("Conditional expressions", StringComparison.Ordinal));
531539
}
532540
}
533541

@@ -550,6 +558,7 @@ public void TernaryWithNullObjectStructureTest02()
550558
.Where(a => a.FirstName.Length > 0)
551559
.Run());
552560
Assert.That(ex.InnerException, Is.InstanceOf<NotSupportedException>());
561+
Assert.That(ex.InnerException.Message.Contains("Conditional expressions", StringComparison.Ordinal));
553562
}
554563
}
555564

0 commit comments

Comments
 (0)