| OLD | NEW |
|---|
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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 part of test_suite; | 5 part of test_suite; |
| 6 | 6 |
| 7 String getHtmlContents(String title, | 7 String getHtmlContents(String title, |
| 8 String scriptType, | 8 String scriptType, |
| 9 Path sourceScript) => | 9 Path sourceScript) => |
| 10 """ | 10 """ |
| 11 <!DOCTYPE html> | 11 <!DOCTYPE html> |
| 12 <html> | 12 <html> |
| 13 <head> | 13 <head> |
| 14 <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 14 <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 15 <title> Test $title </title> | 15 <title> Test $title </title> |
| 16 <style> | 16 <style> |
| 17 .unittest-table { font-family:monospace; border:1px; } | 17 .unittest-table { font-family:monospace; border:1px; } |
| 18 .unittest-pass { background: #6b3;} | 18 .unittest-pass { background: #6b3;} |
| 19 .unittest-fail { background: #d55;} | 19 .unittest-fail { background: #d55;} |
| 20 .unittest-error { background: #a11;} | 20 .unittest-error { background: #a11;} |
| 21 </style> | 21 </style> |
| 22 </head> | 22 </head> |
| 23 <body> | 23 <body> |
| 24 <h1> Running $title </h1> | 24 <h1> Running $title </h1> |
| 25 <script type="text/javascript" | 25 <script type="text/javascript" |
| 26 src="/root_dart/pkg/unittest/lib/test_controller.js"> | 26 src="/root_dart/pkg/unittest/lib/test_controller.js"> |
| 27 </script> | 27 </script> |
| 28 <script type="$scriptType" src="$sourceScript" onerror="externalError(null)"> | 28 <script type="$scriptType" src="$sourceScript" onerror="externalError(null)" |
| 29 defer> |
| 29 </script> | 30 </script> |
| 30 <script type="text/javascript" | 31 <script type="text/javascript" |
| 31 src="/root_dart/pkg/browser/lib/dart.js"></script> | 32 src="/root_dart/pkg/browser/lib/dart.js"></script> |
| 32 <script type="text/javascript" | 33 <script type="text/javascript" |
| 33 src="/root_dart/pkg/browser/lib/interop.js"></script> | 34 src="/root_dart/pkg/browser/lib/interop.js"></script> |
| 34 </body> | 35 </body> |
| 35 </html> | 36 </html> |
| 36 """; | 37 """; |
| 37 | 38 |
| 38 String getHtmlLayoutContents(String scriptType, Path sourceScript) => | 39 String getHtmlLayoutContents(String scriptType, Path sourceScript) => |
| 39 """ | 40 """ |
| 40 <!DOCTYPE html> | 41 <!DOCTYPE html> |
| 41 <html> | 42 <html> |
| 42 <head> | 43 <head> |
| 43 <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 44 <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 44 </head> | 45 </head> |
| 45 <body> | 46 <body> |
| 46 <script type="text/javascript"> | 47 <script type="text/javascript"> |
| 47 if (navigator.webkitStartDart) navigator.webkitStartDart(); | 48 if (navigator.webkitStartDart) navigator.webkitStartDart(); |
| 48 </script> | 49 </script> |
| 49 <script type="$scriptType" src="$sourceScript"></script> | 50 <script type="$scriptType" src="$sourceScript" defer></script> |
| 50 </body> | 51 </body> |
| 51 </html> | 52 </html> |
| 52 """; | 53 """; |
| 53 | 54 |
| 54 String dartTestWrapper(bool usePackageImport, String libraryPathComponent) { | 55 String dartTestWrapper(bool usePackageImport, String libraryPathComponent) { |
| 55 // Tests inside "pkg" import unittest using "package:". All others use a | 56 // Tests inside "pkg" import unittest using "package:". All others use a |
| 56 // relative path. The imports need to agree, so use a matching form here. | 57 // relative path. The imports need to agree, so use a matching form here. |
| 57 var unitTest; | 58 var unitTest; |
| 58 if (usePackageImport) { | 59 if (usePackageImport) { |
| 59 unitTest = 'package:unittest'; | 60 unitTest = 'package:unittest'; |
| 60 } else { | 61 } else { |
| 61 unitTest = '/root_dart/pkg/unittest/lib'; | 62 unitTest = '/root_dart/pkg/unittest/lib'; |
| 62 } | 63 } |
| 63 return """ | 64 return """ |
| 64 library test; | 65 library test; |
| 65 | 66 |
| 66 import '$unitTest/unittest.dart' as unittest; | 67 import '$unitTest/unittest.dart' as unittest; |
| 67 import '$unitTest/html_config.dart' as config; | 68 import '$unitTest/html_config.dart' as config; |
| 68 import '$libraryPathComponent' as Test; | 69 import '$libraryPathComponent' as Test; |
| 69 | 70 |
| 70 main() { | 71 main() { |
| 71 config.useHtmlConfiguration(); | 72 config.useHtmlConfiguration(); |
| 72 unittest.group('', Test.main); | 73 unittest.group('', Test.main); |
| 73 } | 74 } |
| 74 """; | 75 """; |
| 75 } | 76 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 23121004:
Re-try of Tightening up dart2js load timing. (Closed)
Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart