address comments

Author: mmalerba

src/material/list/testing/list-harness-base.ts

@@ -83,19 +83,16 @@ export class MatListHarnessBase
    * @return The list of items matching the given filters, grouped into sub-lists by divider.
    */
   async getItemsGroupedByDividers(filters?: F): Promise<C[][]> {
-    const listSections = [];
-    let currentSection = [];
+    const listSections: C[][] = [[]];
     const itemsAndDividers =
         await this.getItemsWithSubheadersAndDividers({item: filters, subheader: false});
     for (const itemOrDivider of itemsAndDividers) {
       if (itemOrDivider instanceof MatDividerHarness) {
-        listSections.push(currentSection);
-        currentSection = [];
+        listSections.push([]);
       } else {
-        currentSection.push(itemOrDivider);
+        listSections[listSections.length - 1].push(itemOrDivider);
       }
     }
-    listSections.push(currentSection);
     return listSections;
   }
 

src/material/list/testing/list-item-harness-base.ts

@@ -61,7 +61,7 @@ export class MatListItemHarnessBase extends ComponentHarness {
   }
 
   /** Gets the lines of text (`mat-line` elements) in this nav list item. */
-  async getLines(): Promise<string[]> {
+  async getLinesText(): Promise<string[]> {
     return Promise.all((await this._lines()).map(l => l.text()));
   }
 

src/material/list/testing/shared.spec.ts

@@ -159,11 +159,11 @@ function runBaseListFunctionalityTests<
       const items = await simpleListHarness.getItems();
       expect(items.length).toBe(3);
       expect(await items[0].getText()).toBe('Item 1');
-      expect(await items[0].getLines()).toEqual(['Item', '1']);
+      expect(await items[0].getLinesText()).toEqual(['Item', '1']);
       expect(await items[1].getText()).toBe('Item 2');
-      expect(await items[1].getLines()).toEqual([]);
+      expect(await items[1].getLinesText()).toEqual([]);
       expect(await items[2].getText()).toBe('Item 3');
-      expect(await items[2].getLines()).toEqual([]);
+      expect(await items[2].getLinesText()).toEqual([]);
     });
 
     it('should check list item icons and avatars', async () => {

tools/public_api_guard/material/list/testing.d.ts

@@ -18,11 +18,6 @@ export interface ListOptionHarnessFilters extends BaseListItemHarnessFilters {
     selected?: boolean;
 }
 
-export interface ListSection<I> {
-    heading?: string;
-    items: I[];
-}
-
 export declare class MatActionListHarness extends MatListHarnessBase<typeof MatActionListItemHarness, MatActionListItemHarness, ActionListItemHarnessFilters> {
     _itemHarness: typeof MatActionListItemHarness;
     static hostSelector: string;
@@ -43,77 +38,20 @@ export declare class MatListHarness extends MatListHarnessBase<typeof MatListIte
     static with(options?: ListHarnessFilters): HarnessPredicate<MatListHarness>;
 }
 
-export declare class MatListHarnessBase<T extends (ComponentHarnessConstructor<C> & {
-    with: (options?: BaseHarnessFilters) => HarnessPredicate<C>;
-}), C extends ComponentHarness, F extends BaseListItemHarnessFilters> extends ComponentHarness {
-    protected _itemHarness: T;
-    getItems(filters?: F): Promise<C[]>;
-    getItemsBySubheader(filters?: F): Promise<ListSection<C>[]>;
-    getItemsDivided(filters?: F): Promise<C[][]>;
-    getItemsSubheadersAndDividers(filters: {
-        item: false;
-        subheader: false;
-        divider: false;
-    }): Promise<[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item?: F | false;
-        subheader: false;
-        divider: false;
-    }): Promise<C[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item: false;
-        subheader?: SubheaderHarnessFilters | false;
-        divider: false;
-    }): Promise<MatSubheaderHarness[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item: false;
-        subheader: false;
-        divider?: DividerHarnessFilters | false;
-    }): Promise<MatDividerHarness[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item?: F | false;
-        subheader?: SubheaderHarnessFilters | false;
-        divider: false;
-    }): Promise<(C | MatSubheaderHarness)[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item?: F | false;
-        subheader: false;
-        divider?: false | DividerHarnessFilters;
-    }): Promise<(C | MatDividerHarness)[]>;
-    getItemsSubheadersAndDividers(filters: {
-        item: false;
-        subheader?: false | SubheaderHarnessFilters;
-        divider?: false | DividerHarnessFilters;
-    }): Promise<(MatSubheaderHarness | MatDividerHarness)[]>;
-    getItemsSubheadersAndDividers(filters?: {
-        item?: F | false;
-        subheader?: SubheaderHarnessFilters | false;
-        divider?: DividerHarnessFilters | false;
-    }): Promise<(C | MatSubheaderHarness | MatDividerHarness)[]>;
-}
-
 export declare class MatListItemHarness extends MatListItemHarnessBase {
     static hostSelector: string;
     static with(options?: ListItemHarnessFilters): HarnessPredicate<MatListItemHarness>;
 }
 
-export declare class MatListItemHarnessBase extends ComponentHarness {
-    getHarnessLoaderForContent(): Promise<HarnessLoader>;
-    getLines(): Promise<string[]>;
-    getText(): Promise<string>;
-    hasAvatar(): Promise<boolean>;
-    hasIcon(): Promise<boolean>;
-}
-
 export declare class MatListOptionHarness extends MatListItemHarnessBase {
     blur(): Promise<void>;
-    check(): Promise<void>;
+    deselect(): Promise<void>;
     focus(): Promise<void>;
     getCheckboxPosition(): Promise<'before' | 'after'>;
     isDisabled(): Promise<boolean>;
     isSelected(): Promise<boolean>;
+    select(): Promise<void>;
     toggle(): Promise<void>;
-    uncheck(): Promise<void>;
     static hostSelector: string;
     static with(options?: ListOptionHarnessFilters): HarnessPredicate<MatListOptionHarness>;
 }
@@ -135,19 +73,13 @@ export declare class MatNavListItemHarness extends MatListItemHarnessBase {
 
 export declare class MatSelectionListHarness extends MatListHarnessBase<typeof MatListOptionHarness, MatListOptionHarness, ListOptionHarnessFilters> {
     _itemHarness: typeof MatListOptionHarness;
-    checkItems(...filters: ListOptionHarnessFilters[]): Promise<void>;
+    deselectItems(...filters: ListItemHarnessFilters[]): Promise<void>;
     isDisabled(): Promise<boolean>;
-    uncheckItems(...filters: ListItemHarnessFilters[]): Promise<void>;
+    selectItems(...filters: ListOptionHarnessFilters[]): Promise<void>;
     static hostSelector: string;
     static with(options?: SelectionListHarnessFilters): HarnessPredicate<MatSelectionListHarness>;
 }
 
-export declare class MatSubheaderHarness extends ComponentHarness {
-    getText(): Promise<string>;
-    static hostSelector: string;
-    static with(options?: SubheaderHarnessFilters): HarnessPredicate<MatSubheaderHarness>;
-}
-
 export interface NavListHarnessFilters extends BaseHarnessFilters {
 }