Fix path processing.

Reformat files with current version of dartfmt.

Author: DrMarcII

.gitignore

@@ -7,4 +7,4 @@ pubspec.lock
 *.so
 .idea/
 .pub/
-
+.packages

lib/src/command_event.dart

@@ -20,23 +20,37 @@ part of sync.webdriver;
 class CommandEvent {
   /// HTTP method for the command.
   final String method;
+
   /// HTTP endpoint for the command.
   final String endpoint;
+
   /// String representation of the params sent for the command.
   final String params;
+
   /// When the command started execution.
   final DateTime startTime;
+
   /// When the command ended execution.
   final DateTime endTime;
+
   /// String representation of the returned response for the command.
   /// If the command failed, this will be null.
   final String result;
+
   /// String representation of the exception thrown when the command failed.
   /// If the command succeeded, this will be null.
   final String exception;
+
   /// Stack trace at the point of the execution of the WebDriver command.
   final Trace stackTrace;
 
-  CommandEvent({this.method, this.endpoint, this.params, this.startTime,
-      this.endTime, this.result, this.exception, this.stackTrace});
+  CommandEvent(
+      {this.method,
+      this.endpoint,
+      this.params,
+      this.startTime,
+      this.endTime,
+      this.result,
+      this.exception,
+      this.stackTrace});
 }

lib/src/common.dart

@@ -113,7 +113,8 @@ abstract class _WebDriverBase {
       return command;
     } else if (command.startsWith('/')) {
       return '$_prefix$command';
-    } else return '$_prefix/$command';
+    } else
+      return '$_prefix/$command';
   }
 }
 

lib/src/options.dart

@@ -36,14 +36,19 @@ class Cookies extends _WebDriverBase {
 class Cookie {
   /// The name of the cookie.
   final String name;
+
   /// The cookie value.
   final String value;
+
   /// (Optional) The cookie path.
   final String path;
+
   /// (Optional) The domain the cookie is visible to.
   final String domain;
+
   /// (Optional) Whether the cookie is a secure cookie.
   final bool secure;
+
   /// (Optional) When the cookie expires.
   final DateTime expiry;
 
@@ -54,7 +59,8 @@ class Cookie {
     var expiry;
     if (json['expiry'] is num) {
       expiry = new DateTime.fromMillisecondsSinceEpoch(
-          (json['expiry'] * 1000).round(), isUtc: true);
+          (json['expiry'] * 1000).round(),
+          isUtc: true);
     }
     return new Cookie(json['name'], json['value'],
         path: json['path'],
@@ -96,6 +102,7 @@ class Timeouts extends _WebDriverBase {
 
   /// Get the script timeout.
   Duration get scriptTimeout => _scriptTimeout;
+
   /// Set the script timeout.
   set scriptTimeout(Duration duration) {
     _set('script', duration);
@@ -104,6 +111,7 @@ class Timeouts extends _WebDriverBase {
 
   /// Get the implicit timeout.
   Duration get implicitWaitTimeout => _implicitWaitTimeout;
+
   /// Set the implicit timeout.
   set implicitWaitTimeout(Duration duration) {
     _set('implicit', duration);
@@ -112,6 +120,7 @@ class Timeouts extends _WebDriverBase {
 
   /// Get the page load timeout.
   Duration get pageLoadTimeout => _pageLoadTimeout;
+
   /// Set the page load timeout.
   set pageLoadTimeout(Duration duration) {
     _set('page load', duration);

lib/src/touch.dart

@@ -68,11 +68,11 @@ class Touch extends _WebDriverBase {
    */
   void flickElement(WebElement start, int xOffset, int yOffset, int speed) =>
       _post('flick', {
-    'element': start.id,
-    'xoffset': xOffset.floor(),
-    'yoffset': yOffset.floor(),
-    'speed': speed.floor()
-  });
+        'element': start.id,
+        'xoffset': xOffset.floor(),
+        'yoffset': yOffset.floor(),
+        'speed': speed.floor()
+      });
 
   /**
    * Flick on the touch screen using finger motion events.

lib/src/util.dart

@@ -31,8 +31,10 @@ bool useUnittestMatchers = false;
  * Any exceptions raised during the evauluation of [condition] are
  * caught and treated as an unsuccessful evaluation.
  */
-waitForValue(condition(), {Duration timeout: _DEFAULT_WAIT,
-    Duration interval: _INTERVAL, onError(Object error)}) {
+waitForValue(condition(),
+    {Duration timeout: _DEFAULT_WAIT,
+    Duration interval: _INTERVAL,
+    onError(Object error)}) {
   return waitFor(condition, useUnittestMatchers ? ut.isNotNull : m.isNotNull,
       timeout: timeout, interval: interval);
 }
@@ -47,8 +49,10 @@ waitForValue(condition(), {Duration timeout: _DEFAULT_WAIT,
  * Any exceptions raised during the evauluation of [condition] are
  * caught and treated as an unsuccessful evaluation.
  */
-waitFor(condition(), matcher, {Duration timeout: _DEFAULT_WAIT,
-    Duration interval: _INTERVAL, onError(Object error)}) {
+waitFor(condition(), matcher,
+    {Duration timeout: _DEFAULT_WAIT,
+    Duration interval: _INTERVAL,
+    onError(Object error)}) {
   conditionWithExpect() {
     expect(value, matcher) {
       if (matcher is! m.Matcher) {

lib/src/web_driver.dart

@@ -17,6 +17,7 @@ limitations under the License.
 part of sync.webdriver;
 
 @deprecated
+
 /// Use [CommandEvent] instead.
 typedef void CommandListener(String method, String endpoint, params);
 
@@ -34,13 +35,15 @@ class WebDriver extends SearchContext {
       new StreamController.broadcast(sync: true);
   Stream<CommandEvent> get onCommand => _onCommand.stream;
 
-  factory WebDriver({Uri uri: null, Map<String, String> required: null,
+  factory WebDriver(
+      {Uri uri: null,
+      Map<String, String> required: null,
       Map<String, String> desired: const <String, String>{}}) {
     if (uri == null) {
       uri = DEFAULT_URI;
     }
-    var request =
-        _client.postUrl(new Uri.http(uri.authority, '${uri.path}/session'));
+    var request = _client
+        .postUrl(new Uri.http(uri.authority, path.join(uri.path, 'session')));
     var jsonParams = {"desiredCapabilities": desired};
 
     if (required != null) {
@@ -57,14 +60,14 @@ class WebDriver extends SearchContext {
     switch (resp.statusCode) {
       case HttpStatus.SEE_OTHER:
       case HttpStatus.MOVED_TEMPORARILY:
+      case HttpStatus.MOVED_PERMANENTLY:
         sessionUri = Uri.parse(resp.headers.value(HttpHeaders.LOCATION));
         if (sessionUri.authority == null || sessionUri.authority.isEmpty) {
           sessionUri = new Uri.http(uri.authority, sessionUri.path);
         }
         break;
       case HttpStatus.OK:
         var jsonResp = _parseBody(resp);
-
         if (jsonResp is! Map || jsonResp['status'] != 0) {
           throw new WebDriverException(
               httpStatusCode: resp.statusCode,
@@ -106,7 +109,7 @@ class WebDriver extends SearchContext {
   }
 
   static Uri _sessionUri(Uri uri, String sessionId) =>
-      new Uri.http(uri.authority, '${uri.path}/session/$sessionId');
+      new Uri.http(uri.authority, path.join(uri.path, "session", sessionId));
 
   WebDriver._(this.uri, this.capabilities) {
     _jsonDecoder = new JsonCodec.withReviver(_reviver);
@@ -195,8 +198,8 @@ class WebDriver extends SearchContext {
   dynamic execute(String script, List args) =>
       post('execute', {'script': script, 'args': args});
 
-  List<int> captureScreenshot() => new UnmodifiableListView(
-      BASE64.decode(captureScreenshotAsBase64()));
+  List<int> captureScreenshot() =>
+      new UnmodifiableListView(BASE64.decode(captureScreenshotAsBase64()));
 
   String captureScreenshotAsBase64() => get('screenshot');
 
@@ -291,12 +294,7 @@ class WebDriver extends SearchContext {
   }
 
   String _processCommand(String command) {
-    StringBuffer path = new StringBuffer(uri.path);
-    if (!command.isEmpty && !command.startsWith('/')) {
-      path.write('/');
-    }
-    path.write(command);
-    return path.toString();
+    return path.join(uri.path, command);
   }
 
   _processResponse(HttpClientResponseSync resp) {

lib/src/web_element.dart

@@ -113,20 +113,15 @@ class WebElement extends _WebDriverBase with SearchContext {
     StringBuffer result = new StringBuffer('{WebElement ');
     result.write(id);
     if (_context != null && _finder != null) {
-      result
-        ..write(' ')
-        ..write(_context);
+      result..write(' ')..write(_context);
       if (_index >= 0) {
         result.write('.findElements(');
       } else {
         result.write('.findElement(');
       }
       result.write(_finder);
       if (_index >= 0) {
-        result
-          ..write(')[')
-          ..write(_index)
-          ..write(']}');
+        result..write(')[')..write(_index)..write(']}');
       } else {
         result.write(')}');
       }

lib/sync_webdriver.dart

@@ -24,6 +24,7 @@ import 'dart:math' show Point;
 import 'dart:mirrors';
 
 import 'package:matcher/matcher.dart' as m;
+import 'package:path/path.dart' as path;
 import 'package:stack_trace/stack_trace.dart' show Trace;
 import 'package:sync_socket/sync_socket.dart';
 import 'package:unittest/unittest.dart' as ut;

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sync_webdriver
-version: 2.0.0-pre.1
+version: 2.0.0-pre.2
 author: Marc Fisher II <[email protected]>
 description: >
   Provides WebDriver bindings for Dart. These use the WebDriver JSON interface,
@@ -8,10 +8,10 @@ homepage: https://github.com/google/dart-sync-webdriver
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  matcher: '^0.12.0+1'
-  stack_trace: '^1.3.2'
-  sync_socket: '^1.0.2+1'
-  unittest: '^0.11.6+1'
+  matcher: '^0.12.0'
+  path: '^1.3.0'
+  stack_trace: '^1.3.0'
+  sync_socket: '^1.0.0'
+  unittest: '^0.11.0'
 dev_dependencies:
-  path: '^1.3.5'
-  test: '^0.12.2'
+  test: '^0.12.0'

test/src/command_event_test.dart

@@ -118,14 +118,18 @@ _checkCommand(CommandEvent log, method, command, params,
   expect(log.method, method);
   expect(log.endpoint, command);
   expect(log.params, params);
-  expect(log.endTime, predicate(
-      log.startTime.isBefore, 'event endTime is not after event startTime'));
+  expect(
+      log.endTime,
+      predicate(log.startTime.isBefore,
+          'event endTime is not after event startTime'));
   expect(log.result, response);
   expect(log.exception, exception);
 
   var trace = new Trace.current(2).frames.map((f) => f.toString()).toList();
-  expect(log.stackTrace.frames
-      .map((f) => f.toString())
-      .skipWhile((f) => f != trace[0])
-      .toList(), trace);
+  expect(
+      log.stackTrace.frames
+          .map((f) => f.toString())
+          .skipWhile((f) => f != trace[0])
+          .toList(),
+      trace);
 }

test/src/keyboard_test.dart

@@ -46,9 +46,7 @@ void main() {
     });
 
     test('sendKeys -- twice', () {
-      driver.keyboard
-        ..sendKeys('abc')
-        ..sendKeys('def');
+      driver.keyboard..sendKeys('abc')..sendKeys('def');
       expect(textInput.attributes['value'], 'abcdef');
     });
 

test/src/logs_test.dart

@@ -27,8 +27,7 @@ void main() {
     WebDriver driver;
 
     setUp(() {
-      driver = createTestDriver(
-          additionalCapabilities: {
+      driver = createTestDriver(additionalCapabilities: {
         Capabilities.LOGGING_PREFS: {LogType.PERFORMANCE: LogLevel.INFO}
       });
       driver.url = testPagePath;

test/src/util_test.dart

@@ -288,9 +288,7 @@ void main() {
     });
 
     test('[de]selectByIndex multiple', () {
-      var select = new Select(selectMulti)
-        ..selectByIndex(1)
-        ..selectByIndex(3);
+      var select = new Select(selectMulti)..selectByIndex(1)..selectByIndex(3);
       var options = select.options;
 
       expect(options[0].selected, false);