@@ -381,8 +381,6 @@ public void Test04()
381381 Assert . That ( result1 . Length , Is . EqualTo ( 2 ) ) ;
382382 new [ ] { 1000 , 2000 }
383383 . ForEach ( i => Assert . That ( result1 . Contains ( i ) , Is . True ) ) ;
384- Assert . That ( result1 . First ( ) , Is . EqualTo ( 1000 ) ) ;
385- Assert . That ( result1 . Last ( ) , Is . EqualTo ( 2000 ) ) ;
386384
387385 var result2 = session . Query . All < B2ClassTable > ( ) . OfType < AClassTable > ( )
388386 . Select ( x => x . Field2 ) . ToArray ( ) ;
@@ -801,21 +799,16 @@ public void Test14()
801799 var result1B = source2B . Union ( source1B ) . Select ( x => x . Field1 ) . ToArray ( ) ;
802800
803801 Assert . That ( result1A , Is . Not . Empty ) ;
804- Assert . That ( result1B . Length , Is . EqualTo ( result1A . Length ) ) ;
805- foreach ( var item in result1B ) {
806- Assert . That ( result1A . Contains ( item ) ) ;
807- }
808-
802+ Assert . That ( result1A . Length , Is . EqualTo ( result1B . Length ) ) ;
803+ Assert . That ( result1A . Intersect ( result1B ) . Count ( ) , Is . EqualTo ( result1A . Length ) ) ;
809804
810805 var result2A = source1B . Union ( source2B ) . ToArray ( ) . OfType < B3ClassTable > ( ) . Select ( x => x . Field4 )
811806 . ToArray ( ) ;
812807 var result2B = source1B . Union ( source2B ) . OfType < B3ClassTable > ( ) . Select ( x => x . Field4 ) . ToArray ( ) ;
813808
814809 Assert . That ( result2A , Is . Not . Empty ) ;
815- Assert . That ( result2B . Length , Is . EqualTo ( result2A . Length ) ) ;
816- foreach ( var item in result2B ) {
817- Assert . That ( result2A . Contains ( item ) ) ;
818- }
810+ Assert . That ( result2A . Length , Is . EqualTo ( result2B . Length ) ) ;
811+ Assert . That ( result2A . Intersect ( result2B ) . Count ( ) , Is . EqualTo ( result2A . Length ) ) ;
819812
820813 var result3 = session . Query . All < AClassTable > ( ) . OfType < AConcreteTable > ( ) . ToArray ( ) ;
821814 Assert . That ( result3 , Is . Empty ) ;
@@ -836,21 +829,17 @@ public void Test14()
836829 var result1B = source2B . Union ( source1B ) . Select ( x => x . Field1 ) . ToArray ( ) ;
837830
838831 Assert . That ( result1A , Is . Not . Empty ) ;
839- Assert . That ( result1B . Length , Is . EqualTo ( result1A . Length ) ) ;
840- foreach ( var item in result1B ) {
841- Assert . That ( result1A . Contains ( item ) ) ;
842- }
832+ Assert . That ( result1A . Length , Is . EqualTo ( result1B . Length ) ) ;
833+ Assert . That ( result1A . Intersect ( result1B ) . Count ( ) , Is . EqualTo ( result1A . Length ) ) ;
843834
844835
845836 var result2A = source1B . Union ( source2B ) . ToArray ( ) . OfType < B3ConcreteTable > ( ) . Select ( x => x . Field4 )
846837 . ToArray ( ) ;
847838 var result2B = source1B . Union ( source2B ) . OfType < B3ConcreteTable > ( ) . Select ( x => x . Field4 ) . ToArray ( ) ;
848839
849840 Assert . That ( result2A , Is . Not . Empty ) ;
850- Assert . That ( result2B . Length , Is . EqualTo ( result2A . Length ) ) ;
851- foreach ( var item in result2B ) {
852- Assert . That ( result2A . Contains ( item ) ) ;
853- }
841+ Assert . That ( result2A . Length , Is . EqualTo ( result2B . Length ) ) ;
842+ Assert . That ( result2A . Intersect ( result2B ) . Count ( ) , Is . EqualTo ( result2A . Length ) ) ;
854843
855844 var result3 = session . Query . All < AConcreteTable > ( ) . OfType < ASingleTable > ( ) . ToArray ( ) ;
856845 Assert . That ( result3 , Is . Empty ) ;
@@ -871,20 +860,16 @@ public void Test14()
871860 var result1B = source2B . Union ( source1B ) . Select ( x => x . Field1 ) . ToArray ( ) ;
872861
873862 Assert . That ( result1A , Is . Not . Empty ) ;
874- Assert . That ( result1B . Length , Is . EqualTo ( result1A . Length ) ) ;
875- foreach ( var item in result1B ) {
876- Assert . That ( result1A . Contains ( item ) ) ;
877- }
863+ Assert . That ( result1A . Length , Is . EqualTo ( result1B . Length ) ) ;
864+ Assert . That ( result1A . Intersect ( result1B ) . Count ( ) , Is . EqualTo ( result1A . Length ) ) ;
878865
879866 var result2A = source1B . Union ( source2B ) . ToArray ( ) . OfType < B3SingleTable > ( ) . Select ( x => x . Field4 )
880867 . ToArray ( ) ;
881868 var result2B = source1B . Union ( source2B ) . OfType < B3SingleTable > ( ) . Select ( x => x . Field4 ) . ToArray ( ) ;
882869
883870 Assert . That ( result2A , Is . Not . Empty ) ;
884- Assert . That ( result2B . Length , Is . EqualTo ( result2A . Length ) ) ;
885- foreach ( var item in result2B ) {
886- Assert . That ( result2A . Contains ( item ) ) ;
887- }
871+ Assert . That ( result2A . Length , Is . EqualTo ( result2B . Length ) ) ;
872+ Assert . That ( result2A . Intersect ( result2B ) . Count ( ) , Is . EqualTo ( result2A . Length ) ) ;
888873
889874 var result3 = session . Query . All < ASingleTable > ( ) . OfType < AClassTable > ( ) . ToArray ( ) ;
890875 Assert . That ( result3 , Is . Empty ) ;
0 commit comments