22// for details. All rights reserved. Use of this source code is governed by a
33// BSD-style license that can be found in the LICENSE file.
44
5- import "package:expect/expect.dart" ;
6-
7- _expectInErrorMessage (String expected, String actual) {
8- Expect .isTrue (
9- actual.contains (expected),
10- 'Error message should contain "$expected ", '
11- 'but was ${actual .toString ()}.' );
12- }
5+ import "utils.dart" ;
136
147class A {
158 int x = 42 ;
@@ -33,8 +26,8 @@ void main() {
3326 instanceOfA ();
3427 } on NoSuchMethodError catch (error) {
3528 var message = error.toString ();
36- _expectInErrorMessage ("NoSuchMethodError: 'call'" , message);
37- _expectInErrorMessage ("Receiver: Instance of 'A'" , message);
29+ expectStringContains ("NoSuchMethodError: 'call'" , message);
30+ expectStringContains ("Receiver: Instance of 'A'" , message);
3831 }
3932
4033 dynamic tearOff = instanceOfA.arity1;
@@ -43,52 +36,52 @@ void main() {
4336 tearOff (1 , 2 );
4437 } on NoSuchMethodError catch (error) {
4538 var message = error.toString ();
46- _expectInErrorMessage ("NoSuchMethodError: 'bound arity1'" , message);
47- _expectInErrorMessage ("too many arguments" , message);
39+ expectStringContains ("NoSuchMethodError: 'bound arity1'" , message);
40+ expectStringContains ("too many arguments" , message);
4841 }
4942
5043 // Dynamic call of a class method with too few arguments.
5144 try {
5245 tearOff ();
5346 } on NoSuchMethodError catch (error) {
5447 var message = error.toString ();
55- _expectInErrorMessage ("NoSuchMethodError: 'bound arity1'" , message);
56- _expectInErrorMessage ("too few arguments" , message);
48+ expectStringContains ("NoSuchMethodError: 'bound arity1'" , message);
49+ expectStringContains ("too few arguments" , message);
5750 }
5851
5952 // Dynamic call of a top level funciton with too many arguments.
6053 try {
6154 dynamicFunction (1 , 2 );
6255 } on NoSuchMethodError catch (error) {
6356 var message = error.toString ();
64- _expectInErrorMessage ("NoSuchMethodError: 'arity1'" , message);
65- _expectInErrorMessage ("too many arguments" , message);
57+ expectStringContains ("NoSuchMethodError: 'arity1'" , message);
58+ expectStringContains ("too many arguments" , message);
6659 }
6760
6861 // Dynamic call of a top level funciton with too few arguments.
6962 try {
7063 dynamicFunction ();
7164 } on NoSuchMethodError catch (error) {
7265 var message = error.toString ();
73- _expectInErrorMessage ("NoSuchMethodError: 'arity1'" , message);
74- _expectInErrorMessage ("too few arguments" , message);
66+ expectStringContains ("NoSuchMethodError: 'arity1'" , message);
67+ expectStringContains ("too few arguments" , message);
7568 }
7669
7770 // Function.apply() with too many arguments.
7871 try {
7972 Function .apply (dynamicFunction, [1 , 2 ]);
8073 } on NoSuchMethodError catch (error) {
8174 var message = error.toString ();
82- _expectInErrorMessage ("NoSuchMethodError: 'arity1'" , message);
83- _expectInErrorMessage ("too many arguments" , message);
75+ expectStringContains ("NoSuchMethodError: 'arity1'" , message);
76+ expectStringContains ("too many arguments" , message);
8477 }
8578
8679 // Function.apply() with too few arguments.
8780 try {
8881 Function .apply (dynamicFunction, []);
8982 } on NoSuchMethodError catch (error) {
9083 var message = error.toString ();
91- _expectInErrorMessage ("NoSuchMethodError: 'arity1'" , message);
92- _expectInErrorMessage ("too few arguments" , message);
84+ expectStringContains ("NoSuchMethodError: 'arity1'" , message);
85+ expectStringContains ("too few arguments" , message);
9386 }
9487}
0 commit comments