cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "test(compiler-cli): ensure partial-evaluator tests are not brittle to case-sensitivity (#36968)" (#37003)

Browse Source 
This reverts commit c6e5225ec3.

The changes to the case-sensitivity handling in #36968 caused multiple
projects to fail to build. See #36992, #36993 and #37000.

The issue is related to the logical path handling. But it is felt that
it is safer to revert the entire PR and then to investigate further.

PR Close #37003
This commit is contained in:
Pete Bacon Darwin
2020-05-08 13:33:52 +01:00
committed by Alex Rickabaugh
parent be06a44861
commit 04fd90e32a
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
View File

@ -790,28 +790,25 @@ runInEachFileSystem(() => {
it('should track each time a source file is visited', () => { it('should track each time a source file is visited', () => {
const addDependency = const addDependency =
jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker'); jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker');
const {expression, checker, program} = makeExpression( const {expression, checker} = makeExpression(
`class A { static foo = 42; } function bar() { return A.foo; }`, 'bar()'); `class A { static foo = 42; } function bar() { return A.foo; }`, 'bar()');
const entryPath = getSourceFileOrError(program, _('/entry.ts')).fileName;
const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency}); const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency});
evaluator.evaluate(expression); evaluator.evaluate(expression);
expect(addDependency).toHaveBeenCalledTimes(2); // two declaration visited expect(addDependency).toHaveBeenCalledTimes(2); // two declaration visited
expect( expect(
addDependency.calls.allArgs().map( addDependency.calls.allArgs().map(
(args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName])) (args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName]))
.toEqual([[entryPath, entryPath], [entryPath, entryPath]]); .toEqual([[_('/entry.ts'), _('/entry.ts')], [_('/entry.ts'), _('/entry.ts')]]);
}); });
it('should track imported source files', () => { it('should track imported source files', () => {
const addDependency = const addDependency =
jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker'); jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker');
const {expression, checker, program} = const {expression, checker} =
makeExpression(`import {Y} from './other'; const A = Y;`, 'A', [ makeExpression(`import {Y} from './other'; const A = Y;`, 'A', [
{name: _('/other.ts'), contents: `export const Y = 'test';`}, {name: _('/other.ts'), contents: `export const Y = 'test';`},
{name: _('/not-visited.ts'), contents: `export const Z = 'nope';`} {name: _('/not-visited.ts'), contents: `export const Z = 'nope';`}
]); ]);
const entryPath = getSourceFileOrError(program, _('/entry.ts')).fileName;
const otherPath = getSourceFileOrError(program, _('/other.ts')).fileName;
const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency}); const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency});
evaluator.evaluate(expression); evaluator.evaluate(expression);
expect(addDependency).toHaveBeenCalledTimes(2); expect(addDependency).toHaveBeenCalledTimes(2);
@ -819,15 +816,15 @@ runInEachFileSystem(() => {
addDependency.calls.allArgs().map( addDependency.calls.allArgs().map(
(args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName])) (args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName]))
.toEqual([ .toEqual([
[entryPath, entryPath], [_('/entry.ts'), _('/entry.ts')],
[entryPath, otherPath], [_('/entry.ts'), _('/other.ts')],
]); ]);
}); });
it('should track files passed through during re-exports', () => { it('should track files passed through during re-exports', () => {
const addDependency = const addDependency =
jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker'); jasmine.createSpy<DependencyTracker['addDependency']>('DependencyTracker');
const {expression, checker, program} = const {expression, checker} =
makeExpression(`import * as mod from './direct-reexport';`, 'mod.value.property', [ makeExpression(`import * as mod from './direct-reexport';`, 'mod.value.property', [
{name: _('/const.ts'), contents: 'export const value = {property: "test"};'}, {name: _('/const.ts'), contents: 'export const value = {property: "test"};'},
{ {
@ -844,19 +841,16 @@ runInEachFileSystem(() => {
}, },
]); ]);
const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency}); const evaluator = makeEvaluator(checker, {...fakeDepTracker, addDependency});
const entryPath = getSourceFileOrError(program, _('/entry.ts')).fileName;
const directReexportPath = getSourceFileOrError(program, _('/direct-reexport.ts')).fileName;
const constPath = getSourceFileOrError(program, _('/const.ts')).fileName;
evaluator.evaluate(expression); evaluator.evaluate(expression);
expect(addDependency).toHaveBeenCalledTimes(2); expect(addDependency).toHaveBeenCalledTimes(2);
expect( expect(
addDependency.calls.allArgs().map( addDependency.calls.allArgs().map(
(args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName])) (args: Parameters<typeof addDependency>) => [args[0].fileName, args[1].fileName]))
.toEqual([ .toEqual([
[entryPath, directReexportPath], [_('/entry.ts'), _('/direct-reexport.ts')],
// Not '/indirect-reexport.ts' or '/def.ts'. // Not '/indirect-reexport.ts' or '/def.ts'.
// TS skips through them when finding the original symbol for `value` // TS skips through them when finding the original symbol for `value`
[entryPath, constPath], [_('/entry.ts'), _('/const.ts')],
]); ]);
}); });
}); });