feat(cdk/tree): fix tests

Author: BobobUnicorn

src/cdk/tree/nested-node.ts

@@ -69,11 +69,10 @@ export class CdkNestedTreeNode<T, K = T>
 
   ngAfterContentInit() {
     this._dataDiffer = this._differs.find([]).create(this._tree.trackBy);
-    const childAccessor = this._tree._getChildrenAccessor();
-    if (!childAccessor && (typeof ngDevMode === 'undefined' || ngDevMode)) {
+    if (!this._tree.treeControl?.getChildren && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       throw getTreeControlFunctionsMissingError();
     }
-    const childrenNodes = childAccessor!(this.data);
+    const childrenNodes = this._tree.treeControl!.getChildren(this.data);
     if (Array.isArray(childrenNodes)) {
       this.updateChildrenNodes(childrenNodes as T[]);
     } else if (isObservable(childrenNodes)) {

src/cdk/tree/padding.ts

@@ -80,9 +80,10 @@ export class CdkTreeNodePadding<T, K = T> implements OnDestroy {
 
   /** The padding indent value for the tree node. Returns a string with px numbers if not null. */
   _paddingIndent(): string | null {
-    const levelAccessor = this._tree._getLevelAccessor();
     const nodeLevel =
-      this._treeNode.data && levelAccessor ? levelAccessor(this._treeNode.data) : null;
+      this._treeNode.data && this._tree.treeControl?.getLevel
+        ? this._tree.treeControl.getLevel(this._treeNode.data)
+        : null;
     const level = this._level == null ? nodeLevel : this._level;
     return typeof level === 'number' ? `${level * this._indent}${this.indentUnits}` : null;
   }

src/cdk/tree/toggle.ts

@@ -35,8 +35,8 @@ export class CdkTreeNodeToggle<T, K = T> {
 
   _toggle(event: Event): void {
     this.recursive
-      ? this._tree.toggleDescendants(this._treeNode.data)
-      : this._tree.toggle(this._treeNode.data);
+      ? this._tree.treeControl?.toggleDescendants(this._treeNode.data)
+      : this._tree.treeControl?.toggle(this._treeNode.data);
 
     event.stopPropagation();
   }

src/cdk/tree/tree.spec.ts

@@ -1141,18 +1141,6 @@ describe('CdkTree', () => {
         }
       }).toThrowError(getTreeControlFunctionsMissingError().message);
     }));
-
-    it('should throw an error when missing function in flat tree', fakeAsync(() => {
-      configureCdkTreeTestingModule([FlatCdkErrorTreeApp]);
-      expect(() => {
-        try {
-          TestBed.createComponent(FlatCdkErrorTreeApp).detectChanges();
-          flush();
-        } catch {
-          flush();
-        }
-      }).toThrowError(getTreeControlFunctionsMissingError().message);
-    }));
   });
 
   describe('with depth', () => {
@@ -1668,37 +1656,6 @@ class NestedCdkErrorTreeApp {
   @ViewChild(CdkTree) tree: CdkTree<TestData>;
 }
 
-class FakeTreeControl extends BaseTreeControl<TestData> {
-  getDescendants(_: TestData): TestData[] {
-    return this.dataNodes;
-  }
-
-  expandAll(): void {
-    // No op
-  }
-}
-@Component({
-  template: `
-    <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
-      <cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
-                     {{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
-         <ng-template cdkTreeNodeOutlet></ng-template>
-      </cdk-tree-node>
-    </cdk-tree>
-  `,
-})
-class FlatCdkErrorTreeApp {
-  getLevel = (node: TestData) => node.level;
-
-  isExpandable = (node: TestData) => node.children.length > 0;
-
-  treeControl: TreeControl<TestData> = new FakeTreeControl();
-
-  dataSource: FakeDataSource | null = new FakeDataSource(this.treeControl);
-
-  @ViewChild(CdkTree) tree: CdkTree<TestData>;
-}
-
 @Component({
   template: `
     <cdk-tree [dataSource]="dataArray" [treeControl]="treeControl">

src/cdk/tree/tree.ts

@@ -448,14 +448,7 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
 
   @Input()
   get isExpanded(): boolean {
-    return this._tree.isExpanded(this._data);
-  }
-  set isExpanded(isExpanded: boolean) {
-    if (isExpanded) {
-      this._tree.expand(this._data);
-    } else {
-      this._tree.collapse(this._data);
-    }
+    return !!this._tree.treeControl?.isExpanded(this._data);
   }
 
   /**

tools/public_api_guard/cdk/tree.md

@@ -150,8 +150,6 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
     get level(): number;
     static mostRecentTreeNode: CdkTreeNode<any> | null;
     // (undocumented)
-    static ngAcceptInputType_recursive: BooleanInput;
-    // (undocumented)
     ngOnDestroy(): void;
     // (undocumented)
     ngOnInit(): void;