| Index: tests/corelib/range_error_test.dart
|
| diff --git a/tests/corelib/range_error_test.dart b/tests/corelib/range_error_test.dart
|
| index 2fdf90f5358b215195a55ce09fbcb9e68413a476..ccb0cb764d2b746ab69c1d4e636a92fa573b2928 100644
|
| --- a/tests/corelib/range_error_test.dart
|
| +++ b/tests/corelib/range_error_test.dart
|
| @@ -4,73 +4,91 @@
|
|
|
| import "package:expect/expect.dart";
|
|
|
| -// Dart test for testing out of range exceptions on arrays.
|
| +// Dart test for testing out of range exceptions on arrays, and the content
|
| +// of range_error toString().
|
|
|
| -class RangeErrorTest {
|
| - static testRead() {
|
| - testListRead([], 0);
|
| - testListRead([], -1);
|
| - testListRead([], 1);
|
| +void main() {
|
| + testRead();
|
| + testWrite();
|
| + testToString();
|
| +}
|
|
|
| - var list = [1];
|
| - testListRead(list, -1);
|
| - testListRead(list, 1);
|
| +void testRead() {
|
| + testListRead([], 0);
|
| + testListRead([], -1);
|
| + testListRead([], 1);
|
|
|
| - list = new List(1);
|
| - testListRead(list, -1);
|
| - testListRead(list, 1);
|
| + var list = [1];
|
| + testListRead(list, -1);
|
| + testListRead(list, 1);
|
|
|
| - list = new List();
|
| - testListRead(list, -1);
|
| - testListRead(list, 0);
|
| - testListRead(list, 1);
|
| - }
|
| + list = new List(1);
|
| + testListRead(list, -1);
|
| + testListRead(list, 1);
|
|
|
| - static testWrite() {
|
| - testListWrite([], 0);
|
| - testListWrite([], -1);
|
| - testListWrite([], 1);
|
| + list = new List();
|
| + testListRead(list, -1);
|
| + testListRead(list, 0);
|
| + testListRead(list, 1);
|
| +}
|
|
|
| - var list = [1];
|
| - testListWrite(list, -1);
|
| - testListWrite(list, 1);
|
| +void testWrite() {
|
| + testListWrite([], 0);
|
| + testListWrite([], -1);
|
| + testListWrite([], 1);
|
|
|
| - list = new List(1);
|
| - testListWrite(list, -1);
|
| - testListWrite(list, 1);
|
| + var list = [1];
|
| + testListWrite(list, -1);
|
| + testListWrite(list, 1);
|
|
|
| - list = new List();
|
| - testListWrite(list, -1);
|
| - testListWrite(list, 0);
|
| - testListWrite(list, 1);
|
| - }
|
| + list = new List(1);
|
| + testListWrite(list, -1);
|
| + testListWrite(list, 1);
|
|
|
| - static testMain() {
|
| - testRead();
|
| - testWrite();
|
| - }
|
| + list = new List();
|
| + testListWrite(list, -1);
|
| + testListWrite(list, 0);
|
| + testListWrite(list, 1);
|
| +}
|
|
|
| - static testListRead(list, index) {
|
| - var exception = null;
|
| - try {
|
| - var e = list[index];
|
| - } on RangeError catch (e) {
|
| - exception = e;
|
| +void testToString() {
|
| + for (var name in [null, "THENAME"]) {
|
| + for (var message in [null, "THEMESSAGE"]) {
|
| + var value = 37;
|
| + for (var re in [
|
| + new ArgumentError.value(value, name, message),
|
| + new RangeError.value(value, name, message),
|
| + new RangeError.index(value, [], name, message),
|
| + new RangeError.range(value, 0, 24, name, message)
|
| + ]) {
|
| + var str = re.toString();
|
| + if (name != null) Expect.isTrue(str.contains(name), "$name in $str");
|
| + if (message != null) Expect.isTrue(str.contains(message),
|
| + "$message in $str");
|
| + Expect.isTrue(str.contains("$value"), "$value in $str");
|
| + // No empty ':' separated parts - in that case the colon is omitted too.
|
| + Expect.isFalse(str.contains(new RegExp(":\s*:")));
|
| + }
|
| }
|
| - Expect.equals(true, exception != null);
|
| }
|
| +}
|
|
|
| - static testListWrite(list, index) {
|
| - var exception = null;
|
| - try {
|
| - list[index] = null;
|
| - } on RangeError catch (e) {
|
| - exception = e;
|
| - }
|
| - Expect.equals(true, exception != null);
|
| +void testListRead(list, index) {
|
| + var exception = null;
|
| + try {
|
| + var e = list[index];
|
| + } on RangeError catch (e) {
|
| + exception = e;
|
| }
|
| + Expect.equals(true, exception != null);
|
| }
|
|
|
| -main() {
|
| - RangeErrorTest.testMain();
|
| +void testListWrite(list, index) {
|
| + var exception = null;
|
| + try {
|
| + list[index] = null;
|
| + } on RangeError catch (e) {
|
| + exception = e;
|
| + }
|
| + Expect.equals(true, exception != null);
|
| }
|
|
|