| Index: tests/language/full_stacktrace2_test.dart
|
| diff --git a/tests/language/full_stacktrace2_test.dart b/tests/language/full_stacktrace2_test.dart
|
| index 7f45706adf45308d45de99752b69692634baf3af..a98f5a67a4ba7ca19ec72a10dce03b90eed45008 100644
|
| --- a/tests/language/full_stacktrace2_test.dart
|
| +++ b/tests/language/full_stacktrace2_test.dart
|
| @@ -5,7 +5,7 @@
|
| import "package:expect/expect.dart";
|
|
|
| void func1() {
|
| - throw new Exception("Test peanut gallery request for Full stacktrace");
|
| + throw new Exception("Test full stacktrace");
|
| }
|
| void func2() {
|
| func1();
|
| @@ -14,36 +14,15 @@ void func3() {
|
| try {
|
| func2();
|
| } on Object catch(e, s) {
|
| - print(e);
|
| -
|
| - var full_trace = s.fullStackTrace;
|
| - Expect.isTrue(full_trace.contains("func1"));
|
| - Expect.isTrue(full_trace.contains("func2"));
|
| - Expect.isTrue(full_trace.contains("func3"));
|
| - Expect.isTrue(full_trace.contains("func4"));
|
| - Expect.isTrue(full_trace.contains("func5"));
|
| - Expect.isTrue(full_trace.contains("func6"));
|
| - Expect.isTrue(full_trace.contains("func7"));
|
| - Expect.isTrue(full_trace.contains("main"));
|
| -
|
| - var trace = s.stackTrace;
|
| - Expect.isTrue(trace.contains("func1"));
|
| - Expect.isTrue(trace.contains("func2"));
|
| - Expect.isTrue(trace.contains("func3"));
|
| -
|
| - Expect.isFalse(trace.contains("func4"));
|
| - Expect.isFalse(trace.contains("func5"));
|
| - Expect.isFalse(trace.contains("func6"));
|
| - Expect.isFalse(trace.contains("func7"));
|
| - Expect.isFalse(trace.contains("main"));
|
| -
|
| - print(s);
|
| -
|
| - print("Full stack trace");
|
| - print(full_trace);
|
| -
|
| - print("Stack trace");
|
| - print(trace);
|
| + var fullTrace = s.toString();
|
| + Expect.isTrue(fullTrace.contains("func1"));
|
| + Expect.isTrue(fullTrace.contains("func2"));
|
| + Expect.isTrue(fullTrace.contains("func3"));
|
| + Expect.isTrue(fullTrace.contains("func4"));
|
| + Expect.isTrue(fullTrace.contains("func5"));
|
| + Expect.isTrue(fullTrace.contains("func6"));
|
| + Expect.isTrue(fullTrace.contains("func7"));
|
| + Expect.isTrue(fullTrace.contains("main"));
|
|
|
| throw; // This is a rethrow.
|
| }
|
| @@ -56,36 +35,15 @@ int func5() {
|
| try {
|
| func4();
|
| } on Object catch(e, s) {
|
| -
|
| - var full_trace = s.fullStackTrace;
|
| - print(full_trace);
|
| - Expect.isTrue(full_trace.contains("func1"));
|
| - Expect.isTrue(full_trace.contains("func2"));
|
| - Expect.isTrue(full_trace.contains("func3"));
|
| - Expect.isTrue(full_trace.contains("func4"));
|
| - Expect.isTrue(full_trace.contains("func5"));
|
| - Expect.isTrue(full_trace.contains("func6"));
|
| - Expect.isTrue(full_trace.contains("func7"));
|
| - Expect.isTrue(full_trace.contains("main"));
|
| -
|
| - var trace = s.stackTrace;
|
| - Expect.isTrue(trace.contains("func1"));
|
| - Expect.isTrue(trace.contains("func2"));
|
| - Expect.isTrue(trace.contains("func3"));
|
| - Expect.isTrue(trace.contains("func4"));
|
| - Expect.isTrue(trace.contains("func5"));
|
| -
|
| - Expect.isFalse(trace.contains("func6"));
|
| - Expect.isFalse(trace.contains("func7"));
|
| - Expect.isFalse(trace.contains("main"));
|
| -
|
| - print(s);
|
| -
|
| - print("Full stack trace");
|
| - print(full_trace);
|
| -
|
| - print("Stack trace");
|
| - print(trace);
|
| + var fullTrace = s.toString();
|
| + Expect.isTrue(fullTrace.contains("func1"));
|
| + Expect.isTrue(fullTrace.contains("func2"));
|
| + Expect.isTrue(fullTrace.contains("func3"));
|
| + Expect.isTrue(fullTrace.contains("func4"));
|
| + Expect.isTrue(fullTrace.contains("func5"));
|
| + Expect.isTrue(fullTrace.contains("func6"));
|
| + Expect.isTrue(fullTrace.contains("func7"));
|
| + Expect.isTrue(fullTrace.contains("main"));
|
| }
|
| return 1;
|
| }
|
|
|