rename some things

Author: mmalerba

src/cdk-experimental/testing/component-harness.ts

@@ -11,10 +11,10 @@ import {TestElement} from './test-element';
 /** An async function that returns a promise of the given type when called. */
 export type AsyncFn<T> = () => Promise<T>;
 
-export interface HarnessEnvironment {
-  findRequired(selector: string): Promise<HarnessEnvironment>;
-  findOptional(selector: string): Promise<HarnessEnvironment | null>;
-  findAll(selector: string): Promise<HarnessEnvironment[]>;
+export interface HarnessLoader {
+  findRequired(selector: string): Promise<HarnessLoader>;
+  findOptional(selector: string): Promise<HarnessLoader | null>;
+  findAll(selector: string): Promise<HarnessLoader[]>;
   requiredHarness<T extends ComponentHarness>(harness: ComponentHarnessConstructor<T>): Promise<T>;
   optionalHarness<T extends ComponentHarness>(harness: ComponentHarnessConstructor<T>):
       Promise<T | null>;
@@ -34,17 +34,17 @@ export interface LocatorFactory {
 }
 
 /** Interface that is used to find elements in the DOM and create harnesses for them. */
-export abstract class AbstractHarnessEnvironment<E> implements HarnessEnvironment, LocatorFactory {
+export abstract class AbstractHarnessEnvironment<E> implements HarnessLoader, LocatorFactory {
   protected constructor(protected rawRootElement: E) {}
 
   abstract documentRootLocatorFactory(): LocatorFactory;
 
   protected abstract createTestElement(element: E): TestElement;
 
-  protected abstract createHarness<T extends ComponentHarness>(
+  protected abstract createComponentHarness<T extends ComponentHarness>(
       harnessType: ComponentHarnessConstructor<T>, element: E): T;
 
-  protected abstract createEnvironment(element: E): HarnessEnvironment;
+  protected abstract createHarnessLoader(element: E): HarnessLoader;
 
   protected abstract getRawElement(selector: string): Promise<E | null>;
 
@@ -67,7 +67,7 @@ export abstract class AbstractHarnessEnvironment<E> implements HarnessEnvironmen
       } else {
         const element = await this.getRawElement(arg.hostSelector);
         if (element) {
-          return this.createHarness(arg, element);
+          return this.createComponentHarness(arg, element);
         }
       }
       const selector = typeof arg === 'string' ? arg : arg.hostSelector;
@@ -86,7 +86,7 @@ export abstract class AbstractHarnessEnvironment<E> implements HarnessEnvironmen
         return element ? this.createTestElement(element) : null;
       } else {
         const element = await this.getRawElement(arg.hostSelector);
-        return element ? this.createHarness(arg, element) : null;
+        return element ? this.createComponentHarness(arg, element) : null;
       }
     };
   }
@@ -100,7 +100,7 @@ export abstract class AbstractHarnessEnvironment<E> implements HarnessEnvironmen
         return (await this.getAllRawElements(arg)).map(e => this.createTestElement(e));
       } else {
         return (await this.getAllRawElements(arg.hostSelector))
-            .map(e => this.createHarness(arg, e));
+            .map(e => this.createComponentHarness(arg, e));
       }
     };
   }
@@ -118,21 +118,21 @@ export abstract class AbstractHarnessEnvironment<E> implements HarnessEnvironmen
     return this.allLocator(harness)();
   }
 
-  async findRequired(selector: string): Promise<HarnessEnvironment> {
+  async findRequired(selector: string): Promise<HarnessLoader> {
     const element = await this.getRawElement(selector);
     if (element) {
-      return this.createEnvironment(element);
+      return this.createHarnessLoader(element);
     }
     throw Error(`Expected to find element matching selector: "${selector}", but none was found`);
   }
 
-  async findOptional(selector: string): Promise<HarnessEnvironment | null> {
+  async findOptional(selector: string): Promise<HarnessLoader | null> {
     const element = await this.getRawElement(selector);
-    return element ? this.createEnvironment(element) : null;
+    return element ? this.createHarnessLoader(element) : null;
   }
 
-  async findAll(selector: string): Promise<HarnessEnvironment[]> {
-    return (await this.getAllRawElements(selector)).map(e => this.createEnvironment(e));
+  async findAll(selector: string): Promise<HarnessLoader[]> {
+    return (await this.getAllRawElements(selector)).map(e => this.createHarnessLoader(e));
   }
 }
 

src/cdk-experimental/testing/protractor.ts

@@ -12,7 +12,7 @@ import {
   AbstractHarnessEnvironment,
   ComponentHarness,
   ComponentHarnessConstructor,
-  HarnessEnvironment,
+  HarnessLoader,
   LocatorFactory,
 } from './component-harness';
 import {TestElement} from './test-element';
@@ -22,7 +22,7 @@ export class ProtractorHarnessEnvironment extends AbstractHarnessEnvironment<Ele
     super(rawRootElement);
   }
 
-  static create(): HarnessEnvironment {
+  static create(): HarnessLoader {
     return new ProtractorHarnessEnvironment(protractorElement(by.css('body')));
   }
 
@@ -34,12 +34,12 @@ export class ProtractorHarnessEnvironment extends AbstractHarnessEnvironment<Ele
     return new ProtractorElement(element);
   }
 
-  protected createHarness<T extends ComponentHarness>(
+  protected createComponentHarness<T extends ComponentHarness>(
       harnessType: ComponentHarnessConstructor<T>, element: ElementFinder): T {
     return new harnessType(new ProtractorHarnessEnvironment(element));
   }
 
-  protected createEnvironment(element: ElementFinder): HarnessEnvironment {
+  protected createHarnessLoader(element: ElementFinder): HarnessLoader {
     return new ProtractorHarnessEnvironment(element);
   }
 

src/cdk-experimental/testing/testbed.ts

@@ -19,7 +19,7 @@ import {
   AbstractHarnessEnvironment,
   ComponentHarness,
   ComponentHarnessConstructor,
-  HarnessEnvironment,
+  HarnessLoader,
   LocatorFactory
 } from './component-harness';
 import {TestElement} from './test-element';
@@ -33,7 +33,7 @@ export class TestbedHarnessEnvironment extends AbstractHarnessEnvironment<Elemen
     super(rawRootElement);
   }
 
-  static create(fixture: ComponentFixture<unknown>): HarnessEnvironment {
+  static create(fixture: ComponentFixture<unknown>): HarnessLoader {
     const stabilize = async () => {
       fixture.detectChanges();
       await fixture.whenStable();
@@ -49,7 +49,7 @@ export class TestbedHarnessEnvironment extends AbstractHarnessEnvironment<Elemen
     };
     const environment = new TestbedHarnessEnvironment(fixture.nativeElement, stabilize);
     await environment._stabilize();
-    return environment.createHarness(harnessType, fixture.nativeElement);
+    return environment.createComponentHarness(harnessType, fixture.nativeElement);
   }
 
   documentRootLocatorFactory(): LocatorFactory {
@@ -64,12 +64,12 @@ export class TestbedHarnessEnvironment extends AbstractHarnessEnvironment<Elemen
     return new UnitTestElement(element, this._stabilize);
   }
 
-  protected createHarness<T extends ComponentHarness>(
+  protected createComponentHarness<T extends ComponentHarness>(
       harnessType: ComponentHarnessConstructor<T>, element: Element): T {
     return new harnessType(new TestbedHarnessEnvironment(element, this._stabilize));
   }
 
-  protected createEnvironment(element: Element): HarnessEnvironment {
+  protected createHarnessLoader(element: Element): HarnessLoader {
     return new TestbedHarnessEnvironment(element, this._stabilize);
   }