repackaging: all the repackaging changes squashed

modules/@angular/compiler/testing/directive_resolver_mock.ts

@@ -1,8 +1,7 @@
-import {Injectable} from 'angular2/src/core/di';
-import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Type, isPresent, stringify, isBlank, print} from 'angular2/src/facade/lang';
-import {DirectiveMetadata, ComponentMetadata} from '../core/metadata';
-import {DirectiveResolver} from 'angular2/src/compiler/directive_resolver';
+import {Map} from '../src/facade/collection';
+import {Type, isPresent} from '../src/facade/lang';
+import {DirectiveMetadata, ComponentMetadata, Injectable} from '@angular/core';
+import {DirectiveResolver} from '../src/directive_resolver';
 
 /**
  * An implementation of {@link DirectiveResolver} that allows overriding
@@ -21,14 +20,14 @@ export class MockDirectiveResolver extends DirectiveResolver {
 
     var providers = dm.providers;
     if (isPresent(providerOverrides)) {
-      var originalViewProviders = isPresent(dm.providers) ? dm.providers : [];
+      var originalViewProviders: any[] = isPresent(dm.providers) ? dm.providers : [];
       providers = originalViewProviders.concat(providerOverrides);
     }
 
     if (dm instanceof ComponentMetadata) {
       var viewProviders = dm.viewProviders;
       if (isPresent(viewProviderOverrides)) {
-        var originalViewProviders = isPresent(dm.viewProviders) ? dm.viewProviders : [];
+        var originalViewProviders: any[] = isPresent(dm.viewProviders) ? dm.viewProviders : [];
         viewProviders = originalViewProviders.concat(viewProviderOverrides);
       }
 

modules/@angular/compiler/testing/schema_registry_mock.ts

@@ -1,9 +1,10 @@
-import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry';
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from '../src/facade/lang';
+import {ElementSchemaRegistry} from '../index';
 
 export class MockSchemaRegistry implements ElementSchemaRegistry {
   constructor(public existingProperties: {[key: string]: boolean},
               public attrPropMapping: {[key: string]: string}) {}
+
   hasProperty(tagName: string, property: string): boolean {
     var result = this.existingProperties[property];
     return isPresent(result) ? result : true;

modules/@angular/compiler/testing/test_component_builder.ts

@@ -7,27 +7,26 @@ import {
   Injectable,
   ViewMetadata,
   ElementRef,
-  EmbeddedViewRef,
   ChangeDetectorRef,
-  provide,
   NgZone,
-  NgZoneError
-} from 'angular2/core';
-import {DirectiveResolver, ViewResolver} from 'angular2/compiler';
+  NgZoneError,
+  DebugElement,
+  getDebugNode
+} from '@angular/core';
+import {DirectiveResolver, ViewResolver} from '../index';
 
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {Type, isPresent, isBlank, IS_DART} from 'angular2/src/facade/lang';
-import {PromiseWrapper, ObservableWrapper, PromiseCompleter} from 'angular2/src/facade/async';
-import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {BaseException} from '../src/facade/exceptions';
+import {Type, isPresent, isBlank, IS_DART} from '../src/facade/lang';
+import {PromiseWrapper, ObservableWrapper, PromiseCompleter} from '../src/facade/async';
+import {ListWrapper, MapWrapper} from '../src/facade/collection';
 
-import {el} from './utils';
-
-import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
-import {DOM} from 'angular2/src/platform/dom/dom_adapter';
-
-import {DebugNode, DebugElement, getDebugNode} from 'angular2/src/core/debug/debug_node';
-
-import {tick} from './fake_async';
+import {tick} from '@angular/core/testing';
+/**
+ * An abstract class for inserting the root test component element in a platform independent way.
+ */
+export class TestComponentRenderer {
+  insertRootElement(rootElementId: string) {}
+}
 
 export var ComponentFixtureAutoDetect = new OpaqueToken("ComponentFixtureAutoDetect");
 export var ComponentFixtureNoNgZone = new OpaqueToken("ComponentFixtureNoNgZone");
@@ -337,15 +336,9 @@ export class TestComponentBuilder {
 
   private _create<C>(ngZone: NgZone, componentFactory: ComponentFactory<C>): ComponentFixture<C> {
     let rootElId = `root${_nextRootElementId++}`;
-    let rootEl = el(`<div id="${rootElId}"></div>`);
-    let doc = this._injector.get(DOCUMENT);
+    var testComponentRenderer: TestComponentRenderer = this._injector.get(TestComponentRenderer);
+    testComponentRenderer.insertRootElement(rootElId);
 
-    // TODO(juliemr): can/should this be optional?
-    let oldRoots = DOM.querySelectorAll(doc, '[id^=root]');
-    for (let i = 0; i < oldRoots.length; i++) {
-      DOM.remove(oldRoots[i]);
-    }
-    DOM.appendChild(doc.body, rootEl);
     var componentRef = componentFactory.create(this._injector, [], `#${rootElId}`);
     let autoDetect: boolean = this._injector.get(ComponentFixtureAutoDetect, false);
     return new ComponentFixture<any /*C*/>(componentRef, ngZone, autoDetect);

modules/@angular/compiler/testing/view_resolver_mock.ts

@@ -1,11 +1,8 @@
-import {resolveForwardRef} from 'angular2/src/core/di';
-import {Injectable} from 'angular2/src/core/di';
-import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Type, isPresent, isArray, stringify, isBlank} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-
-import {ViewMetadata} from '../core/metadata';
-import {ViewResolver} from 'angular2/src/compiler/view_resolver';
+import {Injectable, ViewMetadata, Type, BaseException} from '@angular/core';
+import {ViewResolver} from '../index';
+import {Map} from '../src/facade/collection';
+import {isPresent, stringify, isBlank, isArray} from '../src/facade/lang';
+import {resolveForwardRef} from '@angular/core';
 
 @Injectable()
 export class MockViewResolver extends ViewResolver {

modules/@angular/compiler/testing/xhr_mock.ts

@@ -1,8 +1,8 @@
-import {XHR} from 'angular2/src/compiler/xhr';
-import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
-import {isBlank, isPresent, normalizeBlank} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {PromiseCompleter, PromiseWrapper} from 'angular2/src/facade/async';
+import {XHR} from '../index';
+import {ListWrapper, Map} from '../src/facade/collection';
+import {isBlank, normalizeBlank} from '../src/facade/lang';
+import {BaseException} from '@angular/core';
+import {PromiseCompleter, PromiseWrapper} from '../src/facade/async';
 
 /**
  * A mock implementation of {@link XHR} that allows outgoing requests to be mocked