Chromium Code Reviews| Index: tests/language/full_stacktrace3_test.dart |
| diff --git a/tests/language/full_stacktrace3_test.dart b/tests/language/full_stacktrace3_test.dart |
| index 4bacd04624266e4e6d75bf85c76eb0be6a464276..fd603e4d7ad31f90e74aa13ceba070b8247dad69 100644 |
| --- a/tests/language/full_stacktrace3_test.dart |
| +++ b/tests/language/full_stacktrace3_test.dart |
| @@ -4,8 +4,11 @@ |
| import "package:expect/expect.dart"; |
| +// This test assumes that all called functions occur in the stack trace. |
| +// This might not be the case if inlining methods. |
| + |
| void func1() { |
| - throw new Exception("Test peanut gallery request for Full stacktrace"); |
| + throw new Exception("Test full stacktrace"); |
| } |
| void func2() { |
| func1(); |
| @@ -14,35 +17,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 new Exception("This is not a rethrow"); |
|
Lasse Reichstein Nielsen
2013/04/15 11:37:22
This is a rethrow in full_stacktrace2_test.dart.
|
| } |
| } |
| @@ -54,35 +37,15 @@ int func5() { |
| try { |
| func4(); |
| } on Object catch(e, s) { |
| - var full_trace = s.fullStackTrace; |
| - Expect.isFalse(full_trace.contains("func1")); |
| - Expect.isFalse(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.isFalse(trace.contains("func1")); |
| - Expect.isFalse(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.isFalse(fullTrace.contains("func1")); |
| + Expect.isFalse(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; |
| } |