Bring webdriver up to date with SDK changes, and a bit of refactoring.

pkg/webdriver/test/webdriver_test.dart

 library webdriver_test;
 import 'package:webdriver/webdriver.dart';
 import 'package:unittest/unittest.dart';
 
 WebDriver web_driver;
 
 /**
  * These tests are not expected to be run as part of normal automated testing,
  * as they are slow, many of them do not yet work due to WebDriver limitations,
  * and they have external dependencies. Nontheless it is useful to keep them
  * here for manual testing.
  */
 main() {
   var web_driver = new WebDriver('localhost', 4444, '/wd/hub');
   var session = null;
   var completionCallback;
 
   var exceptionHandler = (e) {
     print('Handled: ${e.toString()}');
     if (session != null) {
       session.close().then((_){
         session = null;
         config.handleExternalError(e, 'Unexpected failure');
       });
     }
     return true;

[Siggi Cherem (dart-lang), 2013/03/09 00:14:22]

remove return

[gram, 2013/03/12 23:42:13]

Done.

   };
 
   group('Sessionless tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     test('Get status', () {
       Future f = web_driver.getStatus();
-      f.handleException(exceptionHandler);
       f.then((status) {
         expect(status['sessionId'], isNull);
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Basic session tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     test('Create session/get capabilities', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
+        expect(_session, isNotNull);
         session = _session;
         return session.getCapabilities();
-      }).chain((capabilities) {
+      }).then((capabilities) {
+        expect(capabilities, isNotNull);
         expect(capabilities['browserName'], equals('chrome'));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);

[Siggi Cherem (dart-lang), 2013/03/09 00:14:22]

mmm... just thinking more about it, would this trap exceptions thrown by the
test too? Maybe it does need to come first?

     });
 
     test('Create and get multiple sessions', () {
       Future f = web_driver.newSession('chrome');
       var session2 = null;
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
-        return web_driver.newSession('firefox');
-      }).chain((_session) {
+        return web_driver.newSession('chrome');
+      }).then((_session) {
         session2 = _session;
         return web_driver.getSessions();
-      }).chain((sessions) {
+      }).then((sessions) {
         expect(sessions.length, greaterThanOrEqualTo(2));
         return session2.close();
-      }).chain((_) {
+      }).then((_) {
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
 
     test('Set/get url', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.getUrl();
-      }).chain((u) {
+      }).then((u) {
         expect(u, equals('http://translate.google.com/'));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
 
     test('Navigation', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.setUrl('http://www.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.navigateBack();
-      }).chain((_) {
+      }).then((_) {
         return session.getUrl();
-      }).chain((u) {
+      }).then((u) {
         expect(u, equals('http://translate.google.com/'));
         return session.navigateForward();
-      }).chain((_) {
+      }).then((_) {
         return session.getUrl();
-      }).chain((url) {
+      }).then((url) {
         expect(url, equals('http://www.google.com/'));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
 
     test('Take a Screen shot', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.getScreenshot();
-      }).chain((image) {
+      }).then((image) {
         expect(image.length, greaterThan(10000));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Window tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     test('Window position and size', () {
       var window;
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.getWindow();
-      }).chain((_window) {
+      }).then((_window) {
         window = _window;
         return window.setSize(200, 100);
-      }).chain((_) {
+      }).then((_) {
         return window.getSize();
-      }).chain((ws) {
+      }).then((ws) {
         expect(ws['width'], equals(200));
         expect(ws['height'], equals(100));
         return window.setPosition(100, 80);
-      }).chain((_) {
+      }).then((_) {
         return window.getPosition();
-      }).chain((wp) {
+      }).then((wp) {
         expect(wp['x'], equals(100));
         expect(wp['y'], equals(80));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Cookie tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     test('Create/query/delete', () {
       var window;
       var numcookies;
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         // Must go to a web page first to set a cookie.
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.getCookies();
-      }).chain((cookies) {
+      }).then((cookies) {
         numcookies = cookies.length;
         return session.setCookie({ 'name': 'foo', 'value': 'bar'});
-      }).chain((_) {
+      }).then((_) {
         return session.getCookies();
-      }).chain((cookies) {
+      }).then((cookies) {
         expect(cookies.length, equals(numcookies + 1));
         expect(cookies, someElement(allOf(
             containsPair('name', 'foo'),
             containsPair('value', 'bar'))));
         return session.deleteCookie('foo');
-      }).chain((_) {
+      }).then((_) {
         return session.getCookies();
-      }).chain((cookies) {
+      }).then((cookies) {
         expect(cookies.length, numcookies);
         expect(cookies, everyElement(isNot(containsPair('name', 'foo'))));
         return session.deleteCookie('foo');
-      }).chain((_) {
+      }).then((_) {
         return session.getCookies();
-      }).chain((cookies) {
+      }).then((cookies) {
         expect(cookies.length, numcookies);
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Storage tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     // Storage tests are return 500 errors. This seems to be a bug in
     // the remote driver.
 
     test('Local Storage Create/query/delete', () {
       var window;
       var numkeys;
       Future f = web_driver.newSession('htmlunit', { 'webStorageEnabled': true });
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         // Must go to a web page first.
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.getLocalStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         print(keys);
         numkeys = keys.length;
         return session.setLocalStorageItem('foo', 'bar');
-      }).chain((_) {
+      }).then((_) {
         return session.getLocalStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, equals(numkeys + 1));
         expect(keys, someElement(equals('foo')));
         return session.getLocalStorageCount();
-      }).chain((count) {
+      }).then((count) {
         expect(count, equals(numkeys + 1));
         return session.getLocalStorageValue('foo');
-      }).chain((value) {
+      }).then((value) {
         expect(value, equals('bar'));
         return session.deleteLocalStorageValue('foo');
-      }).chain((_) {
+      }).then((_) {
         return session.getLocalStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, equals(numkeys));
         expect(keys, everyElement(isNot(equals('foo'))));
         return session.setLocalStorageItem('foo', 'bar');
-      }).chain((_) {
+      }).then((_) {
         return session.clearLocalStorage();
-      }).chain((_) {
+      }).then((_) {
         return session.getLocalStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, isZero);
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
 
     test('Session Storage Create/query/delete', () {
       var window;
       var numkeys;
       Future f = web_driver.newSession('chrome', { 'webStorageEnabled': true });
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         // Must go to a web page first.
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.getSessionStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         print(keys);
         numkeys = keys.length;
         return session.setSessionStorageItem('foo', 'bar');
-      }).chain((_) {
+      }).then((_) {
         return session.getSessionStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, equals(numkeys + 1));
         expect(keys, someElement(equals('foo')));
         return session.getSessionStorageCount();
-      }).chain((count) {
+      }).then((count) {
         expect(count, equals(numkeys + 1));
         return session.getSessionStorageValue('foo');
-      }).chain((value) {
+      }).then((value) {
         expect(value, equals('bar'));
         return session.deleteSessionStorageValue('foo');
-      }).chain((_) {
+      }).then((_) {
         return session.getSessionStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, equals(numkeys));
         expect(keys, everyElement(isNot(equals('foo'))));
         return session.setSessionStorageItem('foo', 'bar');
-      }).chain((_) {
+      }).then((_) {
         return session.clearSessionStorage();
-      }).chain((_) {
+      }).then((_) {
         return session.getSessionStorageKeys();
-      }).chain((keys) {
+      }).then((keys) {
         expect(keys.length, isZero);
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
 
   });
 
   group('Script tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     // This test is just timing out eventually with a 500 response.
 
     test('Sync script', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.setUrl('http://translate.google.com');
-      }).chain((_) {
+      }).then((_) {
         return session.execute('function(x, y) { return x * y; }', [2, 3]);
-      }).chain((value) {
+      }).then((value) {
         expect(value, equals(6));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Element tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     test('Elements', () {
       var w;
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
         return session.setUrl('http://duckduckgo.com');
-      }).chain((_) {
+      }).then((_) {
         return session.findElement('id', 'search_form_input_homepage');
-      }).chain((_w) {
+      }).then((_w) {
         print(_w);
         w = _w['ELEMENT'];
         return session.sendKeyStrokesToElement(w,
             [ 'g', 'o', 'o', 'g', 'l', 'e' ]);
-      }).chain((_) {
+      }).then((_) {
         return session.submit(w);
-      }).chain((_) {
+      }).then((_) {
         return session.findElements('class name', 'links_zero_click_disambig');
-      }).chain((divs) {
+      }).then((divs) {
         expect(divs.length, greaterThan(0));
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 
   group('Log tests', () {
     setUp(() {
       completionCallback = expectAsync0((){
       });
     });
 
     // Currently, getLogTypes returns a 404, and attempts to get the
     // logs either return 500 with 'Unknown log type' or 500 with
     // 'Unable to convert logEntries'.
 
     test('Log retrieval', () {
       Future f = web_driver.newSession('chrome');
-      f.handleException(exceptionHandler);
-      f.chain((_session) {
+      f.then((_session) {
         session = _session;
           return session.getLogTypes();
-      }).chain((logTypes) {
+      }).then((logTypes) {
         //print(logTypes);
         return session.getLogs('driver');
-      }).chain((logs) {
+      }).then((logs) {
         //print(logs);
         return session.close();
       }).then((_) {
         session = null;
         completionCallback();
-      });
+      }).catchError(exceptionHandler);
     });
   });
 }