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

build: fix failing compiler-cli tests on windows (#28352) 

Note that this fixes `compiler-cli` tests within `compiler-cli/test`,
but there seem to be remaining `ngcc` tests within `compiler-cli/src`
which aren't working on Windows. This is out-of-scope for this commit.

PR Close #28352
This commit is contained in:
Paul Gschwendtner 2019-01-25 19:50:08 +01:00 committed by Matias Niemelä
parent 40da1be1e1
commit 744b0205e2
5 changed files with 96 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/compiler-cli/test/diagnostics/mocks.ts
View File

@ -75,11 +75,11 @@ export class MockLanguageServiceHost implements ts.LanguageServiceHost {
private internalReadFile(fileName: string): string|undefined { private internalReadFile(fileName: string): string|undefined {
let basename = path.basename(fileName); let basename = path.basename(fileName);
if (/^lib.*\.d\.ts$/.test(basename)) { if (/^lib.*\.d\.ts$/.test(basename)) {
let libPath = path.dirname(ts.getDefaultLibFilePath(this.getCompilationSettings())); let libPath = path.posix.dirname(ts.getDefaultLibFilePath(this.getCompilationSettings()));
fileName = path.join(libPath, basename); fileName = path.posix.join(libPath, basename);
} }
if (fileName.startsWith('app/')) { if (fileName.startsWith('app/')) {
fileName = path.join(this.context.currentDirectory, fileName); fileName = path.posix.join(this.context.currentDirectory, fileName);
} }
if (this.context.fileExists(fileName)) { if (this.context.fileExists(fileName)) {
return this.context.readFile(fileName); return this.context.readFile(fileName);

3
packages/compiler-cli/test/ngc_spec.ts
View File

@ -54,6 +54,7 @@ describe('ngc transformer command-line', () => {
"baseUrl": ".", "baseUrl": ".",
"declaration": true, "declaration": true,
"target": "es5", "target": "es5",
"newLine": "lf",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"lib": ["es6", "dom"], "lib": ["es6", "dom"],
@ -102,7 +103,7 @@ describe('ngc transformer command-line', () => {
const exitCode = main(['-p', basePath], errorSpy); const exitCode = main(['-p', basePath], errorSpy);
expect(errorSpy).toHaveBeenCalledWith( expect(errorSpy).toHaveBeenCalledWith(
`error TS6053: File '` + path.join(basePath, 'test.ts') + `' not found.` + `error TS6053: File '` + path.posix.join(basePath, 'test.ts') + `' not found.` +
'\n'); '\n');
expect(exitCode).toEqual(1); expect(exitCode).toEqual(1);
}); });

4
packages/compiler-cli/test/ngtools_api_spec.ts
View File

@ -70,8 +70,8 @@ describe('ngtools_api (deprecated)', () => {
entryModule: 'src/main#MainModule', entryModule: 'src/main#MainModule',
}); });
expect(routes).toEqual({ expect(routes).toEqual({
'./child#ChildModule': path.resolve(testSupport.basePath, 'src/child.ts'), './child#ChildModule': path.posix.join(testSupport.basePath, 'src/child.ts'),
'./child2#ChildModule2': path.resolve(testSupport.basePath, 'src/child2.ts'), './child2#ChildModule2': path.posix.join(testSupport.basePath, 'src/child2.ts'),
}); });
}); });

7
packages/compiler-cli/test/perform_watch_spec.ts
View File

@ -71,9 +71,10 @@ describe('perform watch', () => {
`, `,
}); });
const mainTsPath = path.resolve(testSupport.basePath, 'src', 'main.ts'); const mainTsPath = path.posix.join(testSupport.basePath, 'src', 'main.ts');
const utilTsPath = path.resolve(testSupport.basePath, 'src', 'util.ts'); const utilTsPath = path.posix.join(testSupport.basePath, 'src', 'util.ts');
const mainNgFactory = path.resolve(outDir, 'src', 'main.ngfactory.js'); const mainNgFactory = path.posix.join(outDir, 'src', 'main.ngfactory.js');
performWatchCompilation(host); performWatchCompilation(host);
expect(fs.existsSync(mainNgFactory)).toBe(true); expect(fs.existsSync(mainNgFactory)).toBe(true);
expect(fileExistsSpy !).toHaveBeenCalledWith(mainTsPath); expect(fileExistsSpy !).toHaveBeenCalledWith(mainTsPath);

138
packages/compiler-cli/test/transformers/program_spec.ts
View File

@ -14,8 +14,8 @@ import * as ts from 'typescript';
import {formatDiagnostics} from '../../src/perform_compile'; import {formatDiagnostics} from '../../src/perform_compile';
import {CompilerHost, EmitFlags, LazyRoute} from '../../src/transformers/api'; import {CompilerHost, EmitFlags, LazyRoute} from '../../src/transformers/api';
import {checkVersion, createSrcToOutPathMapper} from '../../src/transformers/program'; import {checkVersion, createSrcToOutPathMapper} from '../../src/transformers/program';
import {GENERATED_FILES, StructureIsReused, tsStructureIsReused} from '../../src/transformers/util'; import {StructureIsReused, tsStructureIsReused} from '../../src/transformers/util';
import {TestSupport, expectNoDiagnosticsInProgram, isInBazel, setup} from '../test_support'; import {TestSupport, expectNoDiagnosticsInProgram, setup} from '../test_support';
describe('ng program', () => { describe('ng program', () => {
let testSupport: TestSupport; let testSupport: TestSupport;
@ -53,7 +53,7 @@ describe('ng program', () => {
expectNoDiagnosticsInProgram(options, program); expectNoDiagnosticsInProgram(options, program);
fs.symlinkSync( fs.symlinkSync(
path.resolve(testSupport.basePath, 'built', `${libName}_src`), path.resolve(testSupport.basePath, 'built', `${libName}_src`),
path.resolve(testSupport.basePath, 'node_modules', libName)); path.resolve(testSupport.basePath, 'node_modules', libName), 'dir');
program.emit({emitFlags: ng.EmitFlags.DTS | ng.EmitFlags.JS | ng.EmitFlags.Metadata}); program.emit({emitFlags: ng.EmitFlags.DTS | ng.EmitFlags.JS | ng.EmitFlags.Metadata});
} }
@ -214,9 +214,9 @@ describe('ng program', () => {
// compile without libraries // compile without libraries
const p2 = compile(p1, options, undefined, host).program; const p2 = compile(p1, options, undefined, host).program;
expect(written.has(path.resolve(testSupport.basePath, 'built/src/index.js'))).toBe(true); expect(written.has(path.posix.join(testSupport.basePath, 'built/src/index.js'))).toBe(true);
let ngFactoryContent = let ngFactoryContent =
written.get(path.resolve(testSupport.basePath, 'built/src/index.ngfactory.js')); written.get(path.posix.join(testSupport.basePath, 'built/src/index.ngfactory.js'));
expect(ngFactoryContent).toMatch(/Start/); expect(ngFactoryContent).toMatch(/Start/);
// no change -> no emit // no change -> no emit
@ -226,10 +226,10 @@ describe('ng program', () => {
// change a user file // change a user file
written.clear(); written.clear();
fileCache.delete(path.resolve(testSupport.basePath, 'src/index.ts')); fileCache.delete(path.posix.join(testSupport.basePath, 'src/index.ts'));
const p4 = compile(p3, options, undefined, host).program; const p4 = compile(p3, options, undefined, host).program;
expect(written.size).toBe(1); expect(written.size).toBe(1);
expect(written.has(path.resolve(testSupport.basePath, 'built/src/index.js'))).toBe(true); expect(written.has(path.posix.join(testSupport.basePath, 'built/src/index.js'))).toBe(true);
// change a file that is input to generated files // change a file that is input to generated files
written.clear(); written.clear();
@ -237,14 +237,14 @@ describe('ng program', () => {
const p5 = compile(p4, options, undefined, host).program; const p5 = compile(p4, options, undefined, host).program;
expect(written.size).toBe(1); expect(written.size).toBe(1);
ngFactoryContent = ngFactoryContent =
written.get(path.resolve(testSupport.basePath, 'built/src/index.ngfactory.js')); written.get(path.posix.join(testSupport.basePath, 'built/src/index.ngfactory.js'));
expect(ngFactoryContent).toMatch(/Hello/); expect(ngFactoryContent).toMatch(/Hello/);
// change a file and create an intermediate program that is not emitted // change a file and create an intermediate program that is not emitted
written.clear(); written.clear();
fileCache.delete(path.resolve(testSupport.basePath, 'src/index.ts')); fileCache.delete(path.posix.join(testSupport.basePath, 'src/index.ts'));
const p6 = ng.createProgram({ const p6 = ng.createProgram({
rootNames: [path.resolve(testSupport.basePath, 'src/index.ts')], rootNames: [path.posix.join(testSupport.basePath, 'src/index.ts')],
options: testSupport.createCompilerOptions(options), host, options: testSupport.createCompilerOptions(options), host,
oldProgram: p5 oldProgram: p5
}); });
@ -481,10 +481,11 @@ describe('ng program', () => {
const enum ShouldBe { Empty, EmptyExport, NoneEmpty } const enum ShouldBe { Empty, EmptyExport, NoneEmpty }
function assertGenFile( function assertGenFile(
fileName: string, checks: {originalFileName: string, shouldBe: ShouldBe}) { fileName: string, checks: {originalFileName: string, shouldBe: ShouldBe}) {
const writeData = written.get(path.join(testSupport.basePath, fileName)); const writeData = written.get(path.posix.join(testSupport.basePath, fileName));
expect(writeData).toBeTruthy(); expect(writeData).toBeTruthy();
expect(writeData !.original !.some( expect(
sf => sf.fileName === path.join(testSupport.basePath, checks.originalFileName))) writeData !.original !.some(
sf => sf.fileName === path.posix.join(testSupport.basePath, checks.originalFileName)))
.toBe(true); .toBe(true);
switch (checks.shouldBe) { switch (checks.shouldBe) {
case ShouldBe.Empty: case ShouldBe.Empty:
@ -575,29 +576,30 @@ describe('ng program', () => {
describe('createSrcToOutPathMapper', () => { describe('createSrcToOutPathMapper', () => {
it('should return identity mapping if no outDir is present', () => { it('should return identity mapping if no outDir is present', () => {
const mapper = createSrcToOutPathMapper(undefined, undefined, undefined); const mapper = createSrcToOutPathMapper(undefined, undefined, undefined, path.posix);
expect(mapper('/tmp/b/y.js')).toBe('/tmp/b/y.js'); expect(mapper('/tmp/b/y.js')).toBe('/tmp/b/y.js');
}); });
it('should return identity mapping if first src and out fileName have same dir', () => { it('should return identity mapping if first src and out fileName have same dir', () => {
const mapper = createSrcToOutPathMapper('/tmp', '/tmp/a/x.ts', '/tmp/a/x.js'); const mapper = createSrcToOutPathMapper('/tmp', '/tmp/a/x.ts', '/tmp/a/x.js', path.posix);
expect(mapper('/tmp/b/y.js')).toBe('/tmp/b/y.js'); expect(mapper('/tmp/b/y.js')).toBe('/tmp/b/y.js');
}); });
it('should adjust the filename if the outDir is inside of the rootDir', () => { it('should adjust the filename if the outDir is inside of the rootDir', () => {
const mapper = createSrcToOutPathMapper('/tmp/out', '/tmp/a/x.ts', '/tmp/out/a/x.js'); const mapper =
createSrcToOutPathMapper('/tmp/out', '/tmp/a/x.ts', '/tmp/out/a/x.js', path.posix);
expect(mapper('/tmp/b/y.js')).toBe('/tmp/out/b/y.js'); expect(mapper('/tmp/b/y.js')).toBe('/tmp/out/b/y.js');
}); });
it('should adjust the filename if the outDir is outside of the rootDir', () => { it('should adjust the filename if the outDir is outside of the rootDir', () => {
const mapper = createSrcToOutPathMapper('/out', '/tmp/a/x.ts', '/out/a/x.js'); const mapper = createSrcToOutPathMapper('/out', '/tmp/a/x.ts', '/out/a/x.js', path.posix);
expect(mapper('/tmp/b/y.js')).toBe('/out/b/y.js'); expect(mapper('/tmp/b/y.js')).toBe('/out/b/y.js');
}); });
it('should adjust the filename if the common prefix of sampleSrc and sampleOut is outside of outDir', it('should adjust the filename if the common prefix of sampleSrc and sampleOut is outside of outDir',
() => { () => {
const mapper = const mapper = createSrcToOutPathMapper(
createSrcToOutPathMapper('/dist/common', '/src/common/x.ts', '/dist/common/x.js'); '/dist/common', '/src/common/x.ts', '/dist/common/x.js', path.posix);
expect(mapper('/src/common/y.js')).toBe('/dist/common/y.js'); expect(mapper('/src/common/y.js')).toBe('/dist/common/y.js');
}); });
@ -668,16 +670,23 @@ describe('ng program', () => {
expectNoDiagnosticsInProgram(options, program); expectNoDiagnosticsInProgram(options, program);
expect(normalizeRoutes(program.listLazyRoutes())).toEqual([ expect(normalizeRoutes(program.listLazyRoutes())).toEqual([
{ {
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
referencedModule: {name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, referencedModule: {
name: 'ChildModule',
filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
},
route: './child#ChildModule' route: './child#ChildModule'
}, },
{ {
module: module: {
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, name: 'ChildModule',
referencedModule: filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
{name: 'ChildModule2', filePath: path.resolve(testSupport.basePath, 'src/child2.ts')}, },
referencedModule: {
name: 'ChildModule2',
filePath: path.posix.join(testSupport.basePath, 'src/child2.ts')
},
route: './child2#ChildModule2' route: './child2#ChildModule2'
}, },
]); ]);
@ -718,26 +727,37 @@ describe('ng program', () => {
expectNoDiagnosticsInProgram(options, program); expectNoDiagnosticsInProgram(options, program);
expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([ expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([
{ {
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
referencedModule: {name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, referencedModule: {
name: 'ChildModule',
filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
},
route: './child#ChildModule' route: './child#ChildModule'
}, },
{ {
module: module: {
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, name: 'ChildModule',
referencedModule: filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
{name: 'ChildModule2', filePath: path.resolve(testSupport.basePath, 'src/child2.ts')}, },
referencedModule: {
name: 'ChildModule2',
filePath: path.posix.join(testSupport.basePath, 'src/child2.ts')
},
route: './child2#ChildModule2' route: './child2#ChildModule2'
}, },
]); ]);
expect(normalizeRoutes(program.listLazyRoutes('src/child#ChildModule'))).toEqual([ expect(normalizeRoutes(program.listLazyRoutes('src/child#ChildModule'))).toEqual([
{ {
module: module: {
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, name: 'ChildModule',
referencedModule: filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
{name: 'ChildModule2', filePath: path.resolve(testSupport.basePath, 'src/child2.ts')}, },
referencedModule: {
name: 'ChildModule2',
filePath: path.posix.join(testSupport.basePath, 'src/child2.ts')
},
route: './child2#ChildModule2' route: './child2#ChildModule2'
}, },
]); ]);
@ -764,10 +784,11 @@ describe('ng program', () => {
const {program, options} = createProgram(['src/main.ts']); const {program, options} = createProgram(['src/main.ts']);
expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([ expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([
{ {
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
{name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
referencedModule: { referencedModule: {
name: undefined as any as string, // TODO: Review use of `any` here (#19904) name: undefined as any as string, // TODO: Review use of `any` here (#19904)
filePath: path.resolve(testSupport.basePath, 'src/child.ts') filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
}, },
route: './child' route: './child'
}, },
@ -816,18 +837,21 @@ describe('ng program', () => {
{ {
module: { module: {
name: 'NestedMainModule', name: 'NestedMainModule',
filePath: path.resolve(testSupport.basePath, 'src/nested/main.ts') filePath: path.posix.join(testSupport.basePath, 'src/nested/main.ts')
}, },
referencedModule: { referencedModule: {
name: 'NestedChildModule', name: 'NestedChildModule',
filePath: path.resolve(testSupport.basePath, 'src/nested/child.ts') filePath: path.posix.join(testSupport.basePath, 'src/nested/child.ts')
}, },
route: './child#NestedChildModule' route: './child#NestedChildModule'
}, },
{ {
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
referencedModule: {name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, referencedModule: {
name: 'ChildModule',
filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
},
route: './child#ChildModule' route: './child#ChildModule'
}, },
]); ]);
@ -853,16 +877,23 @@ describe('ng program', () => {
expectNoDiagnosticsInProgram(options, program); expectNoDiagnosticsInProgram(options, program);
expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([ expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([
{ {
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
referencedModule: {name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, referencedModule: {
name: 'ChildModule',
filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
},
route: './child#ChildModule' route: './child#ChildModule'
}, },
{ {
module: module: {
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, name: 'ChildModule',
referencedModule: filePath: path.posix.join(testSupport.basePath, 'src/child.ts')
{name: 'ChildModule2', filePath: path.resolve(testSupport.basePath, 'src/child2.ts')}, },
referencedModule: {
name: 'ChildModule2',
filePath: path.posix.join(testSupport.basePath, 'src/child2.ts')
},
route: './child2#ChildModule2' route: './child2#ChildModule2'
}, },
]); ]);
@ -920,9 +951,10 @@ describe('ng program', () => {
}); });
const program = createProgram(['src/main.ts'], {collectAllErrors: true}).program; const program = createProgram(['src/main.ts'], {collectAllErrors: true}).program;
expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([{ expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([{
module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')}, module:
{name: 'MainModule', filePath: path.posix.join(testSupport.basePath, 'src/main.ts')},
referencedModule: referencedModule:
{name: 'ChildModule', filePath: path.resolve(testSupport.basePath, 'src/child.ts')}, {name: 'ChildModule', filePath: path.posix.join(testSupport.basePath, 'src/child.ts')},
route: './child#ChildModule' route: './child#ChildModule'
}]); }]);
}); });