chore(benchpress): make benchpress compile

Also adds compiling benchpress to the build scripts to verify that.

modules/benchpress/test/metric/multi_metric_spec.ts

@@ -1,15 +1,4 @@
-import {
-  afterEach,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/core/testing';
-import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {Metric, MultiMetric, ReflectiveInjector} from 'benchpress/common';
 
 export function main() {

modules/benchpress/test/metric/perflog_metric_spec.ts

@@ -1,19 +1,8 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {StringMapWrapper} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
-import {isPresent, isBlank} from '@angular/facade';
+import {StringMapWrapper} from '@angular/facade/src/collection';
+import {PromiseWrapper} from '@angular/facade/src/async';
+import {isPresent, isBlank} from '@angular/facade/src/lang';
 
 import {
   Metric,
@@ -46,7 +35,7 @@ export function main() {
     if (isBlank(microMetrics)) {
       microMetrics = StringMapWrapper.create();
     }
-    var providers = [
+    var providers: any[] = [
       Options.DEFAULT_PROVIDERS,
       PerflogMetric.PROVIDERS,
       {provide: Options.MICRO_METRICS, useValue: microMetrics},
@@ -63,7 +52,7 @@ export function main() {
       }
     ];
     if (isPresent(forceGc)) {
-      providers.push({provide: Options.FORCE_GC, useValue(forceGc)};
+      providers.push({provide: Options.FORCE_GC, useValue: forceGc});
     }
     if (isPresent(captureFrames)) {
       providers.push({provide: Options.CAPTURE_FRAMES, useValue: captureFrames});

modules/benchpress/test/metric/user_metric_spec.ts

@@ -1,21 +1,10 @@
-import {ReflectiveInjector} from "angular2/core";
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit
-} from 'angular2/testing_internal';
+import {ReflectiveInjector} from '@angular/core';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {TimerWrapper} from 'angular2/src/facade/async';
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {isPresent, isBlank, Json} from 'angular2/src/facade/lang';
+import {TimerWrapper} from '@angular/facade/src/async';
+import {StringMapWrapper} from '@angular/facade/src/collection';
+import {PromiseWrapper} from '@angular/facade/src/async';
+import {isPresent, isBlank, Json} from '@angular/facade/src/lang';
 
 import {
   Metric,
@@ -46,7 +35,7 @@ export function main() {
     wdAdapter = new MockDriverAdapter();
     var bindings = [
       Options.DEFAULT_PROVIDERS,
-      UserMetric.BINDINGS,
+      UserMetric.PROVIDERS,
       bind(Options.USER_METRICS).toValue(userMetrics),
       provide(WebDriverAdapter, {useValue: wdAdapter})
     ];

modules/benchpress/test/reporter/console_reporter_spec.ts

@@ -1,15 +1,6 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {isBlank, isPresent, Date, DateWrapper} from '@angular/facade';
+import {isBlank, isPresent, Date, DateWrapper} from '@angular/facade/src/lang';
 
 import {
   SampleState,
@@ -40,7 +31,7 @@ export function main() {
         {provide: ConsoleReporter.PRINT, useValue: (line) => log.push(line)}
       ];
       if (isPresent(columnWidth)) {
-        bindings.push({provide: ConsoleReporter.COLUMN_WIDTH, useValue(columnWidth)};
+        bindings.push({provide: ConsoleReporter.COLUMN_WIDTH, useValue: columnWidth});
       }
       reporter = ReflectiveInjector.resolveAndCreate(bindings).get(ConsoleReporter);
     }

modules/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {DateWrapper, Json, RegExpWrapper, isPresent} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+import {DateWrapper, Json, RegExpWrapper, isPresent} from '@angular/facade/src/lang';
+import {PromiseWrapper} from '@angular/facade/src/async';
 
 import {
   ReflectiveInjector,
@@ -32,7 +21,7 @@ export function main() {
       var bindings = [
         JsonFileReporter.PROVIDERS,
         {provide: SampleDescription, useValue: new SampleDescription(sampleId, descriptions, metrics)},
-        {provide: JsonFileReporter.PATH, useValue(path)},
+        {provide: JsonFileReporter.PATH, useValue: path},
         {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(1234)},
         {
           provide: Options.WRITE_FILE,

modules/benchpress/test/reporter/multi_reporter_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {PromiseWrapper} from '@angular/facade';
-import {DateWrapper} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade/src/async';
+import {DateWrapper} from '@angular/facade/src/lang';
 
 import {
   Reporter,

modules/benchpress/test/runner_spec.ts

@@ -1,15 +1,4 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {
   Runner,
   Sampler,
@@ -22,8 +11,8 @@ import {
   WebDriverAdapter,
   SampleState
 } from 'benchpress/common';
-import {isBlank} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+import {isBlank} from '@angular/facade/src/lang';
+import {PromiseWrapper} from '@angular/facade/src/async';
 
 export function main() {
   describe('runner', () => {

modules/benchpress/test/sampler_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {isBlank, isPresent, stringify, Date, DateWrapper} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+import {isBlank, isPresent, stringify, Date, DateWrapper} from '@angular/facade/src/lang';
+import {PromiseWrapper} from '@angular/facade/src/async';
 
 import {
   Sampler,

modules/benchpress/test/statistic_spec.ts

@@ -1,18 +1,7 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
 import {Statistic} from 'benchpress/src/statistic';
 
-import {NaN} from '@angular/facade';
-
 export function main() {
   describe('statistic', () => {
 

modules/benchpress/test/trace_event_factory.ts

@@ -1,4 +1,4 @@
-import {isPresent} from '@angular/facade';
+import {isPresent} from '@angular/facade/src/lang';
 
 export class TraceEventFactory {
   private _cat: string;

modules/benchpress/test/validator/regression_slope_validator_spec.ts

@@ -1,15 +1,6 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
-import {Date, DateWrapper} from '@angular/facade';
-import {ListWrapper} from '@angular/facade';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Date, DateWrapper} from '@angular/facade/src/lang';
+import {ListWrapper} from '@angular/facade/src/collection';
 
 import {
   RegressionSlopeValidator,
@@ -24,8 +15,8 @@ export function main() {
     function createValidator({size, metric}) {
       validator = ReflectiveInjector.resolveAndCreate([
                                       RegressionSlopeValidator.PROVIDERS,
-                                      {provide: RegressionSlopeValidator.METRIC, useValue(metric)},
-                                      {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue(size)}
+                                      {provide: RegressionSlopeValidator.METRIC, useValue: metric},
+                                      {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
                                     ])
                       .get(RegressionSlopeValidator);
     }

modules/benchpress/test/validator/size_validator_spec.ts

@@ -1,15 +1,6 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
-import {Date, DateWrapper} from '@angular/facade';
-import {ListWrapper} from '@angular/facade';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Date, DateWrapper} from '@angular/facade/src/lang';
+import {ListWrapper} from '@angular/facade/src/collection';
 
 import {
   Validator,

modules/benchpress/test/web_driver_extension_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {isPresent, StringWrapper} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+import {isPresent, StringWrapper} from '@angular/facade/src/lang';
+import {PromiseWrapper} from '@angular/facade/src/async';
 
 import {WebDriverExtension, ReflectiveInjector, Options} from 'benchpress/common';
 

modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {PromiseWrapper} from '@angular/facade';
-import {Json, isBlank} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade/src/async';
+import {Json, isBlank} from '@angular/facade/src/lang';
 
 import {
   WebDriverExtension,
@@ -59,7 +48,7 @@ export function main() {
           ReflectiveInjector.resolveAndCreate([
                               ChromeDriverExtension.PROVIDERS,
                               {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords, messageMethod)},
-                              {provide: Options.USER_AGENT, useValue(userAgent)}
+                              {provide: Options.USER_AGENT, useValue: userAgent}
                             ])
               .get(ChromeDriverExtension);
       return extension;

modules/benchpress/test/webdriver/ios_driver_extension_spec.ts

@@ -1,18 +1,7 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+import {afterEach, AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {PromiseWrapper} from '@angular/facade';
-import {Json, isBlank, isPresent} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade/src/async';
+import {Json, isBlank, isPresent} from '@angular/facade/src/lang';
 
 import {
   WebDriverExtension,