Enable webdriver component in test.dart

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 250 matching lines @@
       for (var dummy in optionsFromFile["vmOptions"]) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
     switch (configuration['component']) {
       case 'dartium':
       case 'chromium':
       case 'frogium':
-          enqueueBrowserTest(filename, testName, optionsFromFile,
-                             expectations, isNegative);
+      case 'webdriver':
+        enqueueBrowserTest(filename, testName, optionsFromFile,
+                           expectations, isNegative);
         break;
       default:
         // Only dartc supports fatal type errors. Enable fatal type
         // errors with a flag and treat tests that have fatal type
         // errors as negative.
         var enableFatalTypeErrors =
             (info.hasFatalTypeErrors && configuration['component'] == 'dartc');
         var argumentLists = argumentListsFromFile(filename,
                                                   optionsFromFile,
                                                   enableFatalTypeErrors);
@@ skipping 135 matching lines @@
             compilerArgs.add('--optimize');
           }
           compilerArgs.addAll(vmOptions);
           compilerArgs.add('--ignore-unrecognized-flags');
           compilerArgs.add('--out');
           compilerArgs.add(compiledDartWrapperFilename);
           compilerArgs.add(dartWrapperFilename);
           // TODO(whesse): Add --fatal-type-errors if needed.
           break;
         case 'frogium':
+        case 'webdriver':
           compilerArgs.addAll(['--libdir=$dartDir/frog/lib',
                                '--compile-only',
                                '--out=$compiledDartWrapperFilename']);
           compilerArgs.addAll(vmOptions);
           compilerArgs.add(dartWrapperFilename);
           break;
         case 'dartium':
           // No compilation phase.
           compilerExecutable = null;
           compilerArgs = null;
           break;
         default:
           Expect.fail('unimplemented component $component');
       }
 
-      var args = ['--no-timeout'];
-      if (component == 'dartium') {
-        var dartFlags = ['--enable_asserts', '--enable_type_checks'];
-        dartFlags.addAll(vmOptions);
-        args.add('--dart-flags=${Strings.join(dartFlags, " ")}');
+      String executable = getFilename(dumpRenderTreeFilename);
+      List<String> args;
+      if (component == 'webdriver') {
+        executable = '$dartDir/tools/testing/run_selenium.py';
+        String browserFlag = 'chrome';
+        if (configuration['flag'] != null) {
+          for (var flag in configuration['flag'].split(',')) {

[Bill Hesse, 2012/01/06 13:39:09]

Note: we could split configurations with commas in --flag value, so multiple
runs with different browsers would work, but I don't think it is a good idea,
especially if we want frog and frog-lib values in --flag as well.

[Emily Fortuna, 2012/01/08 18:47:06]

You mean potentially list multiple browsers when calling test.dart? 
This seems good as it is. I wouldn't worry about that use case -- since I'm
doing performance testing, I run them individually.

On 2012/01/06 13:39:09, Bill Hesse wrote:

+            switch (flag) {
+              case 'ff':
+              case 'firefox':
+                browserFlag = 'ff';
+                break;
+              case 'ie':
+              case 'explorer':
+              case 'internet-explorer':
+                browserFlag = 'ie';
+                break;
+              case 'safari':
+                browserFlag = 'safari';
+                break;
+            }
+          }
+        }
+        args = ['--out', htmlPath, '--browser', browserFlag];
+        
+      } else {

[Bill Hesse, 2012/01/06 13:39:09]

Move dumpRenderTree value for executable here?

+        args = ['--no-timeout'];
+        if (component == 'dartium') {
+          var dartFlags = ['--enable_asserts', '--enable_type_checks'];
+          dartFlags.addAll(vmOptions);
+          args.add('--dart-flags=${Strings.join(dartFlags, " ")}');
+        }
+        args.add(htmlPath);
       }
-      args.add(htmlPath);
-
       // Create BrowserTestCase and queue it.
       var testCase = new BrowserTestCase(
           testName,
           compilerExecutable,
           compilerArgs,
-          getFilename(dumpRenderTreeFilename),
+          executable,
           args,
           configuration,
           completeHandler,
           expectations,
           optionsFromFile['isNegative']);
       doTest(testCase);
     }        
   }
 
   /***
@@ skipping 29 matching lines @@
     }
     return tempDir;
   }
 
   String get scriptType() {
     switch (configuration['component']) {
       case 'dartium':
         return 'application/dart';
       case 'chromium':
       case 'frogium':
+      case 'webdriver':
         return 'text/javascript';
       default:
         Expect.fail('Unimplemented component scriptType');
         return null;
     }
   }
 
   String getHtmlName(String filename) {
     return filename.replaceAll('/', '_') + configuration['component'] + '.html';
   }
@@ skipping 335 matching lines @@
   }
 
   static String compilerName(Map configuration) {
     String postfix =
         (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
     switch (configuration['component']) {
       case 'chromium':
       case 'dartc':
         return 'compiler/bin/dartc$postfix';
       case 'frogium':
+      case 'webdriver':
         return 'frog/bin/frogsh$postfix';
       default:
         throw "Unknown compiler for: ${configuration['component']}";
     }
   }
 
   static String dartShellFileName(Map configuration) {
     var name = '${buildDir(configuration)}/${executableName(configuration)}';
     if (!(new File(name)).existsSync()) {
       throw "Executable '$name' does not exist";
@@ skipping 94 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);
   }
 }