honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(ngcc): use `isNamedFunctionDeclaration()` in UMD tests (#38959) 

This makes these tests more resilient to changes in the test code
structure. For example switching from

```
var SomeClass = <implementation>;
exports.SomeClass = SomeClass;
```

to

```
exports.SomeClass = <implementation>;
```

PR Close #38959
This commit is contained in:
Pete Bacon Darwin 2020-09-27 11:57:38 +01:00 committed by atscott
parent 6650d71fe2
commit 2c0282f4c2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
View File

@ -971,7 +971,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const decorators = host.getDecoratorsOfDeclaration(classNode)!; const decorators = host.getDecoratorsOfDeclaration(classNode)!;
expect(decorators).toBeDefined(); expect(decorators).toBeDefined();
@ -1081,7 +1081,7 @@ runInEachFileSystem(() => {
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const decorators = host.getDecoratorsOfDeclaration(classNode)!; const decorators = host.getDecoratorsOfDeclaration(classNode)!;
expect(decorators.length).toEqual(1); expect(decorators.length).toEqual(1);
@ -1159,7 +1159,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const members = host.getMembersOfClass(classNode); const members = host.getMembersOfClass(classNode);
const input1 = members.find(member => member.name === 'input1')!; const input1 = members.find(member => member.name === 'input1')!;
@ -1178,7 +1178,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const members = host.getMembersOfClass(classNode); const members = host.getMembersOfClass(classNode);
const instanceProperty = members.find(member => member.name === 'instanceProperty')!; const instanceProperty = members.find(member => member.name === 'instanceProperty')!;
@ -1193,7 +1193,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const members = host.getMembersOfClass(classNode); const members = host.getMembersOfClass(classNode);
const staticMethod = members.find(member => member.name === 'staticMethod')!; const staticMethod = members.find(member => member.name === 'staticMethod')!;
@ -1207,7 +1207,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const members = host.getMembersOfClass(classNode); const members = host.getMembersOfClass(classNode);
const staticProperty = members.find(member => member.name === 'staticProperty')!; const staticProperty = members.find(member => member.name === 'staticProperty')!;
@ -1304,7 +1304,7 @@ runInEachFileSystem(() => {
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const decorators = host.getDecoratorsOfDeclaration(classNode)!; const decorators = host.getDecoratorsOfDeclaration(classNode)!;
expect(decorators.length).toEqual(1); expect(decorators.length).toEqual(1);
@ -1425,7 +1425,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(_('/main.js')); const bundle = makeTestBundleProgram(_('/main.js'));
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, _('/main.js'), 'SomeClass', isNamedVariableDeclaration); bundle.program, _('/main.js'), 'SomeClass', isNamedFunctionDeclaration);
const parameters = host.getConstructorParameters(classNode)!; const parameters = host.getConstructorParameters(classNode)!;
@ -1439,7 +1439,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const parameters = host.getConstructorParameters(classNode); const parameters = host.getConstructorParameters(classNode);
expect(parameters).toBeDefined(); expect(parameters).toBeDefined();
@ -1604,7 +1604,7 @@ runInEachFileSystem(() => {
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective',
isNamedVariableDeclaration); isNamedFunctionDeclaration);
const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'}; const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
const spy = spyOn(UmdReflectionHost.prototype, 'getImportOfIdentifier') const spy = spyOn(UmdReflectionHost.prototype, 'getImportOfIdentifier')
.and.returnValue(mockImportInfo); .and.returnValue(mockImportInfo);
@ -2033,7 +2033,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const ctrDecorators = host.getConstructorParameters(classNode)!; const ctrDecorators = host.getConstructorParameters(classNode)!;
const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as { const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
kind: TypeValueReferenceKind.LOCAL, kind: TypeValueReferenceKind.LOCAL,
@ -2092,7 +2092,7 @@ runInEachFileSystem(() => {
const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name); const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle)); const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
const classNode = getDeclaration( const classNode = getDeclaration(
bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration); bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedFunctionDeclaration);
const classDecorators = host.getDecoratorsOfDeclaration(classNode)!; const classDecorators = host.getDecoratorsOfDeclaration(classNode)!;
const identifierOfDirective = const identifierOfDirective =
(((classDecorators[0].node as ts.ObjectLiteralExpression).properties[0] as (((classDecorators[0].node as ts.ObjectLiteralExpression).properties[0] as