Skip to content

Commit c63d716

Browse files
committed
Fix broken test
1 parent f4a01f1 commit c63d716

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

Orm/Xtensive.Orm.Tests/Linq/OfTypeTest.cs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -795,20 +795,20 @@ public void Test14()
795795
var source2A = session.Query.All<AConcreteTable>().ToArray().OfType<IBaseEntity>();
796796
var source2B = session.Query.All<AConcreteTable>().OfType<IBaseEntity>();
797797

798-
var result1A = source1A.Union(source2A).Select(x => x.Field1).ToArray();
799-
var result1B = source2B.Union(source1B).Select(x => x.Field1).ToArray();
798+
var result1A = source1A.Union(source2A).Select(x => x.Field1).ToList();
799+
var result1B = source2B.Union(source1B).Select(x => x.Field1).ToList();
800800

801801
Assert.That(result1A, Is.Not.Empty);
802-
Assert.That(result1A.Length, Is.EqualTo(result1B.Length));
803-
Assert.That(result1A.Intersect(result1B).Count(), Is.EqualTo(result1A.Length));
802+
Assert.That(result1B.Count, Is.EqualTo(result1A.Count));
803+
Assert.That(result1A.Except(result1B), Is.Empty);
804804

805805
var result2A = source1B.Union(source2B).ToArray().OfType<B3ClassTable>().Select(x => x.Field4)
806-
.ToArray();
807-
var result2B = source1B.Union(source2B).OfType<B3ClassTable>().Select(x => x.Field4).ToArray();
806+
.ToList();
807+
var result2B = source1B.Union(source2B).OfType<B3ClassTable>().Select(x => x.Field4).ToList();
808808

809809
Assert.That(result2A, Is.Not.Empty);
810-
Assert.That(result2A.Length, Is.EqualTo(result2B.Length));
811-
Assert.That(result2A.Intersect(result2B).Count(), Is.EqualTo(result2A.Length));
810+
Assert.That(result2B.Count, Is.EqualTo(result2A.Count));
811+
Assert.That(result2A.Except(result2B), Is.Empty);
812812

813813
var result3 = session.Query.All<AClassTable>().OfType<AConcreteTable>().ToArray();
814814
Assert.That(result3, Is.Empty);
@@ -829,17 +829,16 @@ public void Test14()
829829
var result1B = source2B.Union(source1B).Select(x => x.Field1).ToArray();
830830

831831
Assert.That(result1A, Is.Not.Empty);
832-
Assert.That(result1A.Length, Is.EqualTo(result1B.Length));
833-
Assert.That(result1A.Intersect(result1B).Count(), Is.EqualTo(result1A.Length));
834-
832+
Assert.That(result1B.Length, Is.EqualTo(result1A.Length));
833+
Assert.That(result1A.Except(result1B), Is.Empty);
835834

836835
var result2A = source1B.Union(source2B).ToArray().OfType<B3ConcreteTable>().Select(x => x.Field4)
837836
.ToArray();
838837
var result2B = source1B.Union(source2B).OfType<B3ConcreteTable>().Select(x => x.Field4).ToArray();
839838

840839
Assert.That(result2A, Is.Not.Empty);
841-
Assert.That(result2A.Length, Is.EqualTo(result2B.Length));
842-
Assert.That(result2A.Intersect(result2B).Count(), Is.EqualTo(result2A.Length));
840+
Assert.That(result2B.Length, Is.EqualTo(result2A.Length));
841+
Assert.That(result2A.Except(result2B), Is.Empty);
843842

844843
var result3 = session.Query.All<AConcreteTable>().OfType<ASingleTable>().ToArray();
845844
Assert.That(result3, Is.Empty);
@@ -860,16 +859,16 @@ public void Test14()
860859
var result1B = source2B.Union(source1B).Select(x => x.Field1).ToArray();
861860

862861
Assert.That(result1A, Is.Not.Empty);
863-
Assert.That(result1A.Length, Is.EqualTo(result1B.Length));
864-
Assert.That(result1A.Intersect(result1B).Count(), Is.EqualTo(result1A.Length));
862+
Assert.That(result1B.Length, Is.EqualTo(result1A.Length));
863+
Assert.That(result1A.Except(result1B), Is.Empty);
865864

866865
var result2A = source1B.Union(source2B).ToArray().OfType<B3SingleTable>().Select(x => x.Field4)
867866
.ToArray();
868867
var result2B = source1B.Union(source2B).OfType<B3SingleTable>().Select(x => x.Field4).ToArray();
869868

870869
Assert.That(result2A, Is.Not.Empty);
871-
Assert.That(result2A.Length, Is.EqualTo(result2B.Length));
872-
Assert.That(result2A.Intersect(result2B).Count(), Is.EqualTo(result2A.Length));
870+
Assert.That(result2B.Length, Is.EqualTo(result2A.Length));
871+
Assert.That(result2A.Except(result2B), Is.Empty);
873872

874873
var result3 = session.Query.All<ASingleTable>().OfType<AClassTable>().ToArray();
875874
Assert.That(result3, Is.Empty);

0 commit comments

Comments
 (0)