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

build: fix outdated ngtools compiler-cli test logic (#28191) 

* Fixes that the test logic for `ngtools` in the offline compiler test is no longer working due to being unmaintained for a long time
* Makes the path comparison logic platform agnostic, so that the tests can be also executed on Windows

PR Close #28191
This commit is contained in:
Paul Gschwendtner 2019-01-22 18:50:21 +01:00 committed by Jason Aden
parent 3e6a1f0bc4
commit 4c8d17ffd4
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/compiler-cli/integrationtest/test/test_ngtools_api.ts
View File

@ -13,7 +13,7 @@ import 'reflect-metadata';
import * as path from 'path'; import * as path from 'path';
import * as ts from 'typescript'; import * as ts from 'typescript';
import * as assert from 'assert'; import * as assert from 'assert';
import {__NGTOOLS_PRIVATE_API_2, readConfiguration} from '@angular/compiler-cli'; import {createProgram, readConfiguration} from '@angular/compiler-cli';
/* tslint:disable:no-console */ /* tslint:disable:no-console */
/** /**
@ -22,19 +22,10 @@ import {__NGTOOLS_PRIVATE_API_2, readConfiguration} from '@angular/compiler-cli'
* properly read and wrote. * properly read and wrote.
*/ */
function main() { function main() {
console.log(`testing ngtools API...`); Promise.resolve().then(() => lazyRoutesTest()).then(() => { process.exit(0); }).catch((err) => {
console.error(err.stack);
Promise.resolve() process.exit(1);
.then(() => lazyRoutesTest()) });
.then(() => {
console.log('All done!');
process.exit(0);
})
.catch((err) => {
console.error(err.stack);
console.error('Test failed');
process.exit(1);
});
} }
function lazyRoutesTest() { function lazyRoutesTest() {
@ -43,13 +34,15 @@ function lazyRoutesTest() {
const config = readConfiguration(project); const config = readConfiguration(project);
const host = ts.createCompilerHost(config.options, true); const host = ts.createCompilerHost(config.options, true);
const program = ts.createProgram(config.rootNames, config.options, host); const program = createProgram({
rootNames: config.rootNames,
options: config.options, host,
});
config.options.basePath = basePath; config.options.basePath = basePath;
config.options.rootDir = basePath;
const lazyRoutes = __NGTOOLS_PRIVATE_API_2.listLazyRoutes( const lazyRoutes = program.listLazyRoutes('app.module#AppModule');
{program, host, angularCompilerOptions: config.options, entryModule: 'app.module#AppModule'});
const expectations: {[route: string]: string} = { const expectations: {[route: string]: string} = {
'./lazy.module#LazyModule': 'lazy.module.ts', './lazy.module#LazyModule': 'lazy.module.ts',
'./feature/feature.module#FeatureModule': 'feature/feature.module.ts', './feature/feature.module#FeatureModule': 'feature/feature.module.ts',
@ -61,17 +54,25 @@ function lazyRoutesTest() {
'feature/feature.module#FeatureModule': 'feature/feature.module.ts' 'feature/feature.module#FeatureModule': 'feature/feature.module.ts'
}; };
Object.keys(lazyRoutes).forEach((route: string) => { lazyRoutes.forEach(lazyRoute => {
assert(route in expectations, `Found a route that was not expected: "${route}".`); const routeName = lazyRoute.route;
// Normalize the module path and the expected module path so that these can be compared
// on Windows where path separators are not consistent with TypeScript internal paths.
const modulePath = path.normalize(lazyRoute.referencedModule.filePath);
const expectedModulePath = path.normalize(path.join(basePath, expectations[routeName]));
assert(routeName in expectations, `Found a route that was not expected: "${routeName}".`);
assert( assert(
lazyRoutes[route] == path.join(basePath, expectations[route]), modulePath === expectedModulePath,
`Route "${route}" does not point to the expected absolute path ` + `Route "${routeName}" does not point to the expected absolute path ` +
`"${path.join(basePath, expectations[route])}". It points to "${lazyRoutes[route]}"`); `"${expectedModulePath}". It points to "${modulePath}"`);
}); });
// Verify that all expectations were met. // Verify that all expectations were met.
assert.deepEqual( assert.deepEqual(
Object.keys(lazyRoutes), Object.keys(expectations), `Expected routes listed to be: \n` + lazyRoutes.map(lazyRoute => lazyRoute.route), Object.keys(expectations),
`Expected routes listed to be: \n` +
` ${JSON.stringify(Object.keys(expectations))}\n` + ` ${JSON.stringify(Object.keys(expectations))}\n` +
`Actual:\n` + `Actual:\n` +
` ${JSON.stringify(Object.keys(lazyRoutes))}\n`); ` ${JSON.stringify(Object.keys(lazyRoutes))}\n`);