refactor(benchpress): export webdriver adapters in benchpress/benchpress

tbosch · tbosch · commit 821d01ab34c6 · 2015-03-02T11:31:06.000-08:00
Also adds default bindings for protractor.
Also removes sync web driver adapter for Dart as we don’t have tests
for it yet.
diff --git a/modules/benchpress/benchpress.dart b/modules/benchpress/benchpress.dart
@@ -0,0 +1,2 @@
+export './common.dart';
+export './src/webdriver/async_webdriver_adapter.dart' show AsyncWebDriverAdapter;
diff --git a/modules/benchpress/benchpress.es6 b/modules/benchpress/benchpress.es6
@@ -0,0 +1,2 @@
+export * from './common';
+export { SeleniumWebDriverAdapter } from './src/webdriver/selenium_webdriver_adapter';
diff --git a/modules/benchpress/common.js b/modules/benchpress/common.js
diff --git a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart
@@ -16,8 +16,8 @@ class AsyncWebDriverAdapter extends WebDriverAdapter {
     return _driver.execute(script, const[]);
   }
 
-  Map capabilities() {
-    return _driver.capabilities;
+  Future<Map> capabilities() {
+    return new Future.value(_driver.capabilities);
   }
 
   Future<List<Map>> logs(String type) {
diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.es6 b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.es6
@@ -8,6 +8,9 @@ import webdriver from 'selenium-webdriver';
  * Adapter for the selenium-webdriver.
  */
 export class SeleniumWebDriverAdapter extends WebDriverAdapter {
+  // TODO(tbosch): use static values when our transpiler supports them
+  static get PROTRACTOR_BINDINGS() { return _PROTRACTOR_BINDINGS; }
+
   _driver:any;
 
   constructor(driver) {
@@ -59,3 +62,7 @@ function convertToLocalProcess(data) {
   }
   return JSON.parse(serialized);
 }
+
+var _PROTRACTOR_BINDINGS = [
+  bind(WebDriverAdapter).toFactory( () => new SeleniumWebDriverAdapter(global.browser), [])
+];
diff --git a/modules/benchpress/src/webdriver/sync_webdriver_adapter.dart b/modules/benchpress/src/webdriver/sync_webdriver_adapter.dart
diff --git a/modules/benchpress/test/metric/multi_metric_spec.js b/modules/benchpress/test/metric/multi_metric_spec.js
@@ -3,7 +3,7 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
 import { List, ListWrapper, StringMap } from 'angular2/src/facade/collection';
 import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
 
-import { Metric, MultiMetric, bind, Injector } from 'benchpress/benchpress';
+import { Metric, MultiMetric, bind, Injector } from 'benchpress/common';
 
 export function main() {
   function createMetric(ids) {
diff --git a/modules/benchpress/test/metric/perflog_metric_spec.js b/modules/benchpress/test/metric/perflog_metric_spec.js
@@ -3,7 +3,7 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
 import { List, ListWrapper } from 'angular2/src/facade/collection';
 import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
 
-import { Metric, PerflogMetric, WebDriverExtension, bind, Injector } from 'benchpress/benchpress';
+import { Metric, PerflogMetric, WebDriverExtension, bind, Injector } from 'benchpress/common';
 
 import { TraceEventFactory } from '../trace_event_factory';
 
diff --git a/modules/benchpress/test/reporter/console_reporter_spec.js b/modules/benchpress/test/reporter/console_reporter_spec.js
@@ -6,7 +6,7 @@ import { List, ListWrapper } from 'angular2/src/facade/collection';
 import {
   SampleState, Reporter, bind, Injector,
   ConsoleReporter, SampleDescription, MeasureValues
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 export function main() {
   describe('console reporter', () => {
diff --git a/modules/benchpress/test/reporter/multi_reporter_spec.js b/modules/benchpress/test/reporter/multi_reporter_spec.js
@@ -4,7 +4,7 @@ import { List, ListWrapper, StringMap } from 'angular2/src/facade/collection';
 import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
 import { DateWrapper } from 'angular2/src/facade/lang';
 
-import { Reporter, MultiReporter, bind, Injector, MeasureValues } from 'benchpress/benchpress';
+import { Reporter, MultiReporter, bind, Injector, MeasureValues } from 'benchpress/common';
 
 export function main() {
   function createReporters(ids) {
diff --git a/modules/benchpress/test/runner_spec.js b/modules/benchpress/test/runner_spec.js
@@ -3,7 +3,7 @@ import {
   Runner, Sampler, SampleDescription,
   Validator, bind, Injector, Metric,
   Options, WebDriverAdapter
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 import { isBlank } from 'angular2/src/facade/lang';
 import { Promise, PromiseWrapper } from 'angular2/src/facade/async';
 
diff --git a/modules/benchpress/test/sampler_spec.js b/modules/benchpress/test/sampler_spec.js
@@ -8,7 +8,7 @@ import {
   Sampler, WebDriverAdapter, WebDriverExtension,
   Validator, Metric, Reporter, Browser,
   bind, Injector, Options, MeasureValues
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 export function main() {
   var EMPTY_EXECUTE = () => {};
diff --git a/modules/benchpress/test/validator/regression_slope_validator_spec.js b/modules/benchpress/test/validator/regression_slope_validator_spec.js
@@ -4,7 +4,7 @@ import { ListWrapper } from 'angular2/src/facade/collection';
 
 import {
   Validator, RegressionSlopeValidator, Injector, bind, MeasureValues
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 export function main() {
   describe('regression slope validator', () => {
diff --git a/modules/benchpress/test/validator/size_validator_spec.js b/modules/benchpress/test/validator/size_validator_spec.js
@@ -4,7 +4,7 @@ import { ListWrapper } from 'angular2/src/facade/collection';
 
 import {
   Validator, SizeValidator, Injector, bind, MeasureValues
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 export function main() {
   describe('size validator', () => {
diff --git a/modules/benchpress/test/web_driver_extension_spec.js b/modules/benchpress/test/web_driver_extension_spec.js
@@ -4,7 +4,7 @@ import { StringMap, ListWrapper } from 'angular2/src/facade/collection';
 import { isPresent, StringWrapper } from 'angular2/src/facade/lang';
 import { PromiseWrapper } from 'angular2/src/facade/async';
 
-import { WebDriverExtension, bind, Injector, Options } from 'benchpress/benchpress';
+import { WebDriverExtension, bind, Injector, Options } from 'benchpress/common';
 
 export function main() {
   function createExtension(ids, caps) {
diff --git a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.js b/modules/benchpress/test/webdriver/chrome_driver_extension_spec.js
@@ -7,7 +7,7 @@ import { Json, isBlank } from 'angular2/src/facade/lang';
 import {
   WebDriverExtension, ChromeDriverExtension,
   WebDriverAdapter, Injector, bind
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 import { TraceEventFactory } from '../trace_event_factory';
 
diff --git a/modules/benchpress/test/webdriver/ios_driver_extension_spec.js b/modules/benchpress/test/webdriver/ios_driver_extension_spec.js
@@ -7,7 +7,7 @@ import { Json, isBlank, isPresent } from 'angular2/src/facade/lang';
 import {
   WebDriverExtension, IOsDriverExtension,
   WebDriverAdapter, Injector, bind
-} from 'benchpress/benchpress';
+} from 'benchpress/common';
 
 import { TraceEventFactory } from '../trace_event_factory';
 
diff --git a/modules/examples/test/benchpress/webdriver_async.server.spec.dart b/modules/examples/test/benchpress/webdriver_async.server.spec.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io' show Platform;
 import 'package:guinness/guinness.dart';
 import 'package:benchpress/benchpress.dart';
-import 'package:benchpress/src/webdriver/async_webdriver_adapter.dart';
 import 'package:webdriver/webdriver.dart' show WebDriver, Capabilities, LogType, LogLevel, By;
 
 main() {
diff --git a/protractor-shared.js b/protractor-shared.js
@@ -169,8 +169,6 @@ var config = exports.config = {
 exports.createBenchpressRunner = function(options) {
   var nodeUuid = require('node-uuid');
   var benchpress = require('./dist/js/cjs/benchpress/benchpress');
-  var SeleniumWebDriverAdapter =
-    require('./dist/js/cjs/benchpress/src/webdriver/selenium_webdriver_adapter').SeleniumWebDriverAdapter;
 
   // TODO(tbosch): add cloud reporter again (only when !options.test)
   // var cloudReporterConfig;
@@ -189,9 +187,7 @@ exports.createBenchpressRunner = function(options) {
     runId = process.env.GIT_SHA + ' ' + runId;
   }
   var bindings = [
-    benchpress.bind(benchpress.WebDriverAdapter).toFactory(
-      function() { return new SeleniumWebDriverAdapter(global.browser); }, []
-    ),
+    benchpress.SeleniumWebDriverAdapter.PROTRACTOR_BINDINGS,
     benchpress.bind(benchpress.Options.FORCE_GC).toValue(argv['force-gc']),
     benchpress.bind(benchpress.Options.DEFAULT_DESCRIPTION).toValue({
       'lang': options.lang,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export './common.dart';`
	`2`	`+export './src/webdriver/async_webdriver_adapter.dart' show AsyncWebDriverAdapter;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './common';`
	`2`	`+export { SeleniumWebDriverAdapter } from './src/webdriver/selenium_webdriver_adapter';`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ class AsyncWebDriverAdapter extends WebDriverAdapter {`
`16`	`16`	`return _driver.execute(script, const[]);`
`17`	`17`	`}`
`18`	`18`
`19`		`- Map capabilities() {`
`20`		`- return _driver.capabilities;`
	`19`	`+ Future<Map> capabilities() {`
	`20`	`+ return new Future.value(_driver.capabilities);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`Future<List<Map>> logs(String type) {`