Skip to content

Commit b774eb0

Browse files
BobobUnicornBobobUnicorn
committed
fix(cdk/tree): fix some failing tests, one remaining
1 parent 2c89dd5 commit b774eb0

File tree

3 files changed

+30
-96
lines changed

3 files changed

+30
-96
lines changed

‎src/cdk/tree/tree-errors.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ export function getMultipleTreeControlsError() {
4747
return Error(`More than one of tree control, levelAccessor, or childrenAccessor were provided.`);
4848
}
4949

50-
/**
51-
* Returns an error to be thrown when tree control did not implement functions for flat/nested node.
52-
* @docs-private
53-
*/
54-
export function getTreeControlFunctionsMissingError() {
55-
return Error(`Could not find functions for nested/flat tree in tree control.`);
56-
}
57-
5850
/**
5951
* Returns an error to be thrown when the node type is not specified.
6052
* @docs-private

‎src/cdk/tree/tree-redesign.spec.ts‎

Lines changed: 30 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {map} from 'rxjs/operators';
2424

2525
import {CdkTreeModule, CdkTreeNodePadding} from './index';
2626
import {CdkTree, CdkTreeNode} from './tree';
27-
import {getTreeControlFunctionsMissingError} from './tree-errors';
2827

2928
/**
3029
* This is a cloned version of `tree.spec.ts` that contains all the same tests,
@@ -1127,20 +1126,6 @@ describe('CdkTree redesign', () => {
11271126
expect(changedNodes[5].getAttribute('initialIndex')).toBe('2');
11281127
});
11291128
});
1130-
1131-
it('should throw an error when missing function in nested tree', fakeAsync(() => {
1132-
configureCdkTreeTestingModule([NestedCdkErrorTreeApp]);
1133-
expect(() => {
1134-
try {
1135-
TestBed.createComponent(NestedCdkErrorTreeApp).detectChanges();
1136-
flush();
1137-
} catch {
1138-
flush();
1139-
} finally {
1140-
flush();
1141-
}
1142-
}).toThrowError(getTreeControlFunctionsMissingError().message);
1143-
}));
11441129
});
11451130

11461131
describe('with depth', () => {
@@ -1356,7 +1341,8 @@ function expectNestedTreeToMatch(treeElement: Element, ...expectedTree: any[]) {
13561341

13571342
@Component({
13581343
template: `
1359-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1344+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1345+
nodeType="flat">
13601346
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
13611347
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="indent"
13621348
cdkTreeNodeToggle
@@ -1383,7 +1369,8 @@ class SimpleCdkTreeApp {
13831369

13841370
@Component({
13851371
template: `
1386-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1372+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1373+
nodeType="flat">
13871374
<ng-container [ngSwitch]="true">
13881375
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
13891376
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="indent"
@@ -1399,7 +1386,8 @@ class SimpleCdkTreeAppWithIndirectNodes extends SimpleCdkTreeApp {}
13991386

14001387
@Component({
14011388
template: `
1402-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1389+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1390+
nodeType="nested">
14031391
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14041392
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14051393
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1417,7 +1405,8 @@ class NestedCdkTreeApp {
14171405

14181406
@Component({
14191407
template: `
1420-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1408+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1409+
nodeType="nested">
14211410
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14221411
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14231412
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1445,7 +1434,8 @@ class StaticNestedCdkTreeApp {
14451434

14461435
@Component({
14471436
template: `
1448-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1437+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1438+
nodeType="nested">
14491439
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14501440
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14511441
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1469,7 +1459,8 @@ class WhenNodeNestedCdkTreeApp {
14691459

14701460
@Component({
14711461
template: `
1472-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1462+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1463+
nodeType="flat">
14731464
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
14741465
cdkTreeNodePadding
14751466
cdkTreeNodeToggle [cdkTreeNodeToggleRecursive]="toggleRecursively"
@@ -1492,7 +1483,8 @@ class CdkTreeAppWithToggle {
14921483

14931484
@Component({
14941485
template: `
1495-
<cdk-tree #tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1486+
<cdk-tree #tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1487+
nodeType="nested">
14961488
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
14971489
cdkTreeNodeToggle [cdkTreeNodeToggleRecursive]="toggleRecursively">
14981490
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
@@ -1515,7 +1507,8 @@ class NestedCdkTreeAppWithToggle {
15151507

15161508
@Component({
15171509
template: `
1518-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1510+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1511+
nodeType="flat">
15191512
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
15201513
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15211514
cdkTreeNodeToggle
@@ -1543,7 +1536,8 @@ class WhenNodeCdkTreeApp {
15431536

15441537
@Component({
15451538
template: `
1546-
<cdk-tree [dataSource]="dataArray" [levelAccessor]="getLevel">
1539+
<cdk-tree [dataSource]="dataArray" [levelAccessor]="getLevel"
1540+
nodeType="flat">
15471541
<cdk-tree-node *cdkTreeNodeDef="let node"
15481542
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15491543
cdkTreeNodeToggle
@@ -1568,7 +1562,8 @@ class ArrayDataSourceCdkTreeApp {
15681562

15691563
@Component({
15701564
template: `
1571-
<cdk-tree [dataSource]="dataObservable" [levelAccessor]="getLevel">
1565+
<cdk-tree [dataSource]="dataObservable" [levelAccessor]="getLevel"
1566+
nodeType="flat">
15721567
<cdk-tree-node *cdkTreeNodeDef="let node"
15731568
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15741569
cdkTreeNodeToggle
@@ -1593,7 +1588,8 @@ class ObservableDataSourceCdkTreeApp {
15931588

15941589
@Component({
15951590
template: `
1596-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren">
1591+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren"
1592+
nodeType="nested">
15971593
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
15981594
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
15991595
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1615,7 +1611,8 @@ class ArrayDataSourceNestedCdkTreeApp {
16151611

16161612
@Component({
16171613
template: `
1618-
<cdk-tree [dataSource]="dataObservable" [childrenAccessor]="getChildren">
1614+
<cdk-tree [dataSource]="dataObservable" [childrenAccessor]="getChildren"
1615+
nodeType="nested">
16191616
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
16201617
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
16211618
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1637,28 +1634,8 @@ class ObservableDataSourceNestedCdkTreeApp {
16371634

16381635
@Component({
16391636
template: `
1640-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1641-
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
1642-
[isExpandable]="isExpandable(node)">
1643-
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
1644-
<ng-template cdkTreeNodeOutlet></ng-template>
1645-
</cdk-nested-tree-node>
1646-
</cdk-tree>
1647-
`,
1648-
})
1649-
class NestedCdkErrorTreeApp {
1650-
getLevel = (node: TestData) => node.level;
1651-
1652-
isExpandable = (node: TestData) => node.children.length > 0;
1653-
1654-
dataSource: FakeDataSource | null = new FakeDataSource();
1655-
1656-
@ViewChild(CdkTree) tree: CdkTree<TestData>;
1657-
}
1658-
1659-
@Component({
1660-
template: `
1661-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren">
1637+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren"
1638+
nodeType="nested">
16621639
<cdk-nested-tree-node *cdkTreeNodeDef="let node; let level = level">
16631640
<span class="tree-test-level">{{level}}</span>
16641641
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
@@ -1681,7 +1658,8 @@ class DepthNestedCdkTreeApp {
16811658

16821659
@Component({
16831660
template: `
1684-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel" [trackBy]="trackByFn">
1661+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel" [trackBy]="trackByFn"
1662+
nodeType="flat">
16851663
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass" [isExpandable]="isExpandable(node)">
16861664
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
16871665
</cdk-tree-node>
@@ -1712,7 +1690,8 @@ class CdkTreeAppWithTrackBy {
17121690

17131691
@Component({
17141692
template: `
1715-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren" [trackBy]="trackByFn">
1693+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren" [trackBy]="trackByFn"
1694+
nodeType="nested">
17161695
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
17171696
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
17181697
<ng-template cdkTreeNodeOutlet></ng-template>

‎src/cdk/tree/tree.spec.ts‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {FlatTreeControl} from './control/flat-tree-control';
2727
import {NestedTreeControl} from './control/nested-tree-control';
2828
import {CdkTreeModule, CdkTreeNodePadding} from './index';
2929
import {CdkTree, CdkTreeNode} from './tree';
30-
import {getTreeControlFunctionsMissingError} from './tree-errors';
3130

3231
describe('CdkTree', () => {
3332
/** Represents an indent for expectNestedTreeToMatch */
@@ -1126,20 +1125,6 @@ describe('CdkTree', () => {
11261125
expect(changedNodes[5].getAttribute('initialIndex')).toBe('2');
11271126
});
11281127
});
1129-
1130-
it('should throw an error when missing function in nested tree', fakeAsync(() => {
1131-
configureCdkTreeTestingModule([NestedCdkErrorTreeApp]);
1132-
expect(() => {
1133-
try {
1134-
TestBed.createComponent(NestedCdkErrorTreeApp).detectChanges();
1135-
flush();
1136-
} catch {
1137-
flush();
1138-
} finally {
1139-
flush();
1140-
}
1141-
}).toThrowError(getTreeControlFunctionsMissingError().message);
1142-
}));
11431128
});
11441129

11451130
describe('with depth', () => {
@@ -1633,28 +1618,6 @@ class ObservableDataSourceNestedCdkTreeApp {
16331618
@ViewChild(CdkTree) tree: CdkTree<TestData>;
16341619
}
16351620

1636-
@Component({
1637-
template: `
1638-
<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
1639-
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
1640-
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
1641-
<ng-template cdkTreeNodeOutlet></ng-template>
1642-
</cdk-nested-tree-node>
1643-
</cdk-tree>
1644-
`,
1645-
})
1646-
class NestedCdkErrorTreeApp {
1647-
getLevel = (node: TestData) => node.level;
1648-
1649-
isExpandable = (node: TestData) => node.children.length > 0;
1650-
1651-
treeControl: TreeControl<TestData> = new FlatTreeControl(this.getLevel, this.isExpandable);
1652-
1653-
dataSource: FakeDataSource | null = new FakeDataSource(this.treeControl);
1654-
1655-
@ViewChild(CdkTree) tree: CdkTree<TestData>;
1656-
}
1657-
16581621
@Component({
16591622
template: `
16601623
<cdk-tree [dataSource]="dataArray" [treeControl]="treeControl">

0 commit comments

Comments
 (0)