Big merge from experimental to bleeding edge.

pkg/webdriver/lib/webdriver.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 webdriver;
 
-import 'dart:json';
+import 'dart:json' as json;
 import 'dart:uri';
 import 'dart:io';
-import 'dart:math';
 
 part 'src/base64decoder.dart';
 
 /**
  * WebDriver bindings for Dart.
  *
  * These bindings are based on the WebDriver JSON wire protocol spec
  * (http://code.google.com/p/selenium/wiki/JsonWireProtocol). Not
  * all of these commands are implemented yet by WebDriver itself.
  * Nontheless this is a complete implementation of the spec as the
@@ skipping 179 matching lines @@
    * http://localhost:4444/wd/hub.
    */
   WebDriverBase.fromUrl([this._url = 'http://localhost:4444/wd/hub']) {
     // Break out the URL components.
     var re = new RegExp('[^:/]+://([^/]+)(/.*)');
     var matches = re.firstMatch(_url);
     _host = matches[1];
     _path = matches[2];
     var idx = _host.indexOf(':');
     if (idx >= 0) {
-      _port = parseInt(_host.substring(idx+1));
+      _port = int.parse(_host.substring(idx+1));
       _host = _host.substring(0, idx);
     } else {
       _port = 80;
     }
   }
 
   WebDriverBase([
       this._host = 'localhost',
       this._port = 4444,
       this._path = '/wd/hub']) {
@@ skipping 13 matching lines @@
     var results = null;
     var message = null;
     if (successCodes == null) {
       successCodes = [ 200, 204 ];
     }
     try {
       if (params != null && params is List && http_method != 'POST') {
         throw new Exception(
           'The http method called for ${command} is ${http_method} but it has '
           'to be POST if you want to pass the JSON params '
-          '${JSON.stringify(params)}');
+          '${json.stringify(params)}');
       }
 
       var path = command;
       if (params != null && (params is num || params is String)) {
         path = '$path/$params';
       }
 
       var client = new HttpClient();
       var connection = client.open(http_method, _host, _port, path);
 
       connection.onRequest = (r) {
         r.headers.add(HttpHeaders.ACCEPT, "application/json");
         r.headers.add(
             HttpHeaders.CONTENT_TYPE, 'application/json;charset=UTF-8');
         OutputStream s = r.outputStream;
         if (params != null && params is Map) {
-          s.writeString(JSON.stringify(params));
+          s.writeString(json.stringify(params));
         }
         s.close();
       };
       connection.onError = (e) {
         if (completer != null) {
           completer.completeException(new WebDriverError(-1, e));
           completer = null;
         }
       };
       connection.followRedirects = false;
       connection.onResponse = (r) {
         StringInputStream s = new StringInputStream(r.inputStream);
         StringBuffer sbuf = new StringBuffer();
         s.onData = () {
           var data = s.read();
           if (data != null) {
             sbuf.add(data);
           }
         };
         s.onClosed = () {
           var value = null;
           results  = sbuf.toString().trim();
           // For some reason we get a bunch of NULs on the end
-          // of the text and the JSON parser blows up on these, so
+          // of the text and the json.parse blows up on these, so
           // strip them. We have to do this the hard way as
           // replaceAll('\0', '') does not work.
           // These NULs can be seen in the TCP packet, so it is not
           // an issue with character encoding; it seems to be a bug
           // in WebDriver stack.
           for (var i = results.length; --i >= 0;) {
             var code = results.charCodeAt(i);
             if (code != 0) {
               results = results.substring(0, i+1);
               break;
             }
           }
           if (successCodes.indexOf(r.statusCode) < 0) {
             throw 'Unexpected response ${r.statusCode}';
           }
           if (status == 0 && results.length > 0) {
             // 4xx responses send plain text; others send JSON.
             if (r.statusCode < 400) {
-              results = JSON.parse(results);
+              results = json.parse(results);
               status = results['status'];
             }
             if (results is Map && (results as Map).containsKey('value')) {
               value = results['value'];
             }
             if (value is Map && value.containsKey('message')) {
               message = value['message'];
             }
           }
           if (status == 0) {
@@ skipping 1042 matching lines @@
    * Get the log for a given log type. Log buffer is reset after each request.
    * Each log entry is a [Map] with these fields:
    *
    * 'timestamp' (int) - The timestamp of the entry.
    * 'level' (String) - The log level of the entry, for example, "INFO".
    * 'message' (String) - The log message.
    */
   Future<List<Map>> getLogs(String type) =>
       _post('log', params: { 'type': type });
 }