Skip to content

Commit 86d36db

Browse files
BobobUnicornBobobUnicorn
committed
fix(cdk/tree): fix some failing tests, one remaining
1 parent 23a254c commit 86d36db

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
describe('CdkTree redesign', () => {
3029
/** Represents an indent for expectNestedTreeToMatch */
@@ -1123,20 +1122,6 @@ describe('CdkTree redesign', () => {
11231122
expect(changedNodes[5].getAttribute('initialIndex')).toBe('2');
11241123
});
11251124
});
1126-
1127-
it('should throw an error when missing function in nested tree', fakeAsync(() => {
1128-
configureCdkTreeTestingModule([NestedCdkErrorTreeApp]);
1129-
expect(() => {
1130-
try {
1131-
TestBed.createComponent(NestedCdkErrorTreeApp).detectChanges();
1132-
flush();
1133-
} catch {
1134-
flush();
1135-
} finally {
1136-
flush();
1137-
}
1138-
}).toThrowError(getTreeControlFunctionsMissingError().message);
1139-
}));
11401125
});
11411126

11421127
describe('with depth', () => {
@@ -1352,7 +1337,8 @@ function expectNestedTreeToMatch(treeElement: Element, ...expectedTree: any[]) {
13521337

13531338
@Component({
13541339
template: `
1355-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1340+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1341+
nodeType="flat">
13561342
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
13571343
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="indent"
13581344
cdkTreeNodeToggle
@@ -1379,7 +1365,8 @@ class SimpleCdkTreeApp {
13791365

13801366
@Component({
13811367
template: `
1382-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1368+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1369+
nodeType="flat">
13831370
<ng-container [ngSwitch]="true">
13841371
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
13851372
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="indent"
@@ -1395,7 +1382,8 @@ class SimpleCdkTreeAppWithIndirectNodes extends SimpleCdkTreeApp {}
13951382

13961383
@Component({
13971384
template: `
1398-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1385+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1386+
nodeType="nested">
13991387
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14001388
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14011389
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1413,7 +1401,8 @@ class NestedCdkTreeApp {
14131401

14141402
@Component({
14151403
template: `
1416-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1404+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1405+
nodeType="nested">
14171406
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14181407
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14191408
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1441,7 +1430,8 @@ class StaticNestedCdkTreeApp {
14411430

14421431
@Component({
14431432
template: `
1444-
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1433+
<cdk-tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1434+
nodeType="nested">
14451435
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass">
14461436
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
14471437
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1465,7 +1455,8 @@ class WhenNodeNestedCdkTreeApp {
14651455

14661456
@Component({
14671457
template: `
1468-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1458+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1459+
nodeType="flat">
14691460
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
14701461
cdkTreeNodePadding
14711462
cdkTreeNodeToggle [cdkTreeNodeToggleRecursive]="toggleRecursively"
@@ -1488,7 +1479,8 @@ class CdkTreeAppWithToggle {
14881479

14891480
@Component({
14901481
template: `
1491-
<cdk-tree #tree [dataSource]="dataSource" [childrenAccessor]="getChildren">
1482+
<cdk-tree #tree [dataSource]="dataSource" [childrenAccessor]="getChildren"
1483+
nodeType="nested">
14921484
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
14931485
cdkTreeNodeToggle [cdkTreeNodeToggleRecursive]="toggleRecursively">
14941486
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
@@ -1511,7 +1503,8 @@ class NestedCdkTreeAppWithToggle {
15111503

15121504
@Component({
15131505
template: `
1514-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1506+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel"
1507+
nodeType="flat">
15151508
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
15161509
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15171510
cdkTreeNodeToggle
@@ -1539,7 +1532,8 @@ class WhenNodeCdkTreeApp {
15391532

15401533
@Component({
15411534
template: `
1542-
<cdk-tree [dataSource]="dataArray" [levelAccessor]="getLevel">
1535+
<cdk-tree [dataSource]="dataArray" [levelAccessor]="getLevel"
1536+
nodeType="flat">
15431537
<cdk-tree-node *cdkTreeNodeDef="let node"
15441538
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15451539
cdkTreeNodeToggle
@@ -1564,7 +1558,8 @@ class ArrayDataSourceCdkTreeApp {
15641558

15651559
@Component({
15661560
template: `
1567-
<cdk-tree [dataSource]="dataObservable" [levelAccessor]="getLevel">
1561+
<cdk-tree [dataSource]="dataObservable" [levelAccessor]="getLevel"
1562+
nodeType="flat">
15681563
<cdk-tree-node *cdkTreeNodeDef="let node"
15691564
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="28"
15701565
cdkTreeNodeToggle
@@ -1589,7 +1584,8 @@ class ObservableDataSourceCdkTreeApp {
15891584

15901585
@Component({
15911586
template: `
1592-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren">
1587+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren"
1588+
nodeType="nested">
15931589
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
15941590
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
15951591
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1611,7 +1607,8 @@ class ArrayDataSourceNestedCdkTreeApp {
16111607

16121608
@Component({
16131609
template: `
1614-
<cdk-tree [dataSource]="dataObservable" [childrenAccessor]="getChildren">
1610+
<cdk-tree [dataSource]="dataObservable" [childrenAccessor]="getChildren"
1611+
nodeType="nested">
16151612
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
16161613
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
16171614
<ng-template cdkTreeNodeOutlet></ng-template>
@@ -1633,28 +1630,8 @@ class ObservableDataSourceNestedCdkTreeApp {
16331630

16341631
@Component({
16351632
template: `
1636-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel">
1637-
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
1638-
[isExpandable]="isExpandable(node)">
1639-
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
1640-
<ng-template cdkTreeNodeOutlet></ng-template>
1641-
</cdk-nested-tree-node>
1642-
</cdk-tree>
1643-
`,
1644-
})
1645-
class NestedCdkErrorTreeApp {
1646-
getLevel = (node: TestData) => node.level;
1647-
1648-
isExpandable = (node: TestData) => node.children.length > 0;
1649-
1650-
dataSource: FakeDataSource | null = new FakeDataSource();
1651-
1652-
@ViewChild(CdkTree) tree: CdkTree<TestData>;
1653-
}
1654-
1655-
@Component({
1656-
template: `
1657-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren">
1633+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren"
1634+
nodeType="nested">
16581635
<cdk-nested-tree-node *cdkTreeNodeDef="let node; let level = level">
16591636
<span class="tree-test-level">{{level}}</span>
16601637
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
@@ -1677,7 +1654,8 @@ class DepthNestedCdkTreeApp {
16771654

16781655
@Component({
16791656
template: `
1680-
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel" [trackBy]="trackByFn">
1657+
<cdk-tree [dataSource]="dataSource" [levelAccessor]="getLevel" [trackBy]="trackByFn"
1658+
nodeType="flat">
16811659
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass" [isExpandable]="isExpandable(node)">
16821660
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
16831661
</cdk-tree-node>
@@ -1708,7 +1686,8 @@ class CdkTreeAppWithTrackBy {
17081686

17091687
@Component({
17101688
template: `
1711-
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren" [trackBy]="trackByFn">
1689+
<cdk-tree [dataSource]="dataArray" [childrenAccessor]="getChildren" [trackBy]="trackByFn"
1690+
nodeType="nested">
17121691
<cdk-nested-tree-node *cdkTreeNodeDef="let node">
17131692
[{{node.pizzaTopping}}] - [{{node.pizzaCheese}}] + [{{node.pizzaBase}}]
17141693
<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)