Add client/tests/client web tests to the test.dart test script.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2011, 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.
 
 #library("test_suite");
 
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 
@@ skipping 226 matching lines @@
           filename.substring(middle + 1, filename.length - 5);
     } else {
       // This case is hit by the dartc client compilation
       // tests. These tests are pretty broken compared to the
       // rest. They use the .dart suffix in the status files. They
       // find tests in weird ways (testing that they contain "#").
       // They need to be redone.
       start = filename.indexOf(directoryPath);
       testName = filename.substring(start + directoryPath.length + 1,
                                     filename.length);
+      if (configuration['component'] != 'dartc') {
+        if (testName.endsWith('.dart')) {
+          testName = testName.substring(0, testName.length - 5);
+        }
+      }
     }
     Set<String> expectations = testExpectations.expectations(testName);
     if (configuration["report"]) {
       // Tests with multiple VMOptions are counted more than once.
       for (var dummy in optionsFromFile["vmOptions"]) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
@@ skipping 77 matching lines @@
                           bool isNegative) {
     if (optionsFromFile['isMultitest']) return;
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
     if (!isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
       print('Warning for $filename: Browser tests require #library ' +
             'in any file that uses #import or #source');
     }      
 
     String tempDirTemplate = '${TestUtils.buildDir(configuration)}/tmp';
-    if (isWebTest) tempDirTemplate = 'client/' + tempDirTemplate;
+    // if (isWebTest) tempDirTemplate = 'client/' + tempDirTemplate;
     Directory tempDir = new Directory(tempDirTemplate);
     // TODO(whesse): When implementing client web tests,
     // create directory in the client case, if it doesn't exist.
     tempDir.createTempSync();
 
     String dartTestFilename = new File(filename).fullPathSync();
-    String dartWrapperFilename = '${tempDir.path}/test.dart';
-    if (!isWebTest) {
+    String dartWrapperFilename;
+    String scriptPath;
+    if (isWebTest) {
+      scriptPath = 'file://$dartTestFilename';
+    } else {
+      dartWrapperFilename = '${tempDir.path}/test.dart';
+      scriptPath = '../../../$dartWrapperFilename';
       // test.dart will import the dart test directly, if it is a library,
       // or indirectly through test_as_library.dart, if it is not.
       String dartLibraryFilename;
       if (isLibraryDefinition) {
         dartLibraryFilename = dartTestFilename;
       } else {
         dartLibraryFilename = 'test_as_library.dart';
         File file = new File('${tempDir.path}/$dartLibraryFilename');
         RandomAccessFile dartLibrary = file.openSync(writable: true);
         dartLibrary.writeStringSync(WrapDartTestInLibrary(dartTestFilename));
         dartLibrary.closeSync();
       }
-
+        

[Bill Hesse, 2011/12/23 15:05:25]

Eliminate stray whitespace.

       File file = new File(dartWrapperFilename);
       RandomAccessFile dartWrapper = file.openSync(writable: true);
       dartWrapper.writeStringSync(DartTestWrapper(
           'dart:dom',
           '../../../tests/isolate/src/TestFramework.dart',
           dartLibraryFilename));
       dartWrapper.closeSync();
-    } else {
-      return;  // TODO(whesse): Implement client web tests on dartium.
     }
     // Create the HTML file for the test.
     File htmlTestBase = new File('${tempDir.path}/${getHtmlName(filename)}');
     RandomAccessFile htmlTest = htmlTestBase.openSync(writable: true);
     htmlTest.writeStringSync(GetHtmlContents(
         filename,
         '../../../client/testing/unittest/test_controller.js',
         scriptType,
-        '../../../$dartWrapperFilename'));
+        scriptPath));
     htmlTest.closeSync();
 
     for (var vmOptions in optionsFromFile["vmOptions"]) {
-      var drtFlags = ['-no-timeout'];
+      var drtFlags = ['--no-timeout'];
       var dartFlags = ['--enable_asserts', '--enable_type_checks'];
       dartFlags.addAll(vmOptions);
       drtFlags.add('--dart-flags=${Strings.join(dartFlags, " ")}');
       var args = drtFlags;
       args.add(htmlTestBase.fullPathSync());
 
       // Create BrowserTestCase and queue it.
       var testCase = new BrowserTestCase(
           testName,
           null,
@@ skipping 32 matching lines @@
     String testRelativeDirFlattened;
 
     int start = testRelativePath.lastIndexOf('src' + pathSeparator);
     if (start != -1) {
       Expect.isTrue(testRelativePath.endsWith('.dart'));
       testNameBase =
           testRelativePath.substring(start + 4, testRelativePath.length - 5);
       testRelativeDir = testRelativePath.substring(0, start - 1);
       testRelativeDirFlattened = testRelativeDir.replaceAll(pathSeparator, '_');
     } else {
-      Expect.fail('Web tests not imlemented yet');
+      Expect.isTrue(testRelativePath.endsWith('_tests.dart'));
+      start = testRelativePath.lastIndexOf(pathSeparator);
+      testNameBase =
+          testRelativePath.substring(start + 1, testRelativePath.length - 11);
     }
 
     if (!new Directory('$dartDir/$buildDir/generated_tests').existsSync()) {
       new Directory('$dartDir/$buildDir/generated_tests').createSync();
     }
     if (!new Directory(outputDirBase).existsSync()) {
       new Directory(outputDirBase).createSync();
     }
     Directory tempDir = new Directory(
         '$outputDirBase/${testRelativeDirFlattened}_$testNameBase');
@@ skipping 24 matching lines @@
       }  
       
       File file = new File(dartWrapperFilename);
       RandomAccessFile dartWrapper = file.openSync(writable: true);
       dartWrapper.writeStringSync(DartTestWrapper(
           domLibraryImport,
           '$dartDir/tests/isolate/src/TestFramework.dart',
           dartLibraryFilename));
       dartWrapper.closeSync();
     } else {
-      return;  // TODO(whesse): Implement client web tests on dartium.
+      dartWrapperFilename = testPath;

[Bill Hesse, 2011/12/23 15:05:25]

Rename to dartScript?

+      // return;  // TODO(whesse): Implement client web tests on dartium.

[Bill Hesse, 2011/12/23 15:05:25]

Delete this comment.

     }
     // Create the HTML file for the test.
     File htmlTestBase = new File('${tempDir.path}/${getHtmlName(filename)}');
     RandomAccessFile htmlTest = htmlTestBase.openSync(writable: true);
     htmlTest.writeStringSync(GetHtmlContents(
         filename,
         '$dartDir/client/testing/unittest/test_controller.js',
         scriptType,
         compiledDartWrapperFilename));
     htmlTest.closeSync();
@@ skipping 411 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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\
 """;
     print(report);
   }
 }