different geText for nested node

separte out toggle method, change role to isLeaf

Author: annieyw

src/material/tree/testing/BUILD.bazel

@@ -10,8 +10,8 @@ ts_library(
     ),
     module_name = "@angular/material/tree/testing",
     deps = [
-        "//src/cdk/testing",
         "//src/cdk/coercion",
+        "//src/cdk/testing",
     ],
 )
 
@@ -27,8 +27,8 @@ ng_test_library(
         ":testing",
         "//src/cdk/testing",
         "//src/cdk/testing/testbed",
-        "//src/material/tree",
         "//src/cdk/tree",
+        "//src/material/tree",
     ],
 )
 

src/material/tree/testing/node-harness.ts

@@ -45,23 +45,44 @@ export class MatTreeNodeHarness extends ComponentHarness {
     return coerceNumberProperty(await (await this.host()).getAttribute('aria-level'));
   }
 
-  /** Gets the role of the tree node. 'group' or 'treeitem' */
-  async getRole(): Promise<string|null> {
-    return (await this.host()).getAttribute('role');
+  /** Whether the node is a leaf node. */
+  async isLeaf(): Promise<boolean> {
+    const role = await (await this.host()).getAttribute('role');
+    if (role === 'group') {
+      return false;
+    } else if (role === 'treeitem') {
+      return true
+    } else {
+      throw new Error('Invalid node role');
+    }
   }
 
   /** Gets the tree node's text. */
   async getText(): Promise<string> {
     return (await this.host()).text();
   }
 
-  /** Expands/collapses the node by clicking on the toggle. Only works when node is not disabled. */
-  async toggleExpansion(): Promise<void> {
+  /** Toggles node between expanded/collapsed. Only works when node is not disabled. */
+  async toggle(): Promise<void> {
     const toggle = await this._toggle();
     if (toggle) {
       return toggle.click();
     }
   }
+
+  /** Expands the node if it is collapsed. Only works when node is not disabled. */
+  async expand(): Promise<void> {
+    if (!(await this.isExpanded())) {
+      await this.toggle();
+    }
+  }
+
+  /** Collapses the node if it is expanded. Only works when node is not disabled. */
+  async collapse(): Promise<void> {
+    if (await this.isExpanded()) {
+      await this.toggle();
+    }
+  }
 }
 
 /** Harness for interacting with a standard Angular Material nested tree node. */
@@ -97,6 +118,6 @@ function getNodePredicate<T extends MatTreeNodeHarness>(
       'level', options.level,
       async (harness, level) => (await harness.getLevel()) === level)
     .addOption(
-      'role', options.role,
-      async (harness, role) => (await harness.getRole()) === role);
+      'leaf', options.leaf,
+      async (harness, leaf) => (await harness.isLeaf()) === leaf);
 }

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

@@ -57,7 +57,7 @@ export function runHarnessTests(
     expect(flatTreeNodes.length).toBe(1);
     const secondGroup = flatTreeNodes[0];
 
-    expect(await secondGroup.getRole()).toBe('group');
+    expect(await secondGroup.isLeaf()).toBe(false);
     expect(await secondGroup.getText()).toBe('Toggle  Flat Group 2');
     expect(await secondGroup.getLevel()).toBe(0);
     expect(await secondGroup.isDisabled()).toBe(false);
@@ -72,7 +72,7 @@ export function runHarnessTests(
 
     expect(await firstGroup.isExpanded()).toBe(false);
 
-    await firstGroup.toggleExpansion();
+    await firstGroup.expand();
 
     expect(await firstGroup.isExpanded()).toBe(true);
   });

src/material/tree/testing/tree-harness-filters.ts

@@ -17,14 +17,14 @@ export interface TreeNodeHarnessFilters extends BaseHarnessFilters {
   /** Only find instances whose text matches the given value. */
   text?: string | RegExp;
 
-  /** Only find instances whose state matches the given value. */
+  /** Only find instances whose disabled state matches the given value. */
   disabled?: boolean;
 
   /** Only find instances whose expansion state matches the given value. */
   expanded?: boolean;
 
   /** Only find instances whose role matches the given value. */
-  role?: 'treeitem'|'group';
+  leaf?: boolean;
 
   /** Only find instances whose level matches the given value. */
   level?: number;