Improve how we handle packages/ HTML imports. This resolves better any valid

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 1103 matching lines @@
       String htmlPath;
       if (customHtml.existsSync()) {
         // If necessary, run the Polymer deploy steps.
         // TODO(jmesserly): this should be generalized for any tests that
         // require Pub deploy, not just polymer.
         if (customHtml.readAsStringSync().contains('<!--polymer-test')) {
           if (compiler != 'none') {
             commands.add(_polymerDeployCommand(
                 customHtmlPath, tempDir, optionsFromFile));
 
-            htmlPath = '$tempDir/test/$nameNoExt.html';
+            // Find package's home dir, where pubspec.yaml is located. The
+            // relative directory within the package will be part of the
+            // entrypoint path.
+            var homeDir = filePath;
+            var pubspec = '';
+            do {
+              homeDir = homeDir.directoryPath;
+              if (homeDir.toString() == '/') {
+                homeDir = dir;
+                break;
+              }
+              pubspec = homeDir.append('pubspec.yaml').toNativePath();
+            } while (!new File(pubspec).existsSync());

[kustermann, 2014/01/29 20:48:40]

There is already logic to do something similar. Please update your local working
copy. 
See here:
https://code.google.com/p/dart/source/browse/branches/bleeding_edge/dart/tool...

[Siggi Cherem (dart-lang), 2014/01/29 22:15:07]

Thanks. All set.

+            htmlPath = '$tempDir/${dir.relativeTo(homeDir)}/$nameNoExt.html';

[kustermann, 2014/01/29 20:48:40]

I don't understand what the purpose of this is. The enqueuing phase will look
recursively for tests (i.e. not  just the files inside pkg/X/test/).

The only thing you change here is "htmlPath". Does the polymer build/deploy
command put the files in a different directory now?

Could you explain why this is necessary?

[Siggi Cherem (dart-lang), 2014/01/29 22:15:07]

Yes and no - it always supported putting the output file in different
directories, but we haven't written tests that exposed this until now.
The polymer-build command works similar to pub-build: for a given file it finds
where the package directory lives (finding the pubspec file), and it generates
output that maintains the layout of original package.

There are 2 packages in the repo containing polymer tests. Most tests are in the
polymer package under "pkg/polymer/test/", but we have some other tests under a
test-only package called 'canonicalization'. This package is currently under
"pkg/polymer/example/canonicalization/" (it is practically a nested package, we
could also move that somewhere else if it makes things cleaner).

Up until now, all of tests were placed directly under the 'test/' folder of
their respective packages, so that made every test be OK with the output
described as: "$tmpDir/test/"

In this CL I had to add a test that lives deeper inside the test folder of the
canonicalization package: "test/dir/dev_test", so the changes in this file are
needed to be able to find the generated output (in this case under
"$tmpDir/test/dir/").

             dartWrapperFilename = '${htmlPath}_bootstrap.dart';
             compiledDartWrapperFilename = '$dartWrapperFilename.js';
           } else {
             htmlPath = customHtmlPath;
           }
         } else {
           htmlPath = '$tempDir/test.html';
           dartWrapperFilename = filePath.toNativePath();
 
           var htmlContents = customHtml.readAsStringSync();
@@ skipping 995 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }