Chromium Code Reviews Chromium Code Reviews
Issue 12223074:
Create generated tests inside the build directory (Closed)
Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart| Index: tools/testing/dart/browser_test.dart |
| diff --git a/tools/testing/dart/browser_test.dart b/tools/testing/dart/browser_test.dart |
| index 6bfc93af5e715e9c1dcf3f80e3ea6d62203d3f7e..cc0713ed49c3c3dc5fea501d0c447bd96b479abe 100644 |
| --- a/tools/testing/dart/browser_test.dart |
| +++ b/tools/testing/dart/browser_test.dart |
| @@ -5,8 +5,6 @@ |
| part of test_suite; |
| String getHtmlContents(String title, |
| - Path controllerScript, |
| - Path dartJsScript, |
| String scriptType, |
| Path sourceScript) => |
| """ |
| @@ -24,10 +22,11 @@ String getHtmlContents(String title, |
| </head> |
| <body> |
| <h1> Running $title </h1> |
| - <script type="text/javascript" src="$controllerScript"></script> |
| + <script type="text/javascript" src="/root_dart/pkg/unittest/lib/test_controller.js"> |
|
Emily Fortuna
2013/02/12 18:04:09
long line
kustermann
2013/02/15 08:00:30
Done.
|
| + </script> |
| <script type="$scriptType" src="$sourceScript" onerror="externalError(null)"> |
| </script> |
| - <script type="text/javascript" src="$dartJsScript"></script> |
| + <script type="text/javascript" src="/root_dart/pkg/browser/lib/dart.js"></script> |
| </body> |
| </html> |
| """; |
| @@ -48,37 +47,27 @@ String getHtmlLayoutContents(String scriptType, String sourceScript) => |
| </html> |
| """; |
| -String wrapDartTestInLibrary(Path test, String testPath) => |
| +String wrapDartTestInLibrary(Path testRelativeToDart) => |
| """ |
| library libraryWrapper; |
| -part '${pathLib.relative(test.toNativePath(), |
| - from: pathLib.dirname(testPath)).replaceAll('\\', '\\\\')}'; |
| +part '/$testRelativeToDart'; |
| """; |
| -String dartTestWrapper(Path dartHome, String testPath, Path library) { |
| - var testPathDir = pathLib.dirname(testPath); |
| - var dartHomePath = dartHome.toNativePath(); |
| - // TODO(efortuna): Unify path libraries used in test.dart. |
| - var unitTest = pathLib.relative(pathLib.join(dartHomePath, |
| - 'pkg/unittest/lib'), from: testPathDir).replaceAll('\\', '\\\\'); |
| - |
| - var libString = library.toNativePath(); |
| - if (!pathLib.isAbsolute(libString)) { |
| - libString = pathLib.join(dartHome.toNativePath(), libString); |
| - } |
| +String dartTestWrapper(bool usePackageImport, String libraryPathComponent) { |
| // Tests inside "pkg" import unittest using "package:". All others use a |
| // relative path. The imports need to agree, so use a matching form here. |
| - if (pathLib.split(pathLib.relative(libString, |
| - from: dartHome.toNativePath())).contains("pkg")) { |
| + var unitTest; |
| + if (usePackageImport) { |
| unitTest = 'package:unittest'; |
| + } else { |
| + unitTest = '/root_dart/pkg/unittest/lib'; |
| } |
| return """ |
| library test; |
| import '$unitTest/unittest.dart' as unittest; |
| import '$unitTest/html_config.dart' as config; |
| -import '${pathLib.relative(libString, from: testPathDir).replaceAll( |
| - '\\', '\\\\')}' as Test; |
| +import '$libraryPathComponent' as Test; |
| main() { |
| config.useHtmlConfiguration(); |
