Skip to content

Commit d028c06

Browse files
committed
remove unused folders from unitest runner
1 parent d502ae2 commit d028c06

File tree

2 files changed

+7
-33
lines changed

2 files changed

+7
-33
lines changed

src/harness/runner.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,11 @@ if (testConfigFile !== '') {
6868
runners.push(new GeneratedFourslashRunner());
6969
break;
7070
case 'unittests':
71-
runners.push(new UnitTestRunner(UnittestTestType.Compiler));
71+
runners.push(new UnitTestRunner());
7272
break;
7373
case 'rwc':
7474
runners.push(new RWCRunner());
7575
break;
76-
case 'ls':
77-
runners.push(new UnitTestRunner(UnittestTestType.LanguageService));
78-
break;
79-
case 'services':
80-
runners.push(new UnitTestRunner(UnittestTestType.Services));
81-
break;
8276
case 'reverse':
8377
reverse = true;
8478
break;
@@ -96,12 +90,12 @@ if (runners.length === 0) {
9690
runners.push(new ProjectRunner());
9791
}
9892

99-
//// language services
93+
// language services
10094
runners.push(new FourslashRunner());
10195
//runners.push(new GeneratedFourslashRunner());
10296

10397
// unittests
104-
runners.push(new UnitTestRunner(UnittestTestType.Services));
98+
runners.push(new UnitTestRunner());
10599
}
106100

107101
sys.newLine = '\r\n';

src/harness/unittestrunner.ts

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
11
///<reference path="harness.ts" />
22
///<reference path="runnerbase.ts" />
33

4-
enum UnittestTestType {
5-
Compiler,
6-
LanguageService,
7-
Services,
8-
}
9-
104
class UnitTestRunner extends RunnerBase {
11-
constructor(public testType: UnittestTestType) {
5+
constructor() {
126
super();
137
}
148

159
public initializeTests() {
16-
switch (this.testType) {
17-
case UnittestTestType.Compiler:
18-
this.tests = this.enumerateFiles('tests/cases/unittests/compiler');
19-
break;
20-
case UnittestTestType.LanguageService:
21-
this.tests = this.enumerateFiles('tests/cases/unittests/ls');
22-
break;
23-
case UnittestTestType.Services:
24-
this.tests = this.enumerateFiles('tests/cases/unittests/services', /colorization.ts/);
25-
break;
26-
default:
27-
if (this.tests.length === 0) {
28-
throw new Error('Unsupported test cases: ' + this.testType);
29-
}
30-
break;
31-
}
10+
this.tests = this.enumerateFiles('tests/cases/unittests/services');
3211

3312
var outfile = new Harness.Compiler.WriterAggregator()
3413
var outerr = new Harness.Compiler.WriterAggregator();
@@ -63,7 +42,8 @@ class UnitTestRunner extends RunnerBase {
6342
after: after,
6443
Harness: Harness,
6544
IO: Harness.IO,
66-
ts:ts
45+
ts: ts,
46+
TypeScript: TypeScript
6747
// FourSlash: FourSlash
6848
};
6949
}

0 commit comments

Comments
 (0)