wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1315 from vvakame/add-support-tsc-switching

Browse Source 
Add support tsc switching to runner.ts
This commit is contained in:
Basarat Ali Syed
2013-11-21 22:11:32 -08:00
parent 4fde2ac723 ebb41cfe47
commit 064fbc1045
11 changed files with 134763 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_infrastructure/tests/runner.js
+32 -16
View File
@@ -566,6 +566,8 @@ var DefinitelyTyped;
(function (TestManager) {
var path = require('path');
TestManager.DEFAULT_TSC_VERSION = "0.9.1.1";
function endsWith(str, suffix) {
return str.indexOf(suffix, str.length - suffix.length) !== -1;
}
@@ -575,6 +577,7 @@ var DefinitelyTyped;
}
Tsc.run = function (tsfile, options, callback) {
options = options || {};
options.tscVersion = options.tscVersion || TestManager.DEFAULT_TSC_VERSION;
if (typeof options.checkNoImplicitAny === "undefined") {
options.checkNoImplicitAny = true;
}
@@ -586,7 +589,11 @@ var DefinitelyTyped;
throw new Error(tsfile + " not exists");
}
var command = 'node ./_infrastructure/tests/typescript/tsc.js --module commonjs ';
var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js';
if (!IO.fileExists(tscPath)) {
throw new Error(tscPath + ' is not exists');
}
var command = 'node ' + tscPath + ' --module commonjs ';
if (options.useTscParams && IO.fileExists(tsfile + '.tscparams')) {
command += '@' + tsfile + '.tscparams';
} else if (options.checkNoImplicitAny) {
@@ -842,7 +849,8 @@ var DefinitelyTyped;
// Base class for test suite
/////////////////////////////////
var TestSuiteBase = (function () {
function TestSuiteBase(testSuiteName, errorHeadline) {
function TestSuiteBase(options, testSuiteName, errorHeadline) {
this.options = options;
this.testSuiteName = testSuiteName;
this.errorHeadline = errorHeadline;
this.timer = new Timer();
@@ -878,7 +886,7 @@ var DefinitelyTyped;
TestSuiteBase.prototype.runTest = function (targetFile, callback) {
var _this = this;
new Test(this, targetFile, null).run(function (result) {
new Test(this, targetFile, { tscVersion: this.options.tscVersion }).run(function (result) {
_this.testResults.push(result);
callback(result);
});
@@ -915,8 +923,8 @@ var DefinitelyTyped;
/////////////////////////////////
var SyntaxChecking = (function (_super) {
__extends(SyntaxChecking, _super);
function SyntaxChecking() {
_super.call(this, "Syntax checking", "Syntax error");
function SyntaxChecking(options) {
_super.call(this, options, "Syntax checking", "Syntax error");
}
SyntaxChecking.prototype.filterTargetFiles = function (files) {
return files.filter(function (file) {
@@ -931,8 +939,8 @@ var DefinitelyTyped;
/////////////////////////////////
var TestEval = (function (_super) {
__extends(TestEval, _super);
function TestEval() {
_super.call(this, "Typing tests", "Failed tests");
function TestEval(options) {
_super.call(this, options, "Typing tests", "Failed tests");
}
TestEval.prototype.filterTargetFiles = function (files) {
return files.filter(function (file) {
@@ -948,9 +956,9 @@ var DefinitelyTyped;
/////////////////////////////////
var FindNotRequiredTscparams = (function (_super) {
__extends(FindNotRequiredTscparams, _super);
function FindNotRequiredTscparams(print) {
function FindNotRequiredTscparams(options, print) {
var _this = this;
_super.call(this, "Find not required .tscparams files", "New arrival!");
_super.call(this, options, "Find not required .tscparams files", "New arrival!");
this.print = print;
this.printErrorCount = false;
@@ -971,7 +979,7 @@ var DefinitelyTyped;
FindNotRequiredTscparams.prototype.runTest = function (targetFile, callback) {
var _this = this;
this.print.clearCurrentLine().out(targetFile.formatName);
new Test(this, targetFile, { useTscParams: false, checkNoImplicitAny: true }).run(function (result) {
new Test(this, targetFile, { tscVersion: this.options.tscVersion, useTscParams: false, checkNoImplicitAny: true }).run(function (result) {
_this.testResults.push(result);
callback(result);
});
@@ -998,7 +1006,7 @@ var DefinitelyTyped;
/////////////////////////////////
var TestRunner = (function () {
function TestRunner(dtPath, options) {
if (typeof options === "undefined") { options = {}; }
if (typeof options === "undefined") { options = { tscVersion: TestManager.DEFAULT_TSC_VERSION }; }
this.options = options;
this.suites = [];
this.options.findNotRequiredTscparams = !!this.options.findNotRequiredTscparams;
@@ -1024,8 +1032,8 @@ var DefinitelyTyped;
this.timer = new Timer();
this.timer.start();
var syntaxChecking = new SyntaxChecking();
var testEval = new TestEval();
var syntaxChecking = new SyntaxChecking(this.options);
var testEval = new TestEval(this.options);
if (!this.options.findNotRequiredTscparams) {
this.addSuite(syntaxChecking);
this.addSuite(testEval);
@@ -1033,11 +1041,11 @@ var DefinitelyTyped;
var typings = syntaxChecking.filterTargetFiles(this.files).length;
var testFiles = testEval.filterTargetFiles(this.files).length;
this.print = new Print('0.9.1.1', typings, testFiles, this.files.length);
this.print = new Print(this.options.tscVersion, typings, testFiles, this.files.length);
this.print.printHeader();
if (this.options.findNotRequiredTscparams) {
this.addSuite(new FindNotRequiredTscparams(this.print));
this.addSuite(new FindNotRequiredTscparams(this.options, this.print));
}
var count = 0;
@@ -1147,6 +1155,14 @@ var dtPath = __dirname + '/../..';
var findNotRequiredTscparams = process.argv.some(function (arg) {
return arg == "--try-without-tscparams";
});
var tscVersionIndex = process.argv.indexOf("--tsc-version");
var tscVersion = DefinitelyTyped.TestManager.DEFAULT_TSC_VERSION;
if (-1 < tscVersionIndex) {
tscVersion = process.argv[tscVersionIndex + 1];
}
var runner = new DefinitelyTyped.TestManager.TestRunner(dtPath, { findNotRequiredTscparams: findNotRequiredTscparams });
var runner = new DefinitelyTyped.TestManager.TestRunner(dtPath, {
tscVersion: tscVersion,
findNotRequiredTscparams: findNotRequiredTscparams
});
runner.run();
_infrastructure/tests/runner.ts
+33 -16
View File
@@ -6,11 +6,14 @@
module DefinitelyTyped.TestManager {
var path = require('path');
export var DEFAULT_TSC_VERSION = "0.9.1.1";
function endsWith(str:string, suffix:string) {
return str.indexOf(suffix, str.length - suffix.length) !== -1;
}
export interface TscExecOptions {
tscVersion?:string;
useTscParams?:boolean;
checkNoImplicitAny?:boolean;
}
@@ -18,6 +21,7 @@ module DefinitelyTyped.TestManager {
class Tsc {
public static run(tsfile:string, options:TscExecOptions, callback:(result:ExecResult)=>void) {
options = options || {};
options.tscVersion = options.tscVersion || DEFAULT_TSC_VERSION;
if (typeof options.checkNoImplicitAny === "undefined") {
options.checkNoImplicitAny = true;
}
@@ -29,7 +33,11 @@ module DefinitelyTyped.TestManager {
throw new Error(tsfile + " not exists");
}
var command = 'node ./_infrastructure/tests/typescript/tsc.js --module commonjs ';
var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js';
if (!IO.fileExists(tscPath)) {
throw new Error(tscPath + ' is not exists');
}
var command = 'node ' + tscPath + ' --module commonjs ';
if (options.useTscParams && IO.fileExists(tsfile + '.tscparams')) {
command += '@' + tsfile + '.tscparams';
} else if (options.checkNoImplicitAny) {
@@ -313,7 +321,7 @@ module DefinitelyTyped.TestManager {
testReporter:ITestReporter;
printErrorCount = true;
constructor(public testSuiteName:string, public errorHeadline:string) {
constructor(public options:ITestRunnerOptions, public testSuiteName:string, public errorHeadline:string) {
}
public filterTargetFiles(files:File[]):File[] {
@@ -342,7 +350,7 @@ module DefinitelyTyped.TestManager {
}
public runTest(targetFile:File, callback:(result:TestResult)=>void):void {
new Test(this, targetFile, null).run(result=> {
new Test(this, targetFile, {tscVersion: this.options.tscVersion}).run(result=> {
this.testResults.push(result);
callback(result);
});
@@ -366,8 +374,8 @@ module DefinitelyTyped.TestManager {
/////////////////////////////////
class SyntaxChecking extends TestSuiteBase {
constructor() {
super("Syntax checking", "Syntax error");
constructor(options:ITestRunnerOptions) {
super(options, "Syntax checking", "Syntax error");
}
public filterTargetFiles(files:File[]):File[] {
@@ -380,8 +388,8 @@ module DefinitelyTyped.TestManager {
/////////////////////////////////
class TestEval extends TestSuiteBase {
constructor() {
super("Typing tests", "Failed tests");
constructor(options) {
super(options, "Typing tests", "Failed tests");
}
public filterTargetFiles(files:File[]):File[] {
@@ -397,8 +405,8 @@ module DefinitelyTyped.TestManager {
testReporter:ITestReporter;
printErrorCount = false;
constructor(private print:Print) {
super("Find not required .tscparams files", "New arrival!");
constructor(options:ITestRunnerOptions, private print:Print) {
super(options, "Find not required .tscparams files", "New arrival!");
this.testReporter = {
printPositiveCharacter: (index:number, testResult:TestResult)=> {
@@ -417,7 +425,7 @@ module DefinitelyTyped.TestManager {
public runTest(targetFile:File, callback:(result:TestResult)=>void):void {
this.print.clearCurrentLine().out(targetFile.formatName);
new Test(this, targetFile, {useTscParams: false, checkNoImplicitAny: true}).run(result=> {
new Test(this, targetFile, {tscVersion: this.options.tscVersion, useTscParams: false, checkNoImplicitAny: true}).run(result=> {
this.testResults.push(result);
callback(result);
});
@@ -435,6 +443,7 @@ module DefinitelyTyped.TestManager {
}
export interface ITestRunnerOptions {
tscVersion:string;
findNotRequiredTscparams?:boolean;
}
@@ -447,7 +456,7 @@ module DefinitelyTyped.TestManager {
suites:ITestSuite[] = [];
private print:Print;
constructor(dtPath:string, public options:ITestRunnerOptions = {}) {
constructor(dtPath:string, public options:ITestRunnerOptions = {tscVersion: DEFAULT_TSC_VERSION}) {
this.options.findNotRequiredTscparams = !!this.options.findNotRequiredTscparams;
var filesName = IO.dir(dtPath, /.\.ts/g, { recursive: true }).sort();
@@ -466,8 +475,8 @@ module DefinitelyTyped.TestManager {
this.timer = new Timer();
this.timer.start();
var syntaxChecking = new SyntaxChecking();
var testEval = new TestEval();
var syntaxChecking = new SyntaxChecking(this.options);
var testEval = new TestEval(this.options);
if (!this.options.findNotRequiredTscparams) {
this.addSuite(syntaxChecking);
this.addSuite(testEval);
@@ -475,11 +484,11 @@ module DefinitelyTyped.TestManager {
var typings = syntaxChecking.filterTargetFiles(this.files).length;
var testFiles = testEval.filterTargetFiles(this.files).length;
this.print = new Print('0.9.1.1', typings, testFiles, this.files.length);
this.print = new Print(this.options.tscVersion, typings, testFiles, this.files.length);
this.print.printHeader();
if (this.options.findNotRequiredTscparams) {
this.addSuite(new FindNotRequiredTscparams(this.print));
this.addSuite(new FindNotRequiredTscparams(this.options, this.print));
}
var count = 0;
@@ -576,6 +585,14 @@ module DefinitelyTyped.TestManager {
var dtPath = __dirname + '/../..';
var findNotRequiredTscparams = process.argv.some(arg=>arg == "--try-without-tscparams");
var tscVersionIndex = process.argv.indexOf("--tsc-version");
var tscVersion = DefinitelyTyped.TestManager.DEFAULT_TSC_VERSION;
if (-1 < tscVersionIndex) {
tscVersion = process.argv[tscVersionIndex + 1];
}
var runner = new DefinitelyTyped.TestManager.TestRunner(dtPath, {findNotRequiredTscparams: findNotRequiredTscparams});
var runner = new DefinitelyTyped.TestManager.TestRunner(dtPath, {
tscVersion: tscVersion,
findNotRequiredTscparams: findNotRequiredTscparams
});
runner.run();
_infrastructure/tests/typescript/lib.d.ts → _infrastructure/tests/typescript/0.9.1.1/lib.d.ts
Vendored
View File
_infrastructure/tests/typescript/tsc → _infrastructure/tests/typescript/0.9.1.1/tsc
View File
_infrastructure/tests/typescript/tsc.js → _infrastructure/tests/typescript/0.9.1.1/tsc.js
View File
_infrastructure/tests/typescript/typescript.js → _infrastructure/tests/typescript/0.9.1.1/typescript.js
View File
_infrastructure/tests/typescript/0.9.5-beta/lib.d.ts
Vendored
+14202
View File
File diff suppressed because it is too large Load Diff
_infrastructure/tests/typescript/0.9.5-beta/tsc
+2
View File
@@ -0,0 +1,2 @@
#!/usr/bin/env node
require('./tsc.js')
_infrastructure/tests/typescript/0.9.5-beta/tsc.js
+60908
View File
File diff suppressed because one or more lines are too long
_infrastructure/tests/typescript/0.9.5-beta/typescript.js
+59585
View File
File diff suppressed because one or more lines are too long
package.json
+1 -1
View File
@@ -2,6 +2,6 @@
"name": "DefinitelyTyped",
"version": "0.0.0",
"scripts": {
"test": "node ./_infrastructure/tests/runner.js"
"test": "node ./_infrastructure/tests/runner.js --tsc-version 0.9.1.1"
}
}