@@ -798,11 +798,14 @@ public void TestFirstWithPredicateAfterWhere()
798
798
}
799
799
800
800
[ Test ]
801
- [ ExpectedException ( typeof ( InvalidOperationException ) , ExpectedMessage = "Sequence contains no elements" ) ]
802
801
public void TestFirstWithPredicateNoMatch ( )
803
802
{
804
- var result = ( from c in _collection . AsQueryable < C > ( )
805
- select c ) . First ( c => c . X == 9 ) ;
803
+ var ex = Assert . Throws < InvalidOperationException > ( ( ) =>
804
+ {
805
+ var result = ( from c in _collection . AsQueryable < C > ( )
806
+ select c ) . First ( c => c . X == 9 ) ;
807
+ } ) ;
808
+ Assert . AreEqual ( ExpectedErrorMessage . FirstEmptySequence , ex . Message ) ;
806
809
}
807
810
808
811
[ Test ]
@@ -1103,11 +1106,14 @@ public void TestLastWithPredicateAfterWhere()
1103
1106
}
1104
1107
1105
1108
[ Test ]
1106
- [ ExpectedException ( typeof ( InvalidOperationException ) , ExpectedMessage = "Sequence contains no elements" ) ]
1107
1109
public void TestLastWithPredicateNoMatch ( )
1108
1110
{
1109
- var result = ( from c in _collection . AsQueryable < C > ( )
1110
- select c ) . Last ( c => c . X == 9 ) ;
1111
+ var ex = Assert . Throws < InvalidOperationException > ( ( ) =>
1112
+ {
1113
+ var result = ( from c in _collection . AsQueryable < C > ( )
1114
+ select c ) . Last ( c => c . X == 9 ) ;
1115
+ } ) ;
1116
+ Assert . AreEqual ( ExpectedErrorMessage . LastEmptySequence , ex . Message ) ;
1111
1117
}
1112
1118
1113
1119
[ Test ]
@@ -1668,12 +1674,15 @@ public void TestSingleOrDefaultWithPredicateOneMatch()
1668
1674
Assert . AreEqual ( 33 , result . Y ) ;
1669
1675
}
1670
1676
1671
- [ ExpectedException ( typeof ( InvalidOperationException ) , ExpectedMessage = "Sequence contains more than one element" ) ]
1672
1677
[ Test ]
1673
1678
public void TestSingleOrDefaultWithPredicateTwoMatches ( )
1674
1679
{
1675
- var result = ( from c in _collection . AsQueryable < C > ( )
1676
- select c ) . SingleOrDefault ( c => c . Y == 11 ) ;
1680
+ var ex = Assert . Throws < InvalidOperationException > ( ( ) =>
1681
+ {
1682
+ var result = ( from c in _collection . AsQueryable < C > ( )
1683
+ select c ) . SingleOrDefault ( c => c . Y == 11 ) ;
1684
+ } ) ;
1685
+ Assert . AreEqual ( ExpectedErrorMessage . SingleLongSequence , ex . Message ) ;
1677
1686
}
1678
1687
1679
1688
[ Test ]
@@ -1731,12 +1740,14 @@ public void TestSingleWithPredicateAfterWhere()
1731
1740
}
1732
1741
1733
1742
[ Test ]
1734
- [ ExpectedException ( typeof ( InvalidOperationException ) , ExpectedMessage = "Sequence contains no elements" ) ]
1735
1743
public void TestSingleWithPredicateNoMatch ( )
1736
1744
{
1737
- var result = ( from c in _collection . AsQueryable < C > ( )
1738
- select c ) . Single ( c => c . X == 9 ) ;
1739
- Assert . IsNull ( result ) ;
1745
+ var ex = Assert . Throws < InvalidOperationException > ( ( ) =>
1746
+ {
1747
+ var result = ( from c in _collection . AsQueryable < C > ( )
1748
+ select c ) . Single ( c => c . X == 9 ) ;
1749
+ } ) ;
1750
+ Assert . AreEqual ( ExpectedErrorMessage . SingleEmptySequence , ex . Message ) ;
1740
1751
}
1741
1752
1742
1753
[ Test ]
@@ -1749,11 +1760,14 @@ public void TestSingleWithPredicateOneMatch()
1749
1760
}
1750
1761
1751
1762
[ Test ]
1752
- [ ExpectedException ( typeof ( InvalidOperationException ) , ExpectedMessage = "Sequence contains more than one element" ) ]
1753
1763
public void TestSingleWithPredicateTwoMatches ( )
1754
1764
{
1755
- var result = ( from c in _collection . AsQueryable < C > ( )
1756
- select c ) . Single ( c => c . Y == 11 ) ;
1765
+ var ex = Assert . Throws < InvalidOperationException > ( ( ) =>
1766
+ {
1767
+ var result = ( from c in _collection . AsQueryable < C > ( )
1768
+ select c ) . Single ( c => c . Y == 11 ) ;
1769
+ } ) ;
1770
+ Assert . AreEqual ( ExpectedErrorMessage . SingleLongSequence , ex . Message ) ;
1757
1771
}
1758
1772
1759
1773
[ Test ]
0 commit comments