fix(cdk/tree): revert signal changes for tests

Author: BobobUnicorn

src/cdk/tree/tree-using-legacy-key-manager.spec.ts

@@ -1,4 +1,4 @@
-import {Component, viewChildren, ElementRef} from '@angular/core';
+import {Component, QueryList, ViewChildren, ElementRef} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {of} from 'rxjs';
 import {CdkTreeModule} from './tree-module';
@@ -15,11 +15,12 @@ describe('CdkTree when provided LegacyTreeKeyManager', () => {
 
     fixture = TestBed.createComponent(SimpleCdkTreeApp);
     fixture.detectChanges();
+    fixture.detectChanges();
   });
 
   describe('with default node options', () => {
     it('renders nodes with tabindex attribute of -1', () => {
-      const treeItems = fixture.componentInstance.treeNodes();
+      const treeItems = fixture.componentInstance.treeNodes;
 
       expect(treeItems.map(x => `${x.nativeElement.getAttribute('tabindex')}`).join(', '))
         .withContext('tabindex of tree nodes')
@@ -29,14 +30,14 @@ describe('CdkTree when provided LegacyTreeKeyManager', () => {
 
   describe('when focusing the second node', () => {
     beforeEach(() => {
-      const treeItems = fixture.componentInstance.treeNodes();
+      const treeItems = fixture.componentInstance.treeNodes;
 
-      treeItems[1]!.nativeElement.focus();
+      treeItems.get(1)!.nativeElement.focus();
       fixture.detectChanges();
     });
 
     it('does not change tabindex of nodes', () => {
-      const treeItems = fixture.componentInstance.treeNodes();
+      const treeItems = fixture.componentInstance.treeNodes;
 
       expect(treeItems.map(x => `${x.nativeElement.getAttribute('tabindex')}`).join(', '))
         .withContext('tabindex of tree nodes')
@@ -46,9 +47,9 @@ describe('CdkTree when provided LegacyTreeKeyManager', () => {
 
   describe('when clicking the second node', () => {
     beforeEach(() => {
-      const treeItems = fixture.componentInstance.treeNodes();
+      const treeItems = fixture.componentInstance.treeNodes;
 
-      treeItems[1]!.nativeElement.click();
+      treeItems.get(1)!.nativeElement.click();
       fixture.detectChanges();
     });
 
@@ -57,7 +58,7 @@ describe('CdkTree when provided LegacyTreeKeyManager', () => {
     });
 
     it('does not change tabindex of nodes', () => {
-      const treeItems = fixture.componentInstance.treeNodes();
+      const treeItems = fixture.componentInstance.treeNodes;
 
       expect(treeItems.map(x => `${x.nativeElement.getAttribute('tabindex')}`).join(', '))
         .withContext('tabindex of tree nodes')
@@ -88,5 +89,5 @@ class SimpleCdkTreeApp {
 
   dataSource = of([new MinimalTestData('apple'), new MinimalTestData('banana')]);
 
-  readonly treeNodes = viewChildren<ElementRef<HTMLElement>>('node');
+  @ViewChildren('node') treeNodes: QueryList<ElementRef<HTMLElement>>;
 }

src/cdk/tree/tree-with-tree-control.spec.ts

@@ -13,8 +13,8 @@ import {
   TrackByFunction,
   Type,
   EventEmitter,
-  viewChildren,
-  viewChild,
+  ViewChildren,
+  QueryList,
 } from '@angular/core';
 
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
@@ -81,7 +81,7 @@ describe('CdkTree with TreeControl', () => {
     const fixture = TestBed.createComponent(SimpleCdkTreeApp);
     fixture.detectChanges();
     const spy = jasmine.createSpy('completeSpy');
-    const subscription = fixture.componentInstance.tree().viewChange.subscribe({complete: spy});
+    const subscription = fixture.componentInstance.tree.viewChange.subscribe({complete: spy});
 
     fixture.destroy();
     expect(spy).toHaveBeenCalled();
@@ -101,7 +101,7 @@ describe('CdkTree with TreeControl', () => {
 
         component = fixture.componentInstance;
         dataSource = component.dataSource as FakeDataSource;
-        tree = component.tree();
+        tree = component.tree;
         treeElement = fixture.nativeElement.querySelector('cdk-tree');
       });
 
@@ -216,7 +216,8 @@ describe('CdkTree with TreeControl', () => {
       });
 
       it('should be able to set zero as the indent level', () => {
-        component.paddingNodes().forEach(node => (node.level = 0));
+        fixture.detectChanges();
+        component.paddingNodes.forEach(node => (node.level = 0));
 
         const data = dataSource.data;
 
@@ -1473,8 +1474,8 @@ class SimpleCdkTreeApp {
   dataSource: FakeDataSource | null = new FakeDataSource(this.treeControl);
   indent: number | string = 28;
 
-  readonly tree = viewChild.required<CdkTree<TestData>>(CdkTree);
-  readonly paddingNodes = viewChildren(CdkTreeNodePadding);
+  @ViewChild(CdkTree) tree: CdkTree<TestData>;
+  @ViewChildren(CdkTreeNodePadding) paddingNodes: QueryList<CdkTreeNodePadding<TestData>>;
 }
 
 @Component({

src/cdk/tree/tree.spec.ts

@@ -18,8 +18,6 @@ import {
   ViewChildren,
   inject,
   ElementRef,
-  viewChildren,
-  viewChild,
 } from '@angular/core';
 
 import {Direction, Directionality} from '@angular/cdk/bidi';
@@ -88,7 +86,7 @@ describe('CdkTree', () => {
       const fixture = TestBed.createComponent(SimpleCdkTreeApp);
       fixture.detectChanges();
       const spy = jasmine.createSpy('completeSpy');
-      const subscription = fixture.componentInstance.tree().viewChange.subscribe({complete: spy});
+      const subscription = fixture.componentInstance.tree.viewChange.subscribe({complete: spy});
 
       fixture.destroy();
       expect(spy).toHaveBeenCalled();
@@ -109,7 +107,7 @@ describe('CdkTree', () => {
 
         component = fixture.componentInstance;
         dataSource = component.dataSource as FakeDataSource;
-        tree = component.tree();
+        tree = component.tree;
         treeElement = fixture.nativeElement.querySelector('cdk-tree');
       });
 
@@ -224,7 +222,8 @@ describe('CdkTree', () => {
       });
 
       it('should be able to set zero as the indent level', () => {
-        component.paddingNodes().forEach(node => (node.level = 0));
+        fixture.detectChanges();
+        component.paddingNodes.forEach(node => (node.level = 0));
 
         const data = dataSource.data;
 
@@ -1690,11 +1689,11 @@ class SimpleCdkTreeApp {
   dataSource: FakeDataSource | null = new FakeDataSource();
   indent: number | string = 28;
 
-  readonly tree = viewChild.required<CdkTree<TestData>>(CdkTree);
-  readonly paddingNodes = viewChildren(CdkTreeNodePadding);
+  @ViewChild(CdkTree) tree: CdkTree<TestData>;
+  @ViewChildren(CdkTreeNodePadding) paddingNodes: QueryList<CdkTreeNodePadding<TestData>>;
 
   expandAll() {
-    this.tree().expandAll();
+    this.tree.expandAll();
   }
 }