OLD | NEW |
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "platform/assert.h" | 5 #include "platform/assert.h" |
6 #include "vm/report.h" | 6 #include "vm/report.h" |
7 #include "vm/unit_test.h" | 7 #include "vm/unit_test.h" |
8 | 8 |
9 namespace dart { | 9 namespace dart { |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... |
23 Report::MessageF(Report::kJSWarning, script, token_pos, "%s", message); | 23 Report::MessageF(Report::kJSWarning, script, token_pos, "%s", message); |
24 { | 24 { |
25 JSONStream js; | 25 JSONStream js; |
26 trace_buffer->PrintToJSONStream(&js); | 26 trace_buffer->PrintToJSONStream(&js); |
27 EXPECT_SUBSTRING("{\"type\":\"TraceBuffer\",\"members\":[" | 27 EXPECT_SUBSTRING("{\"type\":\"TraceBuffer\",\"members\":[" |
28 "{\"type\":\"TraceBufferEntry\",\"time\":", | 28 "{\"type\":\"TraceBufferEntry\",\"time\":", |
29 js.ToCString()); | 29 js.ToCString()); |
30 // Skip time. | 30 // Skip time. |
31 EXPECT_SUBSTRING("\"message\":{\"type\":\"JSCompatibilityWarning\"," | 31 EXPECT_SUBSTRING("\"message\":{\"type\":\"JSCompatibilityWarning\"," |
32 "\"script\":{\"type\":\"@Script\",\"id\":" | 32 "\"script\":{\"type\":\"@Script\",\"id\":" |
33 "\"scripts\\/Plug\",\"name\":\"Plug\",\"user_name\":" | 33 "\"libraries\\/-1\\/scripts\\/Plug\"," |
| 34 "\"name\":\"Plug\",\"user_name\":" |
34 "\"Plug\",\"kind\":\"script\"},\"tokenPos\":0," | 35 "\"Plug\",\"kind\":\"script\"},\"tokenPos\":0," |
35 "\"message\":{\"type\":\"@String\"", | 36 "\"message\":{\"type\":\"@String\"", |
36 js.ToCString()); | 37 js.ToCString()); |
37 // Skip private _OneByteString. | 38 // Skip private _OneByteString. |
38 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"High Voltage\\\"\"}}", | 39 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"High Voltage\\\"\"}}", |
39 js.ToCString()); | 40 js.ToCString()); |
40 } | 41 } |
41 } | 42 } |
42 { | 43 { |
43 const intptr_t token_pos = 1; | 44 const intptr_t token_pos = 1; |
44 const char* message = "Low Voltage"; | 45 const char* message = "Low Voltage"; |
45 Report::MessageF(Report::kJSWarning, script, token_pos, "%s", message); | 46 Report::MessageF(Report::kJSWarning, script, token_pos, "%s", message); |
46 } | 47 } |
47 EXPECT_EQ(2, trace_buffer->Length()); | 48 EXPECT_EQ(2, trace_buffer->Length()); |
48 EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":" | 49 EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":" |
49 "\"@Script\",\"id\":\"scripts\\/Plug\",\"name\":\"Plug\"," | 50 "\"@Script\",\"id\":\"libraries\\/-1\\/scripts\\/Plug\"," |
| 51 "\"name\":\"Plug\"," |
50 "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":0," | 52 "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":0," |
51 "\"message\":{\"type\":\"@String\"", | 53 "\"message\":{\"type\":\"@String\"", |
52 trace_buffer->At(0)->message); | 54 trace_buffer->At(0)->message); |
53 // Skip private _OneByteString. | 55 // Skip private _OneByteString. |
54 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"High Voltage\\\"\"}}", | 56 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"High Voltage\\\"\"}}", |
55 trace_buffer->At(0)->message); | 57 trace_buffer->At(0)->message); |
56 | 58 |
57 EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":" | 59 EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":" |
58 "\"@Script\",\"id\":\"scripts\\/Plug\",\"name\":\"Plug\"," | 60 "\"@Script\",\"id\":\"libraries\\/-1\\/scripts\\/Plug\"," |
| 61 "\"name\":\"Plug\"," |
59 "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":1," | 62 "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":1," |
60 "\"message\":{\"type\":\"@String\"", | 63 "\"message\":{\"type\":\"@String\"", |
61 trace_buffer->At(1)->message); | 64 trace_buffer->At(1)->message); |
62 // Skip private _OneByteString. | 65 // Skip private _OneByteString. |
63 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"Low Voltage\\\"\"}}", | 66 EXPECT_SUBSTRING("\"valueAsString\":\"\\\"Low Voltage\\\"\"}}", |
64 trace_buffer->At(1)->message); | 67 trace_buffer->At(1)->message); |
65 | 68 |
66 delete trace_buffer; | 69 delete trace_buffer; |
67 } | 70 } |
68 | 71 |
69 } // namespace dart | 72 } // namespace dart |
70 | 73 |
OLD | NEW |